[SELC-4894] fix: removed filePath from base builder and added only in…

… standard builder (#300)
pagopa · Jun 10, 2024 · ee2c0d1 · ee2c0d1
1 parent e6238e8
commit ee2c0d1
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/...-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java b/...-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java
@@ -58,9 +58,9 @@ public NotificationToSend buildNotificationToSend(Onboarding onboarding, Token t
             notificationToSend.setId(UUID.randomUUID().toString());
         }
         notificationToSend.setState(convertOnboardingStatusToNotificationStatus(onboarding.getStatus()));
-        mapDataFromToken(token, notificationToSend);
         mapDataFromOnboarding(onboarding, notificationToSend, queueEvent);
         notificationToSend.setInstitution(retrieveInstitution(institution));
+        setTokenData(notificationToSend, token);
 
         return notificationToSend;
     }
@@ -86,17 +86,6 @@ private void mapDataFromOnboarding(Onboarding onboarding, NotificationToSend not
         }
     }
 
-    private void mapDataFromToken(Token token, NotificationToSend notificationToSend) {
-        if(Objects.isNull(token)) {
-            return;
-        }
-
-        notificationToSend.setProduct(token.getProductId());
-        notificationToSend.setFilePath(token.getContractSigned());
-        notificationToSend.setFileName(Objects.isNull(token.getContractSigned()) ? "" : Paths.get(token.getContractSigned()).getFileName().toString());
-        notificationToSend.setContentType(token.getContractSigned());
-    }
-
     private String convertOnboardingStatusToNotificationStatus(OnboardingStatus status) {
         if (status.equals(OnboardingStatus.DELETED)) {
             return CLOSED;
@@ -189,4 +178,15 @@ private BillingToSend convertBilling(Billing billing) {
         billingToSend.setRecipientCode(billing.getRecipientCode());
         return billingToSend;
     }
+
+    @Override
+    public void setTokenData(NotificationToSend notificationToSend, Token token) {
+        if(Objects.isNull(token)) {
+            return;
+        }
+
+        notificationToSend.setProduct(token.getProductId());
+        notificationToSend.setFileName(Objects.isNull(token.getContractSigned()) ? "" : Paths.get(token.getContractSigned()).getFileName().toString());
+        notificationToSend.setContentType(token.getContractSigned());
+    }
 }
diff --git a/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/NotificationBuilder.java b/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/NotificationBuilder.java
@@ -14,6 +14,7 @@ default boolean shouldSendNotification(Onboarding onboarding, InstitutionRespons
         return true;
     }
     InstitutionToNotify retrieveInstitution(InstitutionResponse institution);
+    void setTokenData(NotificationToSend notificationToSend, Token token);
     void retrieveAndSetGeographicData(InstitutionToNotify institution);
     BillingToSend retrieveBilling(Onboarding onboarding);
 }
diff --git a/...ctions/src/main/java/it/pagopa/selfcare/onboarding/utils/StandardNotificationBuilder.java b/...ctions/src/main/java/it/pagopa/selfcare/onboarding/utils/StandardNotificationBuilder.java
@@ -41,4 +41,10 @@ public BillingToSend retrieveBilling(Onboarding onboarding) {
         billing.setTaxCodeInvoicing(onboarding.getBilling().getTaxCodeInvoicing());
         return billing;
     }
+
+    @Override
+    public void setTokenData(NotificationToSend notificationToSend, Token token) {
+        super.setTokenData(notificationToSend, token);
+        notificationToSend.setFilePath(token.getContractSigned());
+    }
 }
diff --git a/...unctions/src/test/java/it/pagopa/selfcare/onboarding/utils/FdNotificationBuilderTest.java b/...unctions/src/test/java/it/pagopa/selfcare/onboarding/utils/FdNotificationBuilderTest.java
@@ -86,5 +86,6 @@ void toNotificationToSendWhenOnboardingHasActivatedAtAndQueueEventAdd() {
         assertNull(notification.getBilling().getTaxCodeInvoicing());
         assertNull(notification.getBilling().isPublicServices());
         assertEquals(onboarding.getBilling().isPublicServices(), notification.getBilling().isPublicService());
+        assertNull(notification.getFilePath());
     }
 }
diff --git a/...nctions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java b/...nctions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java
@@ -115,6 +115,7 @@ void toNotificationToSendForEc() {
         assertEquals("provinceAbbreviation", notification.getInstitution().getCounty());
         assertEquals("countryAbbreviation", notification.getInstitution().getCountry());
         assertEquals("desc", notification.getInstitution().getCity());
+        assertNull(notification.getFilePath());
     }
 
     @Test

diff --git a/...ns/src/test/java/it/pagopa/selfcare/onboarding/utils/StandardNotificationBuilderTest.java b/...ns/src/test/java/it/pagopa/selfcare/onboarding/utils/StandardNotificationBuilderTest.java
@@ -75,6 +75,7 @@ void toNotificationToSendWhenOnboardingHasActivatedAtAndQueueEventAdd() {
         assertEquals(tokenId, notification.getOnboardingTokenId());
         assertEquals(onboarding.getActivatedAt(), notification.getCreatedAt().toLocalDateTime());
         assertEquals(onboarding.getActivatedAt(), notification.getUpdatedAt().toLocalDateTime());
+        assertEquals(token.getContractSigned(), notification.getFilePath());
         assertEquals(QueueEvent.ADD, notification.getNotificationType());
     }