add .current to TranslatedResourceQueryset + ResourceQueryset

functionzz · functionzz · commit 8ee640291942 · 2026-02-17T12:57:32.000-05:00
diff --git a/pontoon/administration/forms.py b/pontoon/administration/forms.py
@@ -123,9 +123,9 @@ def __init__(self, *args, **kwargs):
         # If the project instance is available, filter resources for this project
         if kwargs.get("instance") and kwargs["instance"].project:
             project = kwargs["instance"].project
-            self.fields["resources"].queryset = Resource.objects.filter(
-                project=project
-            ).select_related()
+            self.fields["resources"].queryset = (
+                Resource.objects.current().filter(project=project).select_related()
+            )
 
 
 TagInlineFormSet = inlineformset_factory(Project, Tag, form=TagInlineForm, extra=1)
diff --git a/pontoon/administration/views.py b/pontoon/administration/views.py
@@ -306,7 +306,7 @@ def manage_project(request, slug=None, template="admin_project.html"):
     }
 
     # Set locale in Translate link
-    if Resource.objects.filter(project=project).exists() and locales_selected:
+    if Resource.objects.current().filter(project=project).exists() and locales_selected:
         locale = (
             utils.get_project_locale_from_request(request, project.locales)
             or locales_selected[0].code
@@ -373,7 +373,7 @@ def _get_resource_for_database_project(project):
 
     """
     try:
-        return Resource.objects.get(
+        return Resource.objects.current().get(
             project=project,
         )
     except Resource.DoesNotExist:
@@ -492,7 +492,7 @@ def manage_project_strings(request, slug=None):
             # Get all strings, find the ones that changed, update them in the database.
             formset = EntityFormSet(request.POST, queryset=entities)
             if formset.is_valid():
-                resource = Resource.objects.filter(project=project).first()
+                resource = Resource.objects.current().filter(project=project).first()
                 entity_max_order = entities.aggregate(Max("order"))["order__max"]
                 try:
                     # This line can purposefully cause an exception, and that
diff --git a/pontoon/base/models/locale.py b/pontoon/base/models/locale.py
@@ -58,7 +58,7 @@ def available(self):
         from pontoon.base.models.translated_resource import TranslatedResource
 
         return self.filter(
-            pk__in=TranslatedResource.objects.values_list("locale", flat=True)
+            pk__in=TranslatedResource.objects.current().values_list("locale", flat=True)
         )
 
     def stats_data(self, project=None):
@@ -115,7 +115,7 @@ class Locale(models.Model, AggregatedStats):
     def aggregated_stats_query(self):
         from pontoon.base.models.translated_resource import TranslatedResource
 
-        return TranslatedResource.objects.filter(
+        return TranslatedResource.objects.current().filter(
             locale=self,
             resource__project__disabled=False,
             resource__project__system_project=False,
diff --git a/pontoon/base/models/project.py b/pontoon/base/models/project.py
@@ -119,7 +119,7 @@ class Project(models.Model, AggregatedStats):
     def aggregated_stats_query(self):
         from pontoon.base.models.translated_resource import TranslatedResource
 
-        return TranslatedResource.objects.filter(resource__project=self)
+        return TranslatedResource.objects.current().filter(resource__project=self)
 
     name = models.CharField(max_length=128, unique=True)
     slug = models.SlugField(unique=True)
diff --git a/pontoon/base/models/project_locale.py b/pontoon/base/models/project_locale.py
@@ -74,7 +74,7 @@ class ProjectLocale(models.Model, AggregatedStats):
     def aggregated_stats_query(self):
         from pontoon.base.models.translated_resource import TranslatedResource
 
-        return TranslatedResource.objects.filter(
+        return TranslatedResource.objects.current().filter(
             locale=self.locale, resource__project=self.project
         )
 
diff --git a/pontoon/base/models/resource.py b/pontoon/base/models/resource.py
@@ -10,6 +10,9 @@ def obsolete(self, now):
         self.update(obsolete=True, date_obsoleted=now)
         Entity.objects.filter(resource__in=self).obsolete(now)
 
+    def current(self):
+        return self.filter(obsolete=False)
+
 
 class Resource(models.Model):
     project = models.ForeignKey("Project", models.CASCADE, related_name="resources")
diff --git a/pontoon/base/models/translated_resource.py b/pontoon/base/models/translated_resource.py
@@ -14,6 +14,9 @@
 
 
 class TranslatedResourceQuerySet(models.QuerySet):
+    def current(self):
+        return self.filter(resource__obsolete=False)
+
     def string_stats(
         self,
         user: User | None = None,
diff --git a/pontoon/base/models/translation.py b/pontoon/base/models/translation.py
@@ -23,9 +23,11 @@ class TranslationQuerySet(models.QuerySet):
     def translated_resources(self, locale):
         from pontoon.base.models.translated_resource import TranslatedResource
 
-        return TranslatedResource.objects.filter(
-            resource__entities__translation__in=self, locale=locale
-        ).distinct()
+        return (
+            TranslatedResource.objects.current()
+            .filter(resource__entities__translation__in=self, locale=locale)
+            .distinct()
+        )
 
     def authors(self):
         """
@@ -310,8 +312,10 @@ def save(self, failed_checks=None, *args, **kwargs):
             self.entity.reset_term_translation(self.locale)
 
         # We use get_or_create() instead of just get() to make it easier to test.
-        translatedresource, created = TranslatedResource.objects.get_or_create(
-            resource=self.entity.resource, locale=self.locale
+        translatedresource, created = (
+            TranslatedResource.objects.current().get_or_create(
+                resource=self.entity.resource, locale=self.locale
+            )
         )
 
         # Update latest translation where necessary
diff --git a/pontoon/base/signals.py b/pontoon/base/signals.py
@@ -28,7 +28,7 @@
 def project_locale_removed(sender, **kwargs):
     project_locale = kwargs.get("instance", None)
     if project_locale is not None:
-        TranslatedResource.objects.filter(
+        TranslatedResource.objects.current().filter(
             resource__project=project_locale.project, locale=project_locale.locale
         ).delete()
 
@@ -173,7 +173,7 @@ def add_locale_to_system_projects(sender, instance, created, **kwargs):
         projects = Project.objects.filter(system_project=True)
         for project in projects:
             ProjectLocale.objects.create(project=project, locale=instance)
-            for resource in project.resources.all():
+            for resource in project.resources.current():
                 translated_resource = TranslatedResource.objects.create(
                     resource=resource,
                     locale=instance,
@@ -189,7 +189,7 @@ def add_locale_to_terminology_project(sender, instance, created, **kwargs):
     if created:
         project = Project.objects.get(slug="terminology")
         ProjectLocale.objects.create(project=project, locale=instance)
-        for resource in project.resources.all():
+        for resource in project.resources.current():
             translated_resource = TranslatedResource.objects.create(
                 resource=resource,
                 locale=instance,
diff --git a/pontoon/base/views.py b/pontoon/base/views.py
@@ -103,7 +103,11 @@ def locale_projects(request, locale):
 def locale_stats(request, locale):
     """Get locale stats used in All Resources part."""
     locale = get_object_or_404(Locale, code=locale)
-    stats = TranslatedResource.objects.filter(locale=locale).string_stats(request.user)
+    stats = (
+        TranslatedResource.objects.current()
+        .filter(locale=locale)
+        .string_stats(request.user)
+    )
     stats["title"] = "all-resources"
     return JsonResponse([stats], safe=False)
 
@@ -115,9 +119,11 @@ def locale_project_parts(request, locale, slug):
     try:
         locale = Locale.objects.get(code=locale)
         project = Project.objects.visible_for(request.user).get(slug=slug)
-        tr = TranslatedResource.objects.filter(
-            locale=locale, resource__project=project
-        ).distinct()
+        tr = (
+            TranslatedResource.objects.current()
+            .filter(locale=locale, resource__project=project)
+            .distinct()
+        )
         details = list(
             tr.annotate(
                 title=F("resource__path"),
@@ -188,7 +194,7 @@ def _get_entities_list(locale, preferred_source_locale, project, form):
     return JsonResponse(
         {
             "entities": Entity.map_entities(locale, preferred_source_locale, entities),
-            "stats": TranslatedResource.objects.query_stats(
+            "stats": TranslatedResource.objects.current().query_stats(
                 project, form.cleaned_data["paths"], locale
             ),
         },
@@ -221,7 +227,7 @@ def _get_paginated_entities(locale, preferred_source_locale, project, form, enti
                 requested_entity=requested_entity,
             ),
             "has_next": entities_page.has_next(),
-            "stats": TranslatedResource.objects.query_stats(
+            "stats": TranslatedResource.objects.current().query_stats(
                 project, form.cleaned_data["paths"], locale
             ),
         },
diff --git a/pontoon/batch/views.py b/pontoon/batch/views.py
@@ -121,7 +121,7 @@ def batch_edit_translations(request):
         )
 
     tr_pks = [tr.pk for tr in action_status["translated_resources"]]
-    TranslatedResource.objects.filter(pk__in=tr_pks).calculate_stats()
+    TranslatedResource.objects.current().filter(pk__in=tr_pks).calculate_stats()
 
     # Mark translations as changed
     active_translations.bulk_mark_changed()
diff --git a/pontoon/insights/tasks.py b/pontoon/insights/tasks.py
@@ -272,7 +272,8 @@ def count_projectlocale_stats() -> Iterable[dict[str, int]]:
     which may need a local copy if the behaviour here is modified.
     """
     return (
-        TranslatedResource.objects.filter(
+        TranslatedResource.objects.current()
+        .filter(
             resource__project__disabled=False,
             resource__project__system_project=False,
             resource__project__visibility="public",
diff --git a/pontoon/localizations/views.py b/pontoon/localizations/views.py
@@ -38,7 +38,7 @@ def localization(request, code, slug):
 
     get_object_or_404(ProjectLocale, locale=locale, project=project)
 
-    trans_res = TranslatedResource.objects.filter(
+    trans_res = TranslatedResource.objects.current().filter(
         locale=locale, resource__project=project
     )
 
@@ -75,7 +75,8 @@ def ajax_resources(request, code, slug):
 
     # Prefetch data needed for the latest activity column
     translatedresources = (
-        TranslatedResource.objects.filter(
+        TranslatedResource.objects.current()
+        .filter(
             resource__project=project,
             locale=locale,
             resource__entities__obsolete=False,
diff --git a/pontoon/messaging/management/commands/send_deadline_notifications.py b/pontoon/messaging/management/commands/send_deadline_notifications.py
@@ -37,10 +37,14 @@ def handle(self, *args, **options):
             locales = []
 
             for project_locale in project.project_locale.all():
-                pl_stats = TranslatedResource.objects.filter(
-                    locale=project_locale.locale,
-                    resource__project=project_locale.project,
-                ).string_stats()
+                pl_stats = (
+                    TranslatedResource.objects.current()
+                    .filter(
+                        locale=project_locale.locale,
+                        resource__project=project_locale.project,
+                    )
+                    .string_stats()
+                )
                 if pl_stats["approved"] < pl_stats["total"]:
                     locales.append(project_locale.locale)
 
diff --git a/pontoon/pretranslation/tasks.py b/pontoon/pretranslation/tasks.py
@@ -65,7 +65,8 @@ def pretranslate(project: Project, paths: set[str] | None):
 
     # Fetch all available locale-resource pairs (TranslatedResource objects)
     tr_pairs = (
-        TranslatedResource.objects.filter(
+        TranslatedResource.objects.current()
+        .filter(
             resource__project=project,
             locale__in=locales,
         )
@@ -196,9 +197,13 @@ def pretranslate(project: Project, paths: set[str] | None):
         # `operator.ior` is the '|' Python operator, which turns into a logical OR
         # when used between django ORM query objects.
         tr_query = reduce(operator.ior, tr_filter)
-        translatedresources = TranslatedResource.objects.filter(tr_query).annotate(
-            locale_resource=Concat(
-                "locale_id", V("-"), "resource_id", output_field=CharField()
+        translatedresources = (
+            TranslatedResource.objects.current()
+            .filter(tr_query)
+            .annotate(
+                locale_resource=Concat(
+                    "locale_id", V("-"), "resource_id", output_field=CharField()
+                )
             )
         )
         translatedresources.calculate_stats()
diff --git a/pontoon/projects/views.py b/pontoon/projects/views.py
@@ -39,7 +39,7 @@ def projects(request):
         "projects/projects.html",
         {
             "projects": projects,
-            "all_projects_stats": TranslatedResource.objects.all().string_stats(
+            "all_projects_stats": TranslatedResource.objects.current().string_stats(
                 request.user
             ),
             "project_stats": project_stats,
@@ -57,7 +57,7 @@ def project(request, slug):
         return project
 
     project_locales = project.project_locale
-    project_tr = TranslatedResource.objects.filter(resource__project=project)
+    project_tr = TranslatedResource.objects.current().filter(resource__project=project)
 
     # Only include filtered teams if provided
     teams = request.GET.get("teams", "").split(",")
diff --git a/pontoon/sync/core/entities.py b/pontoon/sync/core/entities.py
@@ -342,12 +342,13 @@ def update_translated_resources(
 ) -> None:
     prev_tr_keys: set[tuple[int, int]] = set(
         (tr["resource_id"], tr["locale_id"])
-        for tr in TranslatedResource.objects.filter(resource__project=project)
+        for tr in TranslatedResource.objects.current()
+        .filter(resource__project=project)
         .values("resource_id", "locale_id")
         .iterator()
     )
     add_tr: list[TranslatedResource] = []
-    for resource in Resource.objects.filter(project=project).iterator():
+    for resource in Resource.objects.current().filter(project=project).iterator():
         _, locales = paths.target(resource.path)
         for lc in locales:
             locale = locale_map.get(lc, None)
@@ -372,7 +373,7 @@ def update_translated_resources(
         del_tr_q = Q()
         for resource_id, locale_id in prev_tr_keys:
             del_tr_q |= Q(resource_id=resource_id, locale_id=locale_id)
-        _, del_dict = TranslatedResource.objects.filter(del_tr_q).delete()
+        _, del_dict = TranslatedResource.objects.current().filter(del_tr_q).delete()
         del_count = del_dict.get("base.translatedresource", 0)
         str_tr = "translated resource" if del_count == 1 else "translated resources"
         log.info(f"[{project.slug}] Removed {del_count} {str_tr}")
diff --git a/pontoon/sync/core/translations_from_repo.py b/pontoon/sync/core/translations_from_repo.py
@@ -115,9 +115,9 @@ def delete_removed_gettext_resources(
             Translation.objects.filter(entity__resource__project=project).filter(
                 rm_t
             ).delete()
-            TranslatedResource.objects.filter(resource__project=project).filter(
-                rm_tr
-            ).delete()
+            TranslatedResource.objects.current().filter(
+                resource__project=project
+            ).filter(rm_tr).delete()
     return count
 
 
@@ -178,9 +178,9 @@ def find_db_updates(
 
     resources: dict[str, Resource] = {
         res.path: res
-        for res in Resource.objects.filter(
-            project=project, path__in=resource_paths
-        ).iterator()
+        for res in Resource.objects.current()
+        .filter(project=project, path__in=resource_paths)
+        .iterator()
     }
 
     # Exclude translations for which DB & repo already match
diff --git a/pontoon/teams/views.py b/pontoon/teams/views.py
@@ -74,7 +74,7 @@ def teams(request):
         "teams/teams.html",
         {
             "locales": locales,
-            "all_locales_stats": TranslatedResource.objects.all().string_stats(),
+            "all_locales_stats": TranslatedResource.objects.current().string_stats(),
             "locale_stats": locale_stats,
             "form": form,
             "top_instances": get_top_instances(locales, locale_stats),
@@ -92,8 +92,10 @@ def team(request, locale):
     if not visible_count:
         raise Http404
 
-    locale_stats = TranslatedResource.objects.filter(locale=locale).string_stats(
-        request.user
+    locale_stats = (
+        TranslatedResource.objects.current()
+        .filter(locale=locale)
+        .string_stats(request.user)
     )
 
     return render(
diff --git a/pontoon/terminology/models.py b/pontoon/terminology/models.py
@@ -6,12 +6,12 @@
 
 
 def update_terminology_project_stats():
-    resource = Resource.objects.get(project__slug="terminology")
+    resource = Resource.objects.current().get(project__slug="terminology")
     resource.total_strings = Entity.objects.filter(
         resource=resource, obsolete=False
     ).count()
     resource.save(update_fields=["total_strings"])
-    TranslatedResource.objects.filter(resource=resource).calculate_stats()
+    TranslatedResource.objects.current().filter(resource=resource).calculate_stats()
 
 
 class TermQuerySet(models.QuerySet):
@@ -126,7 +126,7 @@ def create_entity(self):
         - Entity.comment contains joint content of several fields:
           Term.part_of_speech. Term.definition. E.g.: Term.usage.
         """
-        resource = Resource.objects.get(project__slug="terminology")
+        resource = Resource.objects.current().get(project__slug="terminology")
 
         entity, created = Entity.objects.get_or_create(
             string=self.text,
diff --git a/pontoon/translations/views.py b/pontoon/translations/views.py

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class ProjectLocale(models.Model, AggregatedStats):`
`74`	`74`	`def aggregated_stats_query(self):`
`75`	`75`	`from pontoon.base.models.translated_resource import TranslatedResource`
`76`	`76`
`77`		`- return TranslatedResource.objects.filter(`
	`77`	`+ return TranslatedResource.objects.current().filter(`
`78`	`78`	`locale=self.locale, resource__project=self.project`
`79`	`79`	`)`
`80`	`80`