Ajout des invitations envoyées dans la page collaborateurs

api/serializers/__init__.py

@@ -19,4 +19,4 @@
 from .autocomplete_item import AutocompleteItemSerializer
 from .declaration import DeclarationSerializer, DeclarationShortSerializer, SimpleDeclarationSerializer
 from .company import CompanySerializer
-from .solicitation import CoSupervisionClaimSerializer, AddNewCollaboratorSerializer
+from .solicitation import CollaborationInvitationSerializer, CoSupervisionClaimSerializer, AddNewCollaboratorSerializer

api/serializers/solicitation.py

@@ -2,10 +2,19 @@
 
 from rest_framework import serializers
 
-from data.models import CoSupervisionClaim
+from data.models import CollaborationInvitation, CoSupervisionClaim
 from data.models.company import CompanyRoleClassChoices
 
 
+class CollaborationInvitationSerializer(serializers.ModelSerializer):
+    sender_name = serializers.CharField(source="sender.name")
+
+    class Meta:
+        model = CollaborationInvitation
+        fields = ("id", "creation_date", "sender_name", "description", "recipient_email")
+        read_only_fields = fields
+
+
 class CoSupervisionClaimSerializer(serializers.ModelSerializer):
     sender_name = serializers.CharField(source="sender.name")
 

api/tests/test_solicitation.py

@@ -1,6 +1,7 @@
 from rest_framework import status
 
 from data.factories import (
+    CollaborationInvitationFactory,
     CompanyFactory,
     CoSupervisionClaimFactory,
     SupervisorRoleFactory,
@@ -10,6 +11,42 @@
 from .utils import ProjectAPITestCase
 
 
+class TestListCollaborationInvitations(ProjectAPITestCase):
+    viewname = "list_collaboration_invitation"
+
+    def setUp(self):
+        self.user = UserFactory()
+        self.company_1 = CompanyFactory()
+        self.company_2 = CompanyFactory()
+        self.supervisor_role_1 = SupervisorRoleFactory(user=self.user, company=self.company_1)
+        self.supervisor_role_2 = SupervisorRoleFactory(user=self.user, company=self.company_2)
+
+        # solicitation déjà traitée (on la créé avant pour éviter une erreur d'intégrité à cause de la contrainte d'unicité)
+        CollaborationInvitationFactory(recipient_email=self.user.email, company=self.company_1).account_created(
+            processor=UserFactory()
+        )
+
+        self.solicitation_1 = CollaborationInvitationFactory(recipient_email=self.user.email, company=self.company_1)
+
+        # solicitation liée au même utilisateur mais à une entreprise différente
+        CollaborationInvitationFactory(recipient_email=self.user.email, company=self.company_2)
+
+        # solicitation pas liée à l'utilisateur du tout
+        self.company_3 = CompanyFactory()
+        CollaborationInvitationFactory(company=self.company_3)
+
+    def test_get_collaboration_invitations_ok(self):
+        self.login(self.user)
+        response = self.get(self.url(pk=self.company_1.id))
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 1)  # seulement la solicitation 1
+
+    def test_get_collaboration_invitations_ko_not_mine(self):
+        self.login(self.user)
+        response = self.get(self.url(pk=self.company_3.id))
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)  # get_or_404 appelé avant permission
+
+
 class TestListCoSupervisionClaims(ProjectAPITestCase):
     viewname = "list_co_supervision_claim"
 

api/urls.py

@@ -73,6 +73,11 @@
         name="add_new_collaborator",
     ),
     # Solicitations
+    path(
+        "companies/<int:pk>/collaboration-invitations/",
+        views.CollaborationInvitationListView.as_view(),
+        name="list_collaboration_invitation",
+    ),
     path(
         "companies/<int:pk>/co-supervision-claims/",
         views.CoSupervisionClaimListView.as_view(),

api/views/__init__.py

@@ -41,4 +41,9 @@
     AddCompanyRoleView,
     RemoveCompanyRoleView,
 )
-from .solicitation import ProcessCoSupervisionClaim, CoSupervisionClaimListView, AddNewCollaboratorView
+from .solicitation import (
+    ProcessCoSupervisionClaim,
+    CoSupervisionClaimListView,
+    CollaborationInvitationListView,
+    AddNewCollaboratorView,
+)

api/views/solicitation.py

@@ -14,11 +14,20 @@
 
 from ..exception_handling import ProjectAPIException
 from ..permissions import IsSolicitationRecipient, IsSupervisor
-from ..serializers import AddNewCollaboratorSerializer, CoSupervisionClaimSerializer
+from ..serializers import AddNewCollaboratorSerializer, CollaborationInvitationSerializer, CoSupervisionClaimSerializer
 
 User = get_user_model()
 
 
+class CollaborationInvitationListView(ListAPIView):
+    serializer_class = CollaborationInvitationSerializer
+
+    def get_queryset(self):
+        user = self.request.user
+        company = get_object_or_404(Company.objects.filter(supervisors=user), pk=self.kwargs["pk"])
+        return CollaborationInvitation.objects.filter(company=company, processor__isnull=True)
+
+
 class CoSupervisionClaimListView(ListAPIView):
     serializer_class = CoSupervisionClaimSerializer
 

data/admin/solicitation.py

@@ -18,7 +18,7 @@ class WithDisplayRecipients:
     def display_recipients(self, obj):
         recipient_count = obj.recipients.count()
         if recipient_count == 1:
-            return obj.recipient.get().name
+            return obj.recipients.get().name
         else:
             return f"{recipient_count} destinataires"
 

frontend/src/icons.js

@@ -233,3 +233,13 @@ export const RiSurveyFill = remixIcon(
   "ri-survey-fill",
   "M6 4v4h12V4h2.007c.548 0 .993.445.993.993v16.014a.994.994 0 01-.993.993H3.993A.994.994 0 013 21.007V4.993C3 4.445 3.445 4 3.993 4H6zm3 13H7v2h2v-2zm0-3H7v2h2v-2zm0-3H7v2h2v-2zm7-9v4H8V2h8z"
 )
+
+export const RiChatDownloadLine = remixIcon(
+  "ri-chat-download-line",
+  "M6.455 19L2 22.5V4a1 1 0 011-1h18a1 1 0 011 1v14a1 1 0 01-1 1H6.455zM4 18.385L5.763 17H20V5H4v13.385zM13 11h3l-4 4-4-4h3V7h2v4z"
+)
+
+export const RiChatUploadLine = remixIcon(
+  "ri-chat-upload-line",
+  "M6.455 19L2 22.5V4a1 1 0 011-1h18a1 1 0 011 1v14a1 1 0 01-1 1H6.455zM4 18.385L5.763 17H20V5H4v13.385zM13 11v4h-2v-4H8l4-4 4 4h-3z"
+)

frontend/src/views/CollaboratorsPage/ClaimsBlock.vue

@@ -1,67 +1,29 @@
 <template>
-  <div v-if="solicitations">
-    <SectionTitle title="Demandes reçues" icon="ri-chat-3-line" />
-    <p>Visualisez et traitez vos demandes reçues pour rejoindre votre entreprise.</p>
-    <div v-for="solicitation in solicitations" :key="solicitation.id">
-      <div class="flex items-center">
-        <v-icon class="size-4" name="ri-chat-3-line" />
-
-        <div class="ml-2">
-          <div>{{ solicitation.senderName }}</div>
-          <div class="text-xs">
-            {{ isoToPrettyDate(solicitation.creationDate, dateOptions) }}
-            à {{ isoToPrettyTime(solicitation.creationDate) }}
-          </div>
-        </div>
-
-        <div class="ml-2 md:ml-8 flex flex-col gap-y-1">
-          <div class="italic">{{ solicitation.description }}</div>
-          <div class="flex gap-x-2">
-            <DsfrButton
-              v-for="action in actions"
-              :key="action.label"
-              :label="action.label"
-              :icon="action.icon"
-              :primary="action.primary"
-              :secondary="action.secondary"
-              size="sm"
-              @click="process(solicitation.id, action.name)"
-            />
-          </div>
-        </div>
-      </div>
-      <hr class="mt-4 -mb-2 border" />
-    </div>
-    <div v-if="solicitations.length === 0">
-      <p class="italic">Vous n'avez actuellement aucune demande en cours.</p>
-    </div>
-  </div>
+  <SolicitationsHolder
+    v-if="solicitations"
+    @process="process"
+    title="Demandes reçues"
+    icon="ri-chat-download-line"
+    description="Visualisez et traitez vos demandes reçues pour rejoindre votre entreprise."
+    :solicitations="solicitations"
+    emptyText="Vous n'avez actuellement aucune demande en cours."
+    :actions="[
+      { name: 'accept', label: 'Accepter', primary: true, icon: 'ri-check-fill' },
+      { name: 'refuse', label: 'Refuser', secondary: true, icon: 'ri-close-fill' },
+    ]"
+  />
 </template>
 
 <script setup>
-import SectionTitle from "@/components/SectionTitle"
 import { useFetch } from "@vueuse/core"
 import { handleError } from "@/utils/error-handling"
 import { headers } from "@/utils/data-fetching"
 import { onMounted } from "vue"
-import { isoToPrettyDate, isoToPrettyTime } from "@/utils/date"
 import useToaster from "@/composables/use-toaster"
+import SolicitationsHolder from "./SolicitationsHolder"
 
 const props = defineProps({ companyId: Number, collaboratorsExecute: Function })
 
-const dateOptions = {
-  weekday: "short",
-  month: "short",
-  day: "numeric",
-}
-
-// Pour le moment, les actions possibles sont identiques entre toutes les solicitations, donc on garde ça hardcodé.
-// A terme, on pourra imaginer un mapping côté front, ou même que le back-end retourne les différentes actions possibles.
-const actions = [
-  { name: "accept", label: "Accepter", primary: true, icon: "ri-check-fill" },
-  { name: "refuse", label: "Refuser", secondary: true, icon: "ri-close-fill" },
-]
-
 const {
   data: solicitations,
   response,

frontend/src/views/CollaboratorsPage/SentInvitationsBlock.vue

@@ -0,0 +1,39 @@
+<template>
+  <SolicitationsHolder
+    v-if="solicitations"
+    title="Invitations envoyées"
+    icon="ri-chat-upload-line"
+    description="Visualisez les invitations envoyées par les co-gestionnaires à rejoindre votre entreprise."
+    :solicitations="solicitations"
+    emptyText="Il n'y a aucune invitation en cours"
+    :actions="[]"
+    showRecipientEmail
+  />
+</template>
+
+<script setup>
+import { useFetch } from "@vueuse/core"
+import { handleError } from "@/utils/error-handling"
+import { headers } from "@/utils/data-fetching"
+import { onMounted } from "vue"
+import SolicitationsHolder from "./SolicitationsHolder"
+
+const props = defineProps({ companyId: Number })
+
+const {
+  data: solicitations,
+  response,
+  execute,
+} = useFetch(
+  `/api/v1/companies/${props.companyId}/collaboration-invitations/`,
+  {
+    headers: headers(),
+  },
+  { immediate: false }
+).json()
+
+onMounted(async () => {
+  await execute()
+  await handleError(response)
+})
+</script>

frontend/src/views/CollaboratorsPage/SolicitationsHolder.vue

@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <SectionTitle :title="title" :icon="icon" />
+    <p>{{ description }}</p>
+    <div v-for="solicitation in solicitations" :key="solicitation.id">
+      <div class="flex items-center">
+        <v-icon class="size-4" name="ri-chat-download-line" />
+
+        <div class="ml-2">
+          <div>{{ solicitation.senderName }}</div>
+          <div class="-mt-1.5" v-if="showRecipientEmail">à {{ solicitation.recipientEmail }}</div>
+          <div class="text-xs">
+            {{ isoToPrettyDate(solicitation.creationDate, dateOptions) }}
+            à {{ isoToPrettyTime(solicitation.creationDate) }}
+          </div>
+        </div>
+
+        <div class="ml-2 md:ml-8 flex flex-col gap-y-1">
+          <div class="italic">{{ solicitation.description }}</div>
+          <div v-if="actions.length > 0" class="flex gap-x-2">
+            <DsfrButton
+              v-for="action in actions"
+              :key="action.label"
+              :label="action.label"
+              :icon="action.icon"
+              :primary="action.primary"
+              :secondary="action.secondary"
+              size="sm"
+              @click="emit('process', solicitation.id, action.name)"
+            />
+          </div>
+        </div>
+      </div>
+      <hr class="mt-4 -mb-2 border" />
+    </div>
+    <div v-if="solicitations.length === 0">
+      <p class="italic">{{ emptyText }}</p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import SectionTitle from "@/components/SectionTitle"
+import { isoToPrettyDate, isoToPrettyTime } from "@/utils/date"
+
+defineProps({
+  title: String,
+  icon: String,
+  description: String,
+  solicitations: Array,
+  emptyText: String,
+  actions: Array,
+  showRecipientEmail: { type: Boolean, default: false }, // spécifique
+})
+
+const emit = defineEmits(["process"])
+
+const dateOptions = {
+  weekday: "short",
+  month: "short",
+  day: "numeric",
+}
+</script>

frontend/src/views/CollaboratorsPage/index.vue

@@ -43,6 +43,7 @@
       <hr class="mt-4 -mb-2 border" />
     </div>
     <ClaimsBlock class="mt-8" :companyId="company.id" :collaboratorsExecute="collaboratorsExecute" />
+    <SentInvitationsBlock class="mt-8" :companyId="company.id" />
   </div>
 </template>
 
@@ -57,6 +58,7 @@ import RoleTag from "@/components/RoleTag.vue"
 import { headers } from "@/utils/data-fetching"
 import { roleNameDisplayNameMapping } from "@/utils/mappings"
 import ClaimsBlock from "./ClaimsBlock"
+import SentInvitationsBlock from "./SentInvitationsBlock.vue"
 import AddNewCollaborator from "./AddNewCollaborator"
 
 const store = useRootStore()