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

pagopa · Jan 18, 2024 · 04357fc · 04357fc
2 parents e3b9980 + 4a782be
commit 04357fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -3335,9 +3335,8 @@
             "type" : "boolean"
           },
           "agentOfPublicServiceNote" : {
-            "type" : "boolean",
-            "description" : "agentOfPublicService Note",
-            "example" : false
+            "type" : "string",
+            "description" : "agentOfPublicService Note"
           },
           "belongRegulatedMarket" : {
             "type" : "boolean",

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
@@ -103,7 +103,7 @@ public static OnboardingRequestResource.InstitutionInfo.AdditionalInformations t
                     resource.setBelongRegulatedMarket(additionaInformations.isBelongRegulatedMarket());
                     resource.setRegulatedMarketNote(additionaInformations.getRegulatedMarketNote());
                     resource.setAgentOfPublicService(additionaInformations.isAgentOfPublicService());
-                    resource.setAgentOfPublicServiceNote(additionaInformations.isAgentOfPublicService());
+                    resource.setAgentOfPublicServiceNote(additionaInformations.getAgentOfPublicServiceNote());
                     resource.setEstablishedByRegulatoryProvision(additionaInformations.isEstablishedByRegulatoryProvision());
                     resource.setEstablishedByRegulatoryProvisionNote(additionaInformations.getEstablishedByRegulatoryProvisionNote());
                     return resource;

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
@@ -113,7 +113,7 @@ public static class AdditionalInformations{
             private boolean isAgentOfPublicService;
 
             @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.agentOfPublicServiceNote}")
-            private boolean agentOfPublicServiceNote;
+            private String agentOfPublicServiceNote;
 
             @ApiModelProperty(value = "${swagger.dashboard.institutions.model.additionalInformations.otherNote}")
             private String otherNote;