Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SELC-6150] feat: add institutionAggregatorContractMappings field in Product #663

Merged
merged 1 commit into from
Jan 8, 2025
+34 −10
Merged

[SELC-6150] feat: add institutionAggregatorContractMappings field in Product #663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/onboarding-functions/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion apps/onboarding-ms/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion apps/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion libs/onboarding-sdk-azure-storage/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>

2 changes: 1 addition & 1 deletion libs/onboarding-sdk-common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion libs/onboarding-sdk-crypto/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion libs/onboarding-sdk-pom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions libs/onboarding-sdk-product/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
24 changes: 24 additions & 0 deletions libs/onboarding-sdk-product/src/main/java/it/pagopa/selfcare/product/entity/Product.java
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
2 changes: 1 addition & 1 deletion test-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>