Merge pull request #287 from betagouv/filter-by-survey

Filtrage des réponses par enquête

Author: alemangui

backend/responses/tests/test_get_responses.py

@@ -340,3 +340,28 @@ def test_user_with_both_responder_and_manager_roles_sees_only_own_responses(self
         self.assertIn(own_response.id, ids)
         # Les réponses des autres ne sont pas visibles, même si MANAGER dans la même org
         self.assertNotIn(other_response.id, ids)
+
+
+class TestFilterResponses(APITestCase):
+    def get_ids(self, response):
+        return [r["id"] for r in response.json()["results"]]
+
+    @authenticate
+    def test_filter_by_survey_returns_only_matching_responses(self):
+        """
+        Le paramètre ?survey=<id> ne retourne que les réponses de cette enquête,
+        et exclut celles des autres enquêtes.
+        """
+        org = OrganisationFactory()
+        survey_a = SurveyFactory(organisation=org)
+        survey_b = SurveyFactory(organisation=org)
+        MembershipFactory(user=authenticate.user, organisation=org, membership_type=MembershipType.MANAGER)
+
+        response_a = ResponseFactory(survey=survey_a)
+        ResponseFactory(survey=survey_b)
+
+        response = self.client.get(reverse("response_list_create"), {"survey": survey_a.id}, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        ids = self.get_ids(response)
+        self.assertEqual(ids, [response_a.id])

backend/responses/views/response.py

@@ -10,6 +10,9 @@
 from rest_framework.generics import GenericAPIView, ListAPIView, ListCreateAPIView, RetrieveAPIView
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response as DRFResponse
+from surveys.models import Survey
+from surveys.serializers import SurveyDisplaySerializer
 
 from responses.models import Response
 from responses.permissions import CanCreateResponse
@@ -22,13 +25,37 @@
 
 
 class ResponsePagination(LimitOffsetPagination):
+    """
+    On ajoute dans le payload les enquêtes afin de pouvoir filtrer par enquête.
+    """
+
     default_limit = 20
     max_limit = 100
 
+    surveys = []
+
+    def paginate_queryset(self, queryset, request, view=None):
+        original_queryset = view.get_queryset()
+        survey_ids = original_queryset.values_list("survey", flat=True).distinct().order_by()
+        self.surveys = Survey.objects.filter(id__in=survey_ids)
+        return super().paginate_queryset(queryset, request, view)
+
+    def get_paginated_response(self, data):
+        return DRFResponse(
+            {
+                "count": self.count,
+                "next": self.get_next_link(),
+                "previous": self.get_previous_link(),
+                "results": data,
+                "surveys": SurveyDisplaySerializer(self.surveys, many=True).data,
+            }
+        )
+
 
 class ResponseFilterSet(django_filters.FilterSet):
     created_after = django_filters.DateTimeFilter(field_name="creation_date", lookup_expr="gte")
     created_before = django_filters.DateTimeFilter(field_name="creation_date", lookup_expr="lte")
+    survey = django_filters.NumberFilter(field_name="survey_id")
 
     class Meta:
         model = Response

web/src/pages/ResponseListPage.vue

@@ -9,7 +9,8 @@
       "limit": 10,
       "created_after": "",
       "created_before": "",
-      "triage": ""
+      "triage": "",
+      "survey": ""
     }
   }
 }
@@ -19,6 +20,7 @@
 import { computed, watch } from "vue"
 import { useApiFetch } from "../utils/data-fetching.ts"
 import type { ResponseDisplay } from "@shared-types/response"
+import type { SurveyDisplay } from "@shared-types/api"
 import { useRouter, useRoute } from "vue-router"
 import ProgressSpinner from "../components/ProgressSpinner.vue"
 import PaginationSizeSelect from "../components/ResponseListPage/PaginationSizeSelect.vue"
@@ -36,12 +38,14 @@ const createdBefore = computed(
   () => (route.query.created_before as string) ?? ""
 )
 const ordering = computed(() => route.query.triage as string)
+const surveyFilter = computed(() => (route.query.survey as string) ?? "")
 
 const filterParams = computed(() => {
   const params = new URLSearchParams()
   if (createdAfter.value) params.set("created_after", createdAfter.value)
   if (createdBefore.value) params.set("created_before", createdBefore.value)
   if (ordering.value) params.set("ordering", String(ordering.value))
+  if (surveyFilter.value) params.set("survey", surveyFilter.value)
   return params
 })
 
@@ -62,7 +66,11 @@ const exportCsvUrl = computed(() => {
   return `${base}/responses/export/csv/${q ? `?${q}` : ""}`
 })
 
-type PaginatedResponse = { count: number; results: ResponseDisplay[] }
+type PaginatedResponse = {
+  count: number
+  results: ResponseDisplay[]
+  surveys: SurveyDisplay[]
+}
 
 const { data, execute, isFetching } = useApiFetch(url)
   .get()
@@ -122,6 +130,7 @@ const updateCreatedAfter = (value: string) =>
 const updateCreatedBefore = (value: string) =>
   updateQuery({ created_before: value, page: 1 })
 const updateOrdering = (value: string) => updateQuery({ triage: value })
+const updateSurvey = (value: string) => updateQuery({ survey: value, page: 1 })
 
 const exportJson = () => {
   window.location.href = exportJsonUrl.value
@@ -130,7 +139,10 @@ const exportCsv = () => {
   window.location.href = exportCsvUrl.value
 }
 
-watch([page, limit, createdAfter, createdBefore, ordering], fetchSearchResults)
+watch(
+  [page, limit, createdAfter, createdBefore, ordering, surveyFilter],
+  fetchSearchResults
+)
 </script>
 
 <template>
@@ -139,12 +151,30 @@ watch([page, limit, createdAfter, createdBefore, ordering], fetchSearchResults)
       :links="[{ to: '/dashboard', text: 'Dashboard' }, { text: 'Réponses' }]"
     />
     <div class="filters border mb-2 rounded border-gray-300 p-4 flex gap-8">
-      <DateRangeFilter
-        :created-after="createdAfter"
-        :created-before="createdBefore"
-        @update:created-after="updateCreatedAfter"
-        @update:created-before="updateCreatedBefore"
-      />
+      <div>
+        <DateRangeFilter
+          class="mb-3"
+          :created-after="createdAfter"
+          :created-before="createdBefore"
+          @update:created-after="updateCreatedAfter"
+          @update:created-before="updateCreatedBefore"
+        />
+        <DsfrInputGroup>
+          <DsfrSelect
+            label="Enquête"
+            :model-value="surveyFilter"
+            :options="[
+              { value: '', text: 'Toutes les enquêtes' },
+              ...(data?.surveys ?? []).map((s) => ({
+                value: String(s.id),
+                text: s.title,
+              })),
+            ]"
+            class="text-sm!"
+            @update:modelValue="updateSurvey"
+          />
+        </DsfrInputGroup>
+      </div>
       <div class="flex flex-col gap-4">
         <PaginationSizeSelect
           :modelValue="limit"