Use last sent messages batch to generate pno form subscriber list

MTES-MCT · Sep 30, 2024 · 0d86c8b · 0d86c8b
1 parent 9c95ad9
commit 0d86c8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/frontend/cypress/e2e/side_window/logbook_prior_notification_form/sent_message_list.spec.ts b/frontend/cypress/e2e/side_window/logbook_prior_notification_form/sent_message_list.spec.ts
@@ -20,9 +20,9 @@ context('Side Window > Logbook Prior Notification Form > Sent Message List', ()
     cy.get('address').eq(1).contains('[email protected]')
     cy.get('address').eq(1).contains('+33987654321')
 
-    cy.get('address').eq(2).contains('Unité 5 (DDTM 40)')
-    cy.get('address').eq(2).contains('[email protected]')
-    cy.get('address').eq(2).contains('+33000000000')
+    // The last sent message doesn't include this unit contact details,
+    // they should not be displayed since they likely were unsubscribed in the meantime.
+    cy.get('address').contains('Unité 5 (DDTM 40)').should('not.exist')
 
     cy.getDataCy('SentMessageList-historyItem')
       .eq(0)

diff --git a/frontend/src/features/PriorNotification/components/shared/CardBodyHead/SentMessageList.tsx b/frontend/src/features/PriorNotification/components/shared/CardBodyHead/SentMessageList.tsx
@@ -14,8 +14,9 @@ type SentMessageListProps = Readonly<{
 export function SentMessageList({ detail }: SentMessageListProps) {
   const { data: sentMessages, isError } = useGetPriorNotificationSentNessagesQuery(detail.reportId)
 
-  const subscribers = sentMessages ? getSubscribersFromSentMessages(sentMessages) : undefined
   const sentMessagesBatches = sentMessages ? getSentMessagesBatches(sentMessages) : undefined
+  const lastSentMessagesBatch = sentMessagesBatches ? sentMessagesBatches[sentMessagesBatches.length - 1] : undefined
+  const subscribers = lastSentMessagesBatch ? getSubscribersFromSentMessages(lastSentMessagesBatch.messages) : undefined
 
   return (
     <>