fix: recovering conflict if parent has an onboarding (#179)

pagopa · Feb 16, 2024 · 96932f3 · 96932f3
1 parent f018911
commit 96932f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...ding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java b/...ding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java
@@ -299,7 +299,7 @@ private Uni<Boolean> verifyAlreadyOnboardingForProductAndProductParent(String in
         return (Objects.nonNull(productParentId)
                 //If product has parent, I must verify if onboarding is present for parent and child
                 ? checkIfAlreadyOnboardingAndValidateAllowedMap(productParentId, institutionTaxCode, institutionSubunitCode)
-                    .onFailure(InvalidRequestException.class)
+                    .onFailure(ResourceConflictException.class)
                     .recoverWithUni(ignore -> checkIfAlreadyOnboardingAndValidateAllowedMap(productId, institutionTaxCode, institutionSubunitCode))
                 //If product is a root, I must only verify if onboarding for root
                 : checkIfAlreadyOnboardingAndValidateAllowedMap(productId, institutionTaxCode, institutionSubunitCode)

diff --git a/...-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java b/...-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java
@@ -557,10 +557,11 @@ void onboardingSa_whenUserFoundedAndWillNotUpdate(UniAsserter asserter) {
     }
 
 
-    void mockSimpleProductValidAssert(String productId, boolean hasParent, UniAsserter asserter) {
+    Product mockSimpleProductValidAssert(String productId, boolean hasParent, UniAsserter asserter) {
         Product productResource = createDummyProduct(productId,hasParent);
         asserter.execute(() -> when(productService.getProductIsValid(productId))
                 .thenReturn(productResource));
+        return productResource;
     }
 
     Product createDummyProduct(String productId, boolean hasParent) {
@@ -581,6 +582,7 @@ Product createDummyProduct(String productId, boolean hasParent) {
             roleParentMapping.put(manager.getRole(), productRoleInfo);
             parent.setRoleMappings(roleParentMapping);
 
+            productResource.setParentId(parent.getId());
             productResource.setParent(parent);
         }
 
@@ -621,12 +623,18 @@ void onboardingPsp_whenUserFoundedAndWillNotUpdateAndProductHasParent(UniAsserte
         onboardingRequest.setProductId("productId");
         Institution institutionPspRequest = new Institution();
         institutionPspRequest.setInstitutionType(InstitutionType.PSP);
+        institutionPspRequest.setTaxCode("taxCode");
         onboardingRequest.setInstitution(institutionPspRequest);
 
         mockPersistOnboarding(asserter);
         mockSimpleSearchPOSTAndPersist(asserter);
-        mockSimpleProductValidAssert(onboardingRequest.getProductId(), true, asserter);
-        mockVerifyOnboardingNotFound(asserter);
+        Product product = mockSimpleProductValidAssert(onboardingRequest.getProductId(), true, asserter);
+
+        // mock parent has already onboarding
+        asserter.execute(() -> when(onboardingApi.verifyOnboardingInfoUsingHEAD(institutionPspRequest.getTaxCode(), product.getId(), null))
+                .thenReturn(Uni.createFrom().failure(new ClientWebApplicationException(404))));
+        asserter.execute(() -> when(onboardingApi.verifyOnboardingInfoUsingHEAD(institutionPspRequest.getTaxCode(), product.getParentId(), null))
+                .thenReturn(Uni.createFrom().failure(new ResourceConflictException("", ""))));
 
         asserter.assertThat(() -> onboardingService.onboarding(onboardingRequest, users), Assertions::assertNotNull);