Merge branch 'release-dev' into feature/SELC-3832

pagopa · Jan 19, 2024 · 579d0ff · 579d0ff
2 parents 04357fc + 1e214ee
commit 579d0ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 0 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -4153,6 +4153,10 @@
             "description" : "Manager specific data. It's required when institutionType is not PT",
             "$ref" : "#/components/schemas/UserInfo"
           },
+          "productId" : {
+            "type" : "string",
+            "description" : "Product's identifier"
+          },
           "status" : {
             "type" : "string",
             "description" : "Onboarding request's status",

diff --git a/...rc/main/java/it/pagopa/selfcare/dashboard/connector/onboarding/OnboardingRequestInfo.java b/...rc/main/java/it/pagopa/selfcare/dashboard/connector/onboarding/OnboardingRequestInfo.java
@@ -12,5 +12,6 @@ public class OnboardingRequestInfo {
     private InstitutionInfo institutionInfo;
     private UserInfo manager;
     private List<UserInfo> admins;
+    private String productId;
 
 }
diff --git a/...or/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/PartyConnectorImpl.java b/...or/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/PartyConnectorImpl.java
@@ -476,6 +476,7 @@ public OnboardingRequestInfo getOnboardingRequestInfo(String tokenId) {
         final OnboardingRequestInfo onboardingRequestInfo = new OnboardingRequestInfo();
         onboardingRequestInfo.setAdmins(new ArrayList<>());
         final TokenInfo tokenInfo = partyManagementRestClient.getToken(UUID.fromString(tokenId));
+        onboardingRequestInfo.setProductId(tokenInfo.getProductId());
         tokenInfo.getLegals().forEach(relationshipBinding -> {
             final UserInfo userInfo = new UserInfo();
             userInfo.setId(relationshipBinding.getPartyId().toString());

diff --git a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/mapper/OnboardingRequestMapper.java b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/mapper/OnboardingRequestMapper.java
@@ -36,6 +36,7 @@ public static OnboardingRequestResource toResource(OnboardingRequestInfo model)
                             .ifPresent(userInfos -> resource.setAdmins(userInfos.stream()
                                     .map(userInfo -> toResource(userInfo.getUser(), institutionId))
                                     .collect(Collectors.toList())));
+                    resource.setProductId(model.getProductId());
                     return resource;
                 }).orElse(null);
     }

diff --git a/...ain/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java b/...ain/java/it/pagopa/selfcare/dashboard/web/model/onboarding/OnboardingRequestResource.java
@@ -30,6 +30,9 @@ public class OnboardingRequestResource {
     @ApiModelProperty(value = "${swagger.dashboard.onboarding-request.model.admins}")
     private List<UserInfo> admins;
 
+    @ApiModelProperty(value = "${swagger.dashboard.onboarding-request.model.productId}")
+    private String productId;
+
 
     @Data
     @EqualsAndHashCode(of = "id")

diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties
@@ -159,6 +159,7 @@ swagger.dashboard.onboarding-request.model.status=Onboarding request's status
 swagger.dashboard.onboarding-request.model.institutionInfo=Institution specific data
 swagger.dashboard.onboarding-request.model.manager=Manager specific data. It's required when institutionType is not PT
 swagger.dashboard.onboarding-request.model.admins=Administrators specific data
+swagger.dashboard.onboarding-request.model.productId=Product's identifier
 swagger.dashboard.brokers.model.code=Partner's code
 swagger.dashboard.brokers.model.description=Partner's description
 swagger.dashboard.brokers.model.enabled=Partner's enabling