Merge pull request #799 from etchegom/refactor/isdsresource

[refactor] DS resource annotations

Author: glibersat

recoco/apps/projects/static/projects/js/action_pusher.js

@@ -5,7 +5,7 @@ function action_pusher_app() {
 
     db: new MiniSearch({
       fields: ['title', 'subtitle', 'tags'], // fields to index for full-text search
-      storeFields: ['title', 'subtitle', 'url', 'url_embeded', 'is_dsresource'], //
+      storeFields: ['title', 'subtitle', 'url', 'url_embeded', 'has_dsresource'], //
     }),
 
     push_type: 'single',
@@ -120,7 +120,7 @@ function action_pusher_app() {
           tags: t.tags,
           url: t.web_url,
           url_embeded: t.embeded_url,
-          is_dsresource: t.is_dsresource,
+          has_dsresource: t.has_dsresource,
           category: t.category,
         };
 

recoco/apps/projects/templates/projects/project/fragments/action_pusher/resource_search.html

@@ -85,7 +85,7 @@ <h5 class="modal-title">Prévisualisation de la ressource</h5>
                                               x-text="resource.category.name"></span>
                                     </li>
                                 </template>
-                                <li x-show="resource.is_dsresource">
+                                <li x-show="resource.has_dsresource">
                                     <span class="fr-badge fr-badge--sm text-transform-none">
                                         <img height="8px"
                                              width="18px"

recoco/apps/resources/models.py

@@ -15,6 +15,7 @@
 from django.contrib.sites.managers import CurrentSiteManager
 from django.contrib.sites.models import Site
 from django.db import models
+from django.db.models import BooleanField, Case, Count, When
 from django.db.models.functions import Lower
 from django.db.models.signals import post_migrate
 from django.dispatch import receiver
@@ -117,6 +118,15 @@ def limit_area(self, departments):
             models.Q(departments__in=departments) | models.Q(departments=None)
         ).distinct()
 
+    def with_ds_annotations(self):
+        return self.annotate(count_dsresource=Count("dsresource")).annotate(
+            has_dsresource=Case(
+                When(count_dsresource__gt=0, then=True),
+                default=False,
+                output_field=BooleanField(),
+            )
+        )
+
 
 class ResourceManager(models.Manager):
     def get_queryset(self):
@@ -177,10 +187,6 @@ class Resource(CloneMixin, models.Model):
     def public(self):
         return self.status >= self.TO_REVIEW
 
-    @property
-    def is_dsresource(self):
-        return self.dsresource_set.exists()
-
     created_on = models.DateTimeField(
         default=timezone.now, verbose_name="date de création"
     )

recoco/apps/resources/rest.py

@@ -32,6 +32,7 @@ def get_queryset(self):
         qs = models.Resource.on_site
         if not has_perm(self.request.user, "sites.manage_resources", self.request.site):
             qs = qs.filter(status__gt=models.Resource.TO_REVIEW)
+        qs = qs.with_ds_annotations().select_related("created_by", "category")
         return qs.order_by("-created_on", "-updated_on")
 
     serializer_class = ResourceSerializer

recoco/apps/resources/serializers.py

@@ -39,18 +39,18 @@ class Meta:
             "updated_on",
             "web_url",
             "embeded_url",
-            "is_dsresource",
+            "has_dsresource",
             "category",
         ]
         read_only_fields = [
             "created_on",
             "updated_on",
             "created_by",
-            "is_dsresource",
         ]
 
     web_url = serializers.URLField(source="get_absolute_url", read_only=True)
     embeded_url = serializers.URLField(source="get_embeded_url", read_only=True)
     tags = TagListSerializerField()
     created_by = ResourceCreatorSerializer(read_only=True, many=False)
     category = CategorySerializer(read_only=True)
+    has_dsresource = serializers.BooleanField(read_only=True, default=False)

recoco/apps/resources/templates/resources/resource/details.html

@@ -143,7 +143,7 @@
                     </div>
                 {% endif %}
                 <!-- Demarches Simplifiées callout integration -->
-                {% if resource.is_dsresource %}
+                {% if resource.has_dsresource %}
                     <div class="fr-callout fr-my-4w fr-pb-3w fr-pr-3w fr-pt-2w fr-pl-5v  ">
                         <img height="31px"
                              width="32px"

recoco/apps/resources/tests/test_models.py

@@ -1,10 +1,20 @@
 import pytest
 from model_bakery import baker
 
+from recoco.apps.resources.models import Resource
+
 
 @pytest.mark.django_db
-def test_is_dsresource():
-    resource = baker.make("resources.Resource")
-    assert resource.is_dsresource is False
+def test_with_ds_annotations():
+    baker.make("resources.Resource")
+    assert Resource.objects.count() == 1
+
+    resource = Resource.objects.with_ds_annotations().first()
+    assert resource.count_dsresource == 0
+    assert resource.has_dsresource is False
+
     baker.make("demarches_simplifiees.DSResource", resource=resource)
-    assert resource.is_dsresource is True
+
+    resource = Resource.objects.with_ds_annotations().first()
+    assert resource.count_dsresource == 1
+    assert resource.has_dsresource is True

recoco/apps/resources/views.py

@@ -22,6 +22,7 @@
 from django.contrib.syndication.views import Feed
 from django.db import transaction
 from django.db.models import Q
+from django.db.models.query import QuerySet
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template import TemplateDoesNotExist
@@ -242,6 +243,9 @@ def get_context_data(self, **kwargs):
 
         return context
 
+    def get_queryset(self) -> QuerySet[models.Resource]:
+        return super().get_queryset().with_ds_annotations()
+
 
 class EmbededResourceDetailView(BaseResourceDetailView):
     model = models.Resource

recoco/apps/tasks/forms.py

@@ -114,17 +114,21 @@ class CreateActionWithResourceForm(CreateActionBaseForm):
         forms.ModelChoiceField(
             queryset=resources_models.Resource.objects.exclude(
                 status=resources_models.Resource.DRAFT
-            )
+            ).with_ds_annotations()
         ),
     )
 
     def clean_resource(self):
         resource = self.cleaned_data["resource"]
 
         try:
-            resource = resources_models.Resource.on_site.exclude(
-                status=resources_models.Resource.DRAFT
-            ).get(pk=resource.pk)
+            resource = (
+                resources_models.Resource.on_site.exclude(
+                    status=resources_models.Resource.DRAFT
+                )
+                .with_ds_annotations()
+                .get(pk=resource.pk)
+            )
         except resources_models.Resource.DoesNotExist:
             self.add_error("resource_unknown", "Cette ressource n'existe pas")
             raise
@@ -140,16 +144,20 @@ class CreateActionsFromResourcesForm(CreateActionBaseForm):
     resources = forms.ModelMultipleChoiceField(
         queryset=resources_models.Resource.objects.exclude(
             status=resources_models.Resource.DRAFT
-        ),
+        ).with_ds_annotations(),
         required=True,
     )
 
     def clean_resources(self):
         resources = self.cleaned_data["resources"]
 
-        resources = resources_models.Resource.on_site.exclude(
-            status=resources_models.Resource.DRAFT
-        ).filter(pk__in=[resource.pk for resource in resources.all()])
+        resources = (
+            resources_models.Resource.on_site.exclude(
+                status=resources_models.Resource.DRAFT
+            )
+            .with_ds_annotations()
+            .filter(pk__in=[resource.pk for resource in resources.all()])
+        )
 
         if resources.count() == 0:
             self.add_error("no_valid_resource", "Aucune ressource")