feat: remove InstitutionType from Product and increase version 0.2.0

Author: manuraf

libs/onboarding-sdk-azure-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.1.21</version>
+        <version>0.2.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
 

libs/onboarding-sdk-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.1.21</version>
+        <version>0.2.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-common</artifactId>

libs/onboarding-sdk-crypto/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.1.21</version>
+        <version>0.2.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-crypto</artifactId>

libs/onboarding-sdk-pom/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>onboarding-sdk-pom</artifactId>
     <packaging>pom</packaging>
     <name>onboarding-sdk-pom</name>
-    <version>0.1.21</version>
+    <version>0.2.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

libs/onboarding-sdk-product/pom.xml

@@ -4,16 +4,16 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.1.21</version>
+        <version>0.2.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-product</artifactId>
     <name>onboarding-sdk-product</name>
-    <version>0.1.21</version>
+    <version>0.2.0</version>
 
     <properties>
         <jackson.version>2.15.2</jackson.version>
-        <onboarding-sdk.version>0.1.21</onboarding-sdk.version>
+        <onboarding-sdk.version>0.2.0</onboarding-sdk.version>
     </properties>
 
     <dependencies>

libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/Product.java

@@ -1,6 +1,5 @@
 package it.pagopa.selfcare.product.entity;
 
-import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.onboarding.common.PartyRole;
 
 import java.time.Instant;
@@ -27,7 +26,7 @@ public class Product {
     private Instant contractTemplateUpdatedAt;
     private String contractTemplatePath;
     private String contractTemplateVersion;
-    private Map<InstitutionType, ContractStorage> institutionContractMappings;
+    private Map<String, ContractStorage> institutionContractMappings;
     private boolean enabled = true;
     private boolean delegable;
     private boolean invoiceable;
@@ -177,11 +176,11 @@ public void setContractTemplateVersion(String contractTemplateVersion) {
         this.contractTemplateVersion = contractTemplateVersion;
     }
 
-    public Map<InstitutionType, ContractStorage> getInstitutionContractMappings() {
+    public Map<String, ContractStorage> getInstitutionContractMappings() {
         return institutionContractMappings;
     }
 
-    public void setInstitutionContractMappings(Map<InstitutionType, ContractStorage> institutionContractMappings) {
+    public void setInstitutionContractMappings(Map<String, ContractStorage> institutionContractMappings) {
         this.institutionContractMappings = institutionContractMappings;
     }
 

libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/service/ProductServiceDefault.java

@@ -10,10 +10,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.onboarding.common.PartyRole;
-import it.pagopa.selfcare.product.entity.Product;
-import it.pagopa.selfcare.product.entity.ProductRole;
-import it.pagopa.selfcare.product.entity.ProductRoleInfo;
-import it.pagopa.selfcare.product.entity.ProductStatus;
+import it.pagopa.selfcare.product.entity.*;
 import it.pagopa.selfcare.product.exception.InvalidRoleMappingException;
 import it.pagopa.selfcare.product.exception.ProductNotFoundException;
 
@@ -148,9 +145,10 @@ private Product getProduct(String productId, boolean filterValid) {
      */
     @Override
     public void fillContractTemplatePathAndVersion(Product product, InstitutionType institutionType) {
-        if (institutionType != null && product.getInstitutionContractMappings() != null && product.getInstitutionContractMappings().containsKey(institutionType)) {
-            product.setContractTemplatePath(product.getInstitutionContractMappings().get(institutionType).getContractTemplatePath());
-            product.setContractTemplateVersion(product.getInstitutionContractMappings().get(institutionType).getContractTemplateVersion());
+        if (Objects.nonNull(institutionType) && Objects.nonNull(product.getInstitutionContractMappings())
+                && product.getInstitutionContractMappings().containsKey(institutionType.name())) {
+            product.setContractTemplatePath(product.getInstitutionContractMappings().get(institutionType.name()).getContractTemplatePath());
+            product.setContractTemplateVersion(product.getInstitutionContractMappings().get(institutionType.name()).getContractTemplateVersion());
         }
     }
 
@@ -204,5 +202,4 @@ private static boolean statusIsNotValid(ProductStatus status) {
         return List.of(ProductStatus.INACTIVE, ProductStatus.PHASE_OUT).contains(status);
     }
 
-
 }