fix: modify CreateDelegationFromTaxCode and add unit test

pagopa · Apr 15, 2024 · c1f427c · c1f427c
1 parent 1ddf81f
commit c1f427c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/core/src/main/java/it/pagopa/selfcare/mscore/core/DelegationServiceImpl.java b/core/src/main/java/it/pagopa/selfcare/mscore/core/DelegationServiceImpl.java
@@ -57,7 +57,7 @@ public Delegation createDelegation(Delegation delegation) {
         try {
             if(checkIfExistsWithStatus(delegation, DelegationState.DELETED)){
                 savedDelegation = delegationConnector.findAndActivate(delegation.getFrom(), delegation.getTo(), delegation.getProductId());
-            } else{
+            } else {
                 delegation.setCreatedAt(OffsetDateTime.now());
                 delegation.setUpdatedAt(OffsetDateTime.now());
                 delegation.setStatus(DelegationState.ACTIVE);
@@ -128,13 +128,16 @@ public Delegation createDelegationFromInstitutionsTaxCode(Delegation delegation)
                     CustomError.CREATE_DELEGATION_CONFLICT.getCode());
         }
 
+        Delegation savedDelegation;
         try {
-            if(!checkIfExistsWithStatus(delegation, DelegationState.DELETED)){
+            if(checkIfExistsWithStatus(delegation, DelegationState.DELETED)){
+                savedDelegation = delegationConnector.findAndActivate(delegation.getFrom(),delegation.getTo(),delegation.getProductId());
+            } else {
                 delegation.setCreatedAt(OffsetDateTime.now());
+                delegation.setUpdatedAt(OffsetDateTime.now());
+                delegation.setStatus(DelegationState.ACTIVE);
+                savedDelegation = delegationConnector.save(delegation);
             }
-            delegation.setUpdatedAt(OffsetDateTime.now());
-            delegation.setStatus(DelegationState.ACTIVE);
-            Delegation savedDelegation = delegationConnector.save(delegation);
             institutionService.updateInstitutionDelegation(delegation.getTo(), true);
             return savedDelegation;
         } catch (Exception e) {

diff --git a/core/src/test/java/it/pagopa/selfcare/mscore/core/DelegationServiceImplTest.java b/core/src/test/java/it/pagopa/selfcare/mscore/core/DelegationServiceImplTest.java
@@ -248,12 +248,14 @@ void testCreateDelegationFromTaxCode() {
     void testCreateDelegationFromTaxCodeWithSubunitCode() {
         Institution institution = new Institution();
         institution.setId("id");
-        when(delegationConnector.save(any())).thenReturn(dummyDelegationProdPagopa);
+        when(delegationConnector.findAndActivate(anyString(), anyString(), anyString())).thenReturn(dummyDelegationProdPagopa);
         when(institutionService.getInstitutions(dummyDelegationProdPagopa.getTo(), dummyDelegationProdPagopa.getToSubunitCode())).thenReturn(List.of(institution));
         when(institutionService.getInstitutions(dummyDelegationProdPagopa.getFrom(), dummyDelegationProdPagopa.getFromSubunitCode())).thenReturn(List.of(institution));
         doNothing().when(institutionService).updateInstitutionDelegation(any(),anyBoolean());
+        when(delegationConnector.checkIfExistsWithStatus(dummyDelegationProdPagopa, DelegationState.ACTIVE)).thenReturn(false);
+        when(delegationConnector.checkIfExistsWithStatus(dummyDelegationProdPagopa, DelegationState.DELETED)).thenReturn(true);
         Delegation response = delegationServiceImpl.createDelegationFromInstitutionsTaxCode(dummyDelegationProdPagopa);
-        verify(delegationConnector).save(any());
+        verify(delegationConnector).findAndActivate(anyString(), anyString(), anyString());
         assertNotNull(response);
         assertNotNull(response.getId());
         assertEquals(dummyDelegationProdPagopa.getId(), response.getId());