[SELC-6150] feat: add institutionAggregatorContractMappings field in …

…Product (#663)
pagopa · Jan 8, 2025 · 8fc11b2 · 8fc11b2
1 parent 29c5794
commit 8fc11b2
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 10 deletions.
diff --git a/apps/onboarding-functions/pom.xml b/apps/onboarding-functions/pom.xml
@@ -22,7 +22,7 @@
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
-    <commons-sdk-version>0.6.2</commons-sdk-version>
+    <commons-sdk-version>0.6.3</commons-sdk-version>
   </properties>
 
   <dependencyManagement>

diff --git a/apps/onboarding-ms/pom.xml b/apps/onboarding-ms/pom.xml
@@ -24,7 +24,7 @@
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
         <quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
-        <commons-sdk-version>0.6.2</commons-sdk-version>
+        <commons-sdk-version>0.6.3</commons-sdk-version>
     </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/apps/pom.xml b/apps/pom.xml
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
 
   <properties>
-    <commons-sdk-version>0.6.2</commons-sdk-version>
+    <commons-sdk-version>0.6.3</commons-sdk-version>
   </properties>
 
     <dependencies>

diff --git a/libs/onboarding-sdk-azure-storage/pom.xml b/libs/onboarding-sdk-azure-storage/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>it.pagopa.selfcare</groupId>
     <artifactId>onboarding-sdk-pom</artifactId>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
     <relativePath>../onboarding-sdk-pom</relativePath>
   </parent>
 

diff --git a/libs/onboarding-sdk-common/pom.xml b/libs/onboarding-sdk-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.6.2</version>
+        <version>0.6.3</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-common</artifactId>

diff --git a/libs/onboarding-sdk-crypto/pom.xml b/libs/onboarding-sdk-crypto/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.6.2</version>
+        <version>0.6.3</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-crypto</artifactId>

diff --git a/libs/onboarding-sdk-pom/pom.xml b/libs/onboarding-sdk-pom/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>onboarding-sdk-pom</artifactId>
     <packaging>pom</packaging>
     <name>onboarding-sdk-pom</name>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/libs/onboarding-sdk-product/pom.xml b/libs/onboarding-sdk-product/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.6.2</version>
+        <version>0.6.3</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-product</artifactId>
     <name>onboarding-sdk-product</name>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
 
     <properties>
         <jackson.version>2.15.2</jackson.version>

diff --git a/libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/Product.java b/libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/Product.java
@@ -36,6 +36,8 @@ public class Product {
   private Product parent;
   private List<String> consumers;
   private Map<String, ContractTemplate> institutionContractMappings;
+  private Map<String, ContractTemplate> institutionAggregatorContractMappings;
+
   private Map<String, ContractTemplate> userContractMappings;
   private Map<String, ContractTemplate> userAggregatorContractMappings;
 
@@ -294,6 +296,15 @@ public void setInstitutionContractMappings(
     this.institutionContractMappings = institutionContractMappings;
   }
 
+  public Map<String, ContractTemplate> getInstitutionAggregatorContractMappings() {
+    return institutionAggregatorContractMappings;
+  }
+
+  public void setInstitutionAggregatorContractMappings(
+          Map<String, ContractTemplate> institutionAggregatorContractMappings) {
+    this.institutionAggregatorContractMappings = institutionAggregatorContractMappings;
+  }
+
   public Map<String, ContractTemplate> getUserContractMappings() {
     return userContractMappings;
   }
@@ -377,4 +388,17 @@ && getUserAggregatorContractMappings().containsKey(institutionType)) {
     }
     return userAggregatorContractTemplate;
   }
+
+  public ContractTemplate getInstitutionAggregatorContractTemplate(String institutionType) {
+    ContractTemplate contractTemplate = new ContractTemplate();
+    if (Objects.nonNull(getInstitutionAggregatorContractMappings())) {
+      if (Objects.nonNull(institutionType)
+              && getInstitutionAggregatorContractMappings().containsKey(institutionType)) {
+        contractTemplate = getInstitutionAggregatorContractMappings().get(institutionType);
+      } else if (getInstitutionAggregatorContractMappings().containsKey(CONTRACT_TYPE_DEFAULT)) {
+        contractTemplate = getInstitutionAggregatorContractMappings().get(CONTRACT_TYPE_DEFAULT);
+      }
+    }
+    return contractTemplate;
+  }
 }
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -19,7 +19,7 @@
             **/utils/**, **/*Constant*, **/*Config.java, **/error/**, **/filter/**, org/**
         </sonar.coverage.exclusions>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <commons-sdk-version>0.6.2</commons-sdk-version>
+        <commons-sdk-version>0.6.3</commons-sdk-version>
     </properties>
 
     <build>