Feature/fix ivass without taxcode (#225)

pagopa · Apr 29, 2024 · 914b910 · 914b910
1 parent fb23c2f
commit 914b910
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...or-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java b/...or-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java
@@ -24,7 +24,7 @@ public class OnboardingData {
     private InstitutionUpdate institutionUpdate;
     private InstitutionType institutionType;
     private String origin;
-    private String ivassCode;
+    private String originId;
     private String pricingPlan;
     private RootParent rootParent;
     private Boolean sendCompleteOnboardingEmail;

diff --git a/...src/main/java/it/pagopa/selfcare/external_api/connector/rest/mapper/OnboardingMapper.java b/...src/main/java/it/pagopa/selfcare/external_api/connector/rest/mapper/OnboardingMapper.java
@@ -50,6 +50,7 @@ default InstitutionBaseRequest toInstitutionBase(OnboardingData onboardingData)
                 .map(InstitutionPaSubunitType::valueOf)
                 .orElse(null));
         institution.setOrigin(Optional.ofNullable(onboardingData.getOrigin()).map(Origin::fromValue).orElse(null));
+        institution.setOriginId(onboardingData.getOriginId());
         if(Objects.nonNull(onboardingData.getLocation())) {
             institution.setCity(onboardingData.getLocation().getCity());
             institution.setCountry(onboardingData.getLocation().getCountry());
@@ -85,6 +86,7 @@ default InstitutionPspRequest toInstitutionPsp(OnboardingData onboardingData) {
                 .orElse(null));
 
         institutionPsp.setOrigin(Optional.ofNullable(onboardingData.getOrigin()).map(Origin::fromValue).orElse(null));
+        institutionPsp.setOriginId(onboardingData.getOriginId());
         if(Objects.nonNull(onboardingData.getLocation())) {
             institutionPsp.setCity(onboardingData.getLocation().getCity());
             institutionPsp.setCountry(onboardingData.getLocation().getCountry());

diff --git a/.../main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java b/.../main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java
@@ -34,7 +34,7 @@ public class OnboardingProductDto {
     private String origin;
 
     @ApiModelProperty(value = "${swagger.external_api.institutions.model.originId}")
-    private String ivassCode;
+    private String originId;
 
     @ApiModelProperty(value = "${swagger.external_api.institutions.model.pricingPlan}")
     private String pricingPlan;