feat: using sdk-product 0.2.0

pagopa · Sep 9, 2024 · 9620932 · 9620932
1 parent 01aba7e
commit 9620932
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/apps/onboarding-cdc/pom.xml b/apps/onboarding-cdc/pom.xml
@@ -24,7 +24,7 @@
         <quarkus.platform.version>3.5.2</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
-        <onboarding-sdk.version>0.1.21</onboarding-sdk.version>
+        <onboarding-sdk.version>0.2.0</onboarding-sdk.version>
         <quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
     </properties>
     <dependencyManagement>

diff --git a/apps/onboarding-functions/pom.xml b/apps/onboarding-functions/pom.xml
@@ -21,7 +21,7 @@
     <quarkus.platform.version>3.5.1</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
-    <onboarding-sdk.version>0.1.21</onboarding-sdk.version>
+    <onboarding-sdk.version>0.2.0</onboarding-sdk.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
   </properties>
 

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
@@ -6,6 +6,7 @@
 import it.pagopa.selfcare.product.entity.ContractStorage;
 import it.pagopa.selfcare.product.entity.Product;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public class OnboardingWorkflowAggregator extends OnboardingWorkflow {
@@ -41,9 +42,13 @@ public String getEmailCompletionPath(MailTemplatePathConfig config) {
 
     @Override
     public String getContractTemplatePath(Product product) {
+        if(Objects.isNull(onboarding.getInstitution()) || Objects.isNull(onboarding.getInstitution().getInstitutionType())){
+            return null;
+        }
+
         return Optional.ofNullable(product.getInstitutionContractMappings())
-                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType()))
-                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType()))
+                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType().name()))
+                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType().name()))
                 .map(ContractStorage::getContractTemplatePath)
                 .orElse(product.getContractTemplatePath());
     }

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
@@ -7,6 +7,7 @@
 import it.pagopa.selfcare.product.entity.ContractStorage;
 import it.pagopa.selfcare.product.entity.Product;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import static it.pagopa.selfcare.onboarding.common.ProductId.PROD_FD;
@@ -62,10 +63,13 @@ public String getRejectTokenUrl(MailTemplatePlaceholdersConfig config) {
 
     @Override
     public String getContractTemplatePath(Product product) {
+        if(Objects.isNull(onboarding.getInstitution()) || Objects.isNull(onboarding.getInstitution().getInstitutionType())){
+            return null;
+        }
 
         return Optional.ofNullable(product.getInstitutionContractMappings())
-                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType()))
-                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType()))
+                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType().name()))
+                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType().name()))
                 .map(ContractStorage::getContractTemplatePath)
                 .orElse(product.getContractTemplatePath());
     }

diff --git a/...-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java b/...-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java
@@ -118,10 +118,10 @@ void createContract_InstitutionContractMappings() {
 
         Product product = createDummyProduct();
         /* add contract mapping */
-        Map<InstitutionType, ContractStorage> contractStorageMap = new HashMap<>();
+        Map<String, ContractStorage> contractStorageMap = new HashMap<>();
         ContractStorage contractStorage = new ContractStorage();
         contractStorage.setContractTemplatePath("setContractTemplatePath");
-        contractStorageMap.put(onboarding.getInstitution().getInstitutionType(), contractStorage);
+        contractStorageMap.put(onboarding.getInstitution().getInstitutionType().name(), contractStorage);
         product.setInstitutionContractMappings(contractStorageMap);
 
         when(userRegistryApi.findByIdUsingGET(USERS_WORKS_FIELD_LIST,manager.getId()))

diff --git a/apps/onboarding-ms/pom.xml b/apps/onboarding-ms/pom.xml
@@ -23,7 +23,7 @@
         <quarkus.platform.version>3.11.2</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
-        <onboarding-sdk.version>0.1.21</onboarding-sdk.version>
+        <onboarding-sdk.version>0.2.0</onboarding-sdk.version>
         <quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
     </properties>
     <dependencyManagement>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -77,22 +77,22 @@
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-product</artifactId>
-                    <version>0.1.21</version>
+                    <version>0.2.0</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-common</artifactId>
-                    <version>0.1.21</version>
+                    <version>0.2.0</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-azure-storage</artifactId>
-                    <version>0.1.21</version>
+                    <version>0.2.0</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-crypto</artifactId>
-                    <version>0.1.21</version>
+                    <version>0.2.0</version>
                 </dependency>
             </dependencies>