fix: institution type from ipa and mapper contract path (#336)

* save PA when create from ipa * fix toOnboarding mapper
pagopa · Dec 18, 2023 · 46e1d4f · 46e1d4f
1 parent fd6dd09
commit 46e1d4f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/core/src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyIpa.java b/core/src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyIpa.java
@@ -1,5 +1,6 @@
 package it.pagopa.selfcare.mscore.core.strategy;
 
+import it.pagopa.selfcare.commons.base.utils.InstitutionType;
 import it.pagopa.selfcare.mscore.api.InstitutionConnector;
 import it.pagopa.selfcare.mscore.api.PartyRegistryProxyConnector;
 import it.pagopa.selfcare.mscore.constant.Origin;
@@ -87,6 +88,7 @@ private Institution getInstitutionEC(String taxCode, InstitutionProxyInfo instit
         GeographicTaxonomies geotax = partyRegistryProxyConnector.getExtByCode(institutionProxyInfo.getIstatCode());
 
         newInstitution.setExternalId(taxCode);
+        newInstitution.setInstitutionType(InstitutionType.PA);
         newInstitution.setOrigin(Origin.IPA.getValue());
         newInstitution.setCreatedAt(OffsetDateTime.now());
         newInstitution.setCity(Optional.ofNullable(geotax.getDescription())
@@ -113,6 +115,7 @@ private Institution mappingToInstitutionIPAAoo(CreateInstitutionStrategyInput st
         AreaOrganizzativaOmogenea areaOrganizzativaOmogenea = partyRegistryProxyConnector.getAooById(strategyInput.getSubunitCode());
         GeographicTaxonomies geotax = partyRegistryProxyConnector.getExtByCode(areaOrganizzativaOmogenea.getCodiceComuneISTAT());
         Institution newInstitution = new Institution();
+        newInstitution.setInstitutionType(InstitutionType.PA);
         newInstitution.setOriginId(areaOrganizzativaOmogenea.getId());
         newInstitution.setDescription(areaOrganizzativaOmogenea.getDenominazioneAoo());
         newInstitution.setDigitalAddress(TYPE_MAIL_PEC.equals(areaOrganizzativaOmogenea.getTipoMail1())
@@ -152,6 +155,7 @@ private Institution mappingToInstitutionIPAUo(CreateInstitutionStrategyInput str
         UnitaOrganizzativa unitaOrganizzativa = partyRegistryProxyConnector.getUoById(strategyInput.getSubunitCode());
         GeographicTaxonomies geotax = partyRegistryProxyConnector.getExtByCode(unitaOrganizzativa.getCodiceComuneISTAT());
         Institution newInstitution = new Institution();
+        newInstitution.setInstitutionType(InstitutionType.PA);
         newInstitution.setOriginId(unitaOrganizzativa.getId());
         newInstitution.setDescription(unitaOrganizzativa.getDescrizioneUo());
         newInstitution.setDigitalAddress(TYPE_MAIL_PEC.equals(unitaOrganizzativa.getTipoMail1())

diff --git a/.../src/test/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyTest.java b/.../src/test/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyTest.java
@@ -248,6 +248,7 @@ void shouldCreateInstitutionFromIpaAoo() {
                         .build());
 
         //Then
+        assertThat(actual.getInstitutionType()).isEqualTo(InstitutionType.PA);
         assertThat(actual.getOriginId()).isEqualTo(dummyAreaOrganizzativaOmogenea.getId());
         assertThat(actual.getDescription()).isEqualTo(dummyAreaOrganizzativaOmogenea.getDenominazioneAoo());
         assertThat(actual.getDigitalAddress()).isEqualTo(dummyInstitutionProxyInfo.getDigitalAddress());
@@ -294,6 +295,7 @@ void shouldCreateInstitutionFromIpaUo() {
         assertThat(actual.getOriginId()).isEqualTo(dummyUnitaOrganizzativa.getId());
         assertThat(actual.getDescription()).isEqualTo(dummyUnitaOrganizzativa.getDescrizioneUo());
 
+        assertThat(actual.getInstitutionType()).isEqualTo(InstitutionType.PA);
         assertThat(actual.getDigitalAddress()).isEqualTo(dummyInstitutionProxyInfo.getDigitalAddress());
         assertThat(actual.getAddress()).isEqualTo(dummyUnitaOrganizzativa.getIndirizzo());
         assertThat(actual.getZipCode()).isEqualTo(dummyUnitaOrganizzativa.getCAP());
@@ -371,6 +373,7 @@ void shouldCreateInstitutionFromIpaUoRetrievingExistingEc() {
         assertThat(actual.getOriginId()).isEqualTo(dummyUnitaOrganizzativa.getId());
         assertThat(actual.getDescription()).isEqualTo(dummyUnitaOrganizzativa.getDescrizioneUo());
 
+        assertThat(actual.getInstitutionType()).isEqualTo(InstitutionType.PA);
         assertThat(actual.getDigitalAddress()).isEqualTo(dummyInstitutionProxyInfo.getDigitalAddress());
         assertThat(actual.getAddress()).isEqualTo(dummyUnitaOrganizzativa.getIndirizzo());
         assertThat(actual.getZipCode()).isEqualTo(dummyUnitaOrganizzativa.getCAP());

diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/OnboardingResourceMapper.java
@@ -34,5 +34,6 @@ default Boolean mapSignContract(Boolean signContract) {
         return Optional.ofNullable(signContract).orElse(true);
     }
 
+    @Mapping(target = "contract", source = "contractPath")
     Onboarding toOnboarding(InstitutionOnboardingRequest onboardingRequest);
 }