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 - 5123] feat: added new isAggregator and aggregates fields to Onboarding Objects #317

Merged
merged 5 commits into from
Jun 18, 2024
Merged

[SELC - 5123] feat: added new isAggregator and aggregates fields to Onboarding Objects #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb3ecda
feat: added new isAggregator and aggregates fields to Onboarding Objects
gianmarcoplutino Jun 18, 2024
8880f07
feat: clean test
gianmarcoplutino Jun 18, 2024
4c4cce1
feat: updated openapi generato version
gianmarcoplutino Jun 18, 2024
33ce3a9
feat: updated sdk version
gianmarcoplutino Jun 18, 2024
fb38899
feat: added isAggregator to OnboardingResponse and updated onboarding…
gianmarcoplutino Jun 18, 2024
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
4 changes: 2 additions & 2 deletions apps/onboarding-cdc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<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.13</onboarding-sdk.version>
<quarkus-openapi-generator.version>2.2.13</quarkus-openapi-generator.version>
<onboarding-sdk.version>0.1.14</onboarding-sdk.version>
<quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
13 changes: 12 additions & 1 deletion apps/onboarding-cdc/src/main/openapi/onboarding_functions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
"$ref": "#/components/schemas/User"
}
},
"aggregates": {
"type": "array",
"items": {
"$ref": "#/components/schemas/Institution"
}
},
"billing": {
"$ref": "#/components/schemas/Billing"
},
Expand All @@ -225,6 +231,9 @@
"signContract": {
"type": "boolean"
},
"isAggregator": {
"type": "boolean"
},
"userRequestUid": {
"type": "string"
}
Expand Down Expand Up @@ -440,7 +449,9 @@
"CONFIRMATION",
"IMPORT",
"USERS",
"USERS_IMPORT"
"USERS_IMPORT",
"CONTRACT_REGISTRATION_AGGREGATOR",
"CONFIRMATION_AGGREGATE"
],
"type": "string"
},
Expand Down
8 changes: 7 additions & 1 deletion apps/onboarding-functions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.13</onboarding-sdk.version>
<onboarding-sdk.version>0.1.14</onboarding-sdk.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
</properties>

Expand Down Expand Up @@ -192,6 +192,12 @@
<artifactId>quarkus-jacoco</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>it.pagopa.selfcare</groupId>
<artifactId>onboarding-sdk-common</artifactId>
<version>0.1.14</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
13 changes: 13 additions & 0 deletions apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/Onboarding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class Onboarding {
private WorkflowType workflowType;
private Institution institution;
private List<User> users;
private List<Institution> aggregates;
private String pricingPlan;
private Billing billing;
private Boolean signContract;
Expand All @@ -32,6 +33,7 @@ public class Onboarding {
private LocalDateTime activatedAt;
private LocalDateTime deletedAt;
private String reasonForReject;
private Boolean isAggregator;

public String getId() {
return id;
Expand Down Expand Up @@ -156,6 +158,7 @@ public LocalDateTime getUpdatedAt() {
public void setUpdatedAt(LocalDateTime updatedAt) {
this.updatedAt = updatedAt;
}

public LocalDateTime getActivatedAt() {
return activatedAt;
}
Expand All @@ -172,6 +175,14 @@ public void setDeletedAt(LocalDateTime deletedAt) {
this.deletedAt = deletedAt;
}

public List<Institution> getAggregates() { return aggregates; }

public void setAggregates(List<Institution> aggregates) { this.aggregates = aggregates; }

public Boolean getIsAggregator() { return isAggregator; }

public void setIsAggregator(Boolean isAggregator) { this.isAggregator = isAggregator; }

@Override
public String toString() {
return "Onboarding{" +
Expand All @@ -191,6 +202,8 @@ public String toString() {
", activatedAt=" + activatedAt +
", deletedAt=" + deletedAt +
", reasonForReject='" + reasonForReject + '\'' +
", aggregates=" + aggregates +
", isAggregator='" + isAggregator + '\'' +
'}';
}
}
11 changes: 8 additions & 3 deletions apps/onboarding-ms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<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.13</onboarding-sdk.version>
<quarkus-openapi-generator.version>2.2.13</quarkus-openapi-generator.version>
<onboarding-sdk.version>0.1.14</onboarding-sdk.version>
<quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -236,7 +236,12 @@
<artifactId>jaxb-impl</artifactId>
<version>2.3.4</version>
</dependency>

<dependency>
<groupId>it.pagopa.selfcare</groupId>
<artifactId>onboarding-sdk-common</artifactId>
<version>0.1.14</version>
<scope>compile</scope>
</dependency>


</dependencies>
Expand Down
Loading
Loading