From 914b910e3c2626cbdc14e99c75d1feded9b5a29a Mon Sep 17 00:00:00 2001
From: andrea-putzu <106688558+andrea-putzu@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:51:31 +0200
Subject: [PATCH] Feature/fix ivass without taxcode (#225)

---
 .../selfcare/external_api/model/onboarding/OnboardingData.java  | 2 +-
 .../external_api/connector/rest/mapper/OnboardingMapper.java    | 2 ++
 .../external_api/web/model/onboarding/OnboardingProductDto.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/connector-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java b/connector-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java
index f91b7974..ef54f382 100644
--- a/connector-api/src/main/java/it/pagopa/selfcare/external_api/model/onboarding/OnboardingData.java
+++ b/connector-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/connector/rest/src/main/java/it/pagopa/selfcare/external_api/connector/rest/mapper/OnboardingMapper.java b/connector/rest/src/main/java/it/pagopa/selfcare/external_api/connector/rest/mapper/OnboardingMapper.java
index ae073701..e72e9c68 100644
--- a/connector/rest/src/main/java/it/pagopa/selfcare/external_api/connector/rest/mapper/OnboardingMapper.java
+++ b/connector/rest/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/web/src/main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java b/web/src/main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java
index a1ae412c..7fde9352 100644
--- a/web/src/main/java/it/pagopa/selfcare/external_api/web/model/onboarding/OnboardingProductDto.java
+++ b/web/src/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;