[SELC-5308] feat: add contacts to createInstitutionFromIvass and upda…

…te Institution if it already exists (#21)
pagopa · Aug 7, 2024 · bfaeb3f · bfaeb3f
1 parent 9adeb19
commit bfaeb3f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/...titution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/InstitutionServiceImpl.java b/...titution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/InstitutionServiceImpl.java
@@ -163,6 +163,8 @@ public Institution createInstitutionFromIvass(Institution institution) {
  return createInstitutionStrategyFactory.createInstitutionStrategyIvass(institution)
  .createInstitution(CreateInstitutionStrategyInput.builder()
  .ivassCode(institution.getOriginId())
+ .supportEmail(institution.getSupportEmail())
+ .supportPhone(institution.getSupportPhone())
  .build());
  }
 

diff --git a/...src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyIvass.java b/...src/main/java/it/pagopa/selfcare/mscore/core/strategy/CreateInstitutionStrategyIvass.java
@@ -7,16 +7,19 @@
 import it.pagopa.selfcare.mscore.exception.MsCoreException;
 import it.pagopa.selfcare.mscore.model.institution.ASResource;
 import it.pagopa.selfcare.mscore.model.institution.Institution;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.OffsetDateTime;
+import java.util.List;
 
 import static it.pagopa.selfcare.mscore.constant.GenericError.CREATE_INSTITUTION_ERROR;
 
 @Slf4j
 public class CreateInstitutionStrategyIvass extends CreateInstitutionStrategyCommon implements CreateInstitutionStrategy {
  private final PartyRegistryProxyConnector partyRegistryProxyConnector;
 
+ @Setter
  private Institution institution;
 
  public CreateInstitutionStrategyIvass(PartyRegistryProxyConnector partyRegistryProxyConnector,
@@ -25,17 +28,25 @@ public CreateInstitutionStrategyIvass(PartyRegistryProxyConnector partyRegistryP
  this.partyRegistryProxyConnector = partyRegistryProxyConnector;
  }
 
- public void setInstitution(Institution institution) {
- this.institution = institution;
- }
-
  @Override
  public Institution createInstitution(CreateInstitutionStrategyInput strategyInput) {
- checkIfAlreadyExistByOriginAndOriginId(Origin.IVASS.name(), strategyInput.getIvassCode());
 
- ASResource asResource = partyRegistryProxyConnector.getASFromIvass(strategyInput.getIvassCode());
+ List<Institution> institutions = institutionConnector.findByOriginAndOriginId(Origin.IVASS.name(), strategyInput.getIvassCode());
+
+ if (institutions.isEmpty()) {
+
+ ASResource asResource = partyRegistryProxyConnector.getASFromIvass(strategyInput.getIvassCode());
+
+ institution = addFieldsToInstitution(asResource);
+
+ setContacts(strategyInput, institution);
+
+ } else {
+ //Institution exists but other fields could be updated
+ institution = institutions.get(0);
+ setUpdatedFields(strategyInput, institution);
+ }
 
- institution = addFieldsToInstitution(asResource);
  try {
  return institutionConnector.save(institution);
  } catch (Exception e) {

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
@@ -139,16 +139,29 @@ void shouldThrowExceptionOnCreateInstitutionFromIpaIfAlreadyExists() {
  }
 
  @Test
- void shouldThrowMsCoreExceptionWhenInstitutionAlreadyExists() {
+ void shouldCreateInstitutionFromIvassIfAlreadyExists() {
  String origin = "IVASS";
  String originId = "12345";
 
- when(institutionConnector.findByOriginAndOriginId(origin, originId)).thenReturn(List.of(new Institution()));
+ Institution institution = new Institution();
+ institution.setId("id");
+ institution.setOrigin(origin);
+ institution.setOriginId(originId);
+
+ when(institutionConnector.findByOriginAndOriginId(any(), any())). thenReturn(List.of(institution));
+ when(institutionConnector.save(any())).thenAnswer(args -> args.getArguments()[0]);
 
- assertThrows(ResourceConflictException.class, () -> strategyFactory.createInstitutionStrategyIvass(new Institution())
+
+ Institution actual = strategyFactory.createInstitutionStrategyIvass(new Institution())
  .createInstitution(CreateInstitutionStrategyInput.builder()
  .ivassCode(originId)
- .build()));
+ .supportEmail(SUPPORT_EMAIL)
+ .supportPhone(SUPPORT_PHONE)
+ .build());
+
+ assertThat(actual.getSupportEmail()).isEqualTo(SUPPORT_EMAIL);
+ assertThat(actual.getSupportPhone()).isEqualTo(SUPPORT_PHONE);
+ verifyNoInteractions(partyRegistryProxyConnector);
  }
 
  @Test