Code: update annotated count

lemarche/cpv/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.db.models import Count
 from django.urls import reverse
 from django.utils.html import format_html
 
@@ -27,7 +26,14 @@ def queryset(self, request, queryset):
 
 @admin.register(Code, site=admin_site)
 class CodeAdmin(admin.ModelAdmin):
-    list_display = ["cpv_code", "name", "hierarchy_level", "nb_sectors", "created_at", "updated_at"]
+    list_display = [
+        "cpv_code",
+        "name",
+        "hierarchy_level",
+        "sector_count_annotated_with_link",
+        "created_at",
+        "updated_at",
+    ]
     list_filter = ["hierarchy_level", HasSectorFilter]
 
     autocomplete_fields = ["sectors"]
@@ -56,13 +62,12 @@ def has_delete_permission(self, request, obj=None):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        qs = qs.prefetch_related("sectors")
-        qs = qs.annotate(sector_count=Count("sectors", distinct=True))
+        qs = qs.with_sector_stats()
         return qs
 
-    def nb_sectors(self, code):
+    def sector_count_annotated_with_link(self, code):
         url = reverse("admin:sectors_sector_changelist") + f"?cpv_codes__in={code.id}"
-        return format_html(f'<a href="{url}">{code.sector_count}</a>')
+        return format_html(f'<a href="{url}">{code.sector_count_annotated}</a>')
 
-    nb_sectors.short_description = "Nombre de secteurs correspondants"
-    nb_sectors.admin_order_field = "sector_count"
+    sector_count_annotated_with_link.short_description = "Nombre de secteurs correspondants"
+    sector_count_annotated_with_link.admin_order_field = "sector_count_annotated"

lemarche/cpv/models.py

@@ -1,5 +1,6 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
+from django.db.models import Count
 from django.template.defaultfilters import slugify
 from django.utils import timezone
 
@@ -9,6 +10,9 @@ def has_sector(self):
         """Only return codes who have at least 1 Sector."""
         return self.prefetch_related("sectors").filter(sectors__isnull=False).distinct()
 
+    def with_sector_stats(self):
+        return self.annotate(sector_count_annotated=Count("sectors", distinct=True))
+
 
 class Code(models.Model):
     name = models.CharField(verbose_name="Nom", max_length=255)

lemarche/cpv/tests.py

@@ -48,3 +48,8 @@ def setUpTestData(cls):
     def test_has_sector(self):
         self.assertEqual(Code.objects.count(), 2)
         self.assertEqual(Code.objects.has_sector().count(), 1)
+
+    def test_with_sector_stats(self):
+        code_queryset = Code.objects.with_sector_stats()
+        self.assertEqual(code_queryset.get(id=self.code.id).sector_count_annotated, 0)
+        self.assertEqual(code_queryset.get(id=self.code_with_sector.id).sector_count_annotated, 1)