[SELC-5318] feat: add contacts to CreateInstitutionRaw and update institution if it already exists (#22)

Author: giulia-tremolada

apps/institution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/InstitutionServiceImpl.java

@@ -141,6 +141,8 @@ public Institution createInstitution(Institution institution) {
                         .subunitType(Optional.ofNullable(institution.getSubunitType())
                                 .map(InstitutionPaSubunitType::valueOf)
                                 .orElse(null))
+                        .supportEmail(institution.getSupportEmail())
+                        .supportPhone(institution.getSupportPhone())
                         .build());
     }
 

apps/institution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyCommon.java

@@ -11,8 +11,6 @@
 import java.time.OffsetDateTime;
 import java.util.List;
 
-import static it.pagopa.selfcare.mscore.constant.CustomError.CREATE_INSTITUTION_ORIGIN_CONFLICT;
-
 @Slf4j
 @Component
 public class CreateInstitutionStrategyCommon {
@@ -30,14 +28,6 @@ protected void checkIfAlreadyExistsByTaxCodeAndSubunitCode(String taxCode, Strin
                     CustomError.CREATE_INSTITUTION_CONFLICT.getCode());
     }
 
-    protected void checkIfAlreadyExistByOriginAndOriginId(String origin, String originId) {
-        List<Institution> institutions = institutionConnector.findByOriginAndOriginId(origin, originId);
-        if (!institutions.isEmpty())
-            throw new ResourceConflictException(String.format(
-                    CREATE_INSTITUTION_ORIGIN_CONFLICT.getMessage(), origin, originId),
-                    CREATE_INSTITUTION_ORIGIN_CONFLICT.getCode());
-    }
-
     protected static void setUpdatedFields(CreateInstitutionStrategyInput strategyInput, Institution toSavedOrUpdate) {
         if (strategyInput.getDescription() != null) {
             toSavedOrUpdate.setDescription(strategyInput.getDescription());

apps/institution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyRaw.java

@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Component;
 
 import java.time.OffsetDateTime;
+import java.util.List;
 
 import static it.pagopa.selfcare.mscore.constant.GenericError.CREATE_INSTITUTION_ERROR;
 
@@ -23,12 +24,18 @@ public CreateInstitutionStrategyRaw(InstitutionConnector institutionConnector) {
     @Override
     public Institution createInstitution(CreateInstitutionStrategyInput strategyInput) {
 
-        checkIfAlreadyExistsByTaxCodeAndSubunitCode(strategyInput.getTaxCode(), strategyInput.getSubunitCode());
-
-        institution.setExternalId(getExternalId(strategyInput));
-        institution.setOrigin(Origin.SELC.getValue());
-        institution.setOriginId("SELC_" + institution.getExternalId());
-        institution.setCreatedAt(OffsetDateTime.now());
+        List<Institution> institutions = institutionConnector.findByTaxCodeAndSubunitCode(strategyInput.getTaxCode(), strategyInput.getSubunitCode());
+
+        if (institutions.isEmpty()) {
+            institution.setExternalId(getExternalId(strategyInput));
+            institution.setOrigin(Origin.SELC.getValue());
+            institution.setOriginId("SELC_" + institution.getExternalId());
+            institution.setCreatedAt(OffsetDateTime.now());
+            setContacts(strategyInput, institution);
+        } else {
+            institution = institutions.get(0);
+            setUpdatedFields(strategyInput, institution);
+        }
 
         try {
             return institutionConnector.save(institution);

apps/institution-ms/core/src/test/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyTest.java

@@ -11,7 +11,6 @@
 import it.pagopa.selfcare.mscore.core.strategy.input.CreateInstitutionStrategyInput;
 import it.pagopa.selfcare.mscore.core.util.InstitutionPaSubunitType;
 import it.pagopa.selfcare.mscore.core.util.TestUtils;
-import it.pagopa.selfcare.mscore.exception.ResourceConflictException;
 import it.pagopa.selfcare.mscore.exception.ResourceNotFoundException;
 import it.pagopa.selfcare.mscore.model.AreaOrganizzativaOmogenea;
 import it.pagopa.selfcare.mscore.model.UnitaOrganizzativa;
@@ -27,7 +26,6 @@
 import java.util.Optional;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
@@ -167,11 +165,24 @@ void shouldCreateInstitutionFromIvassIfAlreadyExists() {
     @Test
     void shouldThrowExceptionOnCreateInstitutionIfAlreadyExists() {
 
+        Institution institution = new Institution();
+        institution.setId("id");
+
+        when(institutionConnector.findByTaxCodeAndSubunitCode(any(), any())). thenReturn(List.of(institution));
+        when(institutionConnector.save(any())).thenAnswer(args -> args.getArguments()[0]);
+
         when(institutionConnector.findByTaxCodeAndSubunitCode(any(), any()))
                 .thenReturn(List.of(new Institution()));
-        assertThrows(ResourceConflictException.class, () -> strategyFactory.createInstitutionStrategy(new Institution())
+
+        Institution actual = strategyFactory.createInstitutionStrategy(new Institution())
                 .createInstitution(CreateInstitutionStrategyInput.builder()
-                        .build()));
+                        .supportEmail(SUPPORT_EMAIL)
+                        .supportPhone(SUPPORT_PHONE)
+                        .build());
+
+        assertThat(actual.getSupportEmail()).isEqualTo(SUPPORT_EMAIL);
+        assertThat(actual.getSupportPhone()).isEqualTo(SUPPORT_PHONE);
+        verifyNoInteractions(partyRegistryProxyConnector);
     }
 
     /**