Fixed emailRegistrationPath

pagopa · Sep 24, 2024 · 1c0ad7a · 1c0ad7a
1 parent 4b1ac8b
commit 1c0ad7a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflow.java b/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflow.java
@@ -25,7 +25,7 @@ public OnboardingWorkflow() {
     }
 
     protected Onboarding onboarding;
-    public abstract String emailRegistrationPath(MailTemplatePathConfig config);
+    public abstract String emailRegistrationPath(MailTemplatePathConfig config, Product product);
 
     public abstract String getEmailCompletionPath(MailTemplatePathConfig config);
 

diff --git a/...ions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowAggregator.java b/...ions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowAggregator.java
@@ -31,7 +31,7 @@ public String getPdfFormatFilename() {
     }
 
     @Override
-    public String emailRegistrationPath(MailTemplatePathConfig config) {
+    public String emailRegistrationPath(MailTemplatePathConfig config, Product product) {
         return config.registrationAggregatorPath();
     }
 

diff --git a/...ons/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java b/...ons/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java
@@ -26,8 +26,8 @@ public OnboardingWorkflowInstitution(Onboarding onboarding, String type) {
     }
 
     @Override
-    public String emailRegistrationPath(MailTemplatePathConfig config) {
-        return config.registrationPath();
+    public String emailRegistrationPath(MailTemplatePathConfig config, Product product) {
+        return getCurrentTemplatePath(product, config.registrationPath());
     }
 
     @Override
@@ -63,15 +63,10 @@ public String getRejectTokenUrl(MailTemplatePlaceholdersConfig config) {
 
     @Override
     public String getContractTemplatePath(Product product) {
-        if(Objects.isNull(onboarding.getInstitution()) || Objects.isNull(onboarding.getInstitution().getInstitutionType())){
+        if (Objects.isNull(onboarding.getInstitution()) || Objects.isNull(onboarding.getInstitution().getInstitutionType())) {
             return null;
         }
-
-        return Optional.ofNullable(product.getInstitutionContractMappings())
-                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType().name()))
-                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType().name()))
-                .map(ContractStorage::getContractTemplatePath)
-                .orElse(product.getContractTemplatePath());
+        return getCurrentTemplatePath(product, product.getContractTemplatePath());
     }
 
     @Override
@@ -86,4 +81,12 @@ public String getType() {
     public void setType(String type) {
         this.type = type;
     }
+
+    private String getCurrentTemplatePath(Product product, String templatePath) {
+        return Optional.ofNullable(product.getInstitutionContractMappings())
+                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType().name()))
+                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType().name()))
+                .map(ContractStorage::getContractTemplatePath)
+                .orElse(templatePath);
+    }
 }
diff --git a/...-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowUser.java b/...-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowUser.java
@@ -24,7 +24,7 @@ public OnboardingWorkflowUser() {
 
 
     @Override
-    public String emailRegistrationPath(MailTemplatePathConfig config) {
+    public String emailRegistrationPath(MailTemplatePathConfig config, Product product) {
         final String managerId =  this.onboarding.getUsers().stream()
                 .filter(user -> PartyRole.MANAGER == user.getRole())
                 .map(User::getId)

diff --git a/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java b/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
@@ -161,7 +161,9 @@ public void sendMailRegistrationForContract(OnboardingWorkflow onboardingWorkflo
         Onboarding onboarding = onboardingWorkflow.getOnboarding();
         SendMailInput sendMailInput = builderWithProductAndUserRequest(onboarding);
 
-        final String templatePath = onboardingWorkflow.emailRegistrationPath(mailTemplatePathConfig);
+        Product product = productService.getProductIsValid(onboarding.getProductId());
+
+        final String templatePath = onboardingWorkflow.emailRegistrationPath(mailTemplatePathConfig, product);
         final String confirmTokenUrl = onboardingWorkflow.getConfirmTokenUrl(mailTemplatePlaceholdersConfig);
 
         notificationService.sendMailRegistrationForContract(onboarding.getId(),
@@ -186,9 +188,8 @@ public void sendMailRegistrationForContractWhenApprove(OnboardingWorkflow onboar
                 onboarding.getInstitution().getDigitalAddress(),
                 onboarding.getInstitution().getDescription(), "",
                 product.getTitle(), "description",
-                onboardingWorkflow.emailRegistrationPath(mailTemplatePathConfig),
+                onboardingWorkflow.emailRegistrationPath(mailTemplatePathConfig, product),
                 onboardingWorkflow.getConfirmTokenUrl(mailTemplatePlaceholdersConfig));
-
     }
 
     public void sendMailRegistrationApprove(Onboarding onboarding) {