Merge branch 'main' of https://github.com/pagopa/selfcare-onboarding …

…into feature/SELC-6170
pagopa · Dec 11, 2024 · 759a6e4 · 759a6e4
2 parents 8113a4a + 9f3a0ff
commit 759a6e4
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/...rding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java b/...rding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java
@@ -252,7 +252,7 @@ public Uni<OnboardingResponse> onboardingPspCompletion(@Valid OnboardingPspReque
     public Uni<OnboardingResponse> onboardingPgCompletion(@Valid OnboardingPgRequest onboardingRequest, @Context SecurityContext ctx) {
         return readUserIdFromToken(ctx)
                 .onItem().transformToUni(userId -> onboardingService
-                        .onboardingCompletion(fillUserId(onboardingMapper.toEntity(onboardingRequest), userId), onboardingRequest.getUsers()));
+                        .onboardingPgCompletion(fillUserId(onboardingMapper.toEntity(onboardingRequest), userId), onboardingRequest.getUsers()));
     }
 
     @Operation(

diff --git a/.../onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java b/.../onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
@@ -37,6 +37,9 @@ Uni<OnboardingResponse> onboardingImport(
     Uni<OnboardingResponse> onboardingCompletion(
             Onboarding onboarding, List<UserRequest> userRequests);
 
+    Uni<OnboardingResponse> onboardingPgCompletion(
+            Onboarding onboarding, List<UserRequest> userRequests);
+
     Uni<OnboardingResponse> onboardingAggregationCompletion(
             Onboarding onboarding,
             List<UserRequest> userRequests,

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
@@ -246,6 +246,16 @@ public Uni<OnboardingResponse> onboardingCompletion(
                 onboarding, userRequests, null, TIMEOUT_ORCHESTRATION_RESPONSE, false);
     }
 
+    @Override
+    public Uni<OnboardingResponse> onboardingPgCompletion(
+            Onboarding onboarding, List<UserRequest> userRequests) {
+        onboarding.setWorkflowType(WorkflowType.CONFIRMATION);
+        onboarding.setStatus(OnboardingStatus.PENDING);
+
+        return fillUsersAndOnboarding(
+                onboarding, userRequests, null, TIMEOUT_ORCHESTRATION_RESPONSE, false);
+    }
+
     @Override
     public Uni<OnboardingResponse> onboardingAggregationCompletion(
             Onboarding onboarding,

diff --git a/...g-ms/src/test/java/it/pagopa/selfcare/onboarding/controller/OnboardingControllerTest.java b/...g-ms/src/test/java/it/pagopa/selfcare/onboarding/controller/OnboardingControllerTest.java
@@ -679,7 +679,7 @@ void onboardingCompletePg() {
         onboardingPgRequest.setDigitalAddress("digital@address.it");
         onboardingPgRequest.setOrigin(Origin.INFOCAMERE);
 
-        Mockito.when(onboardingService.onboardingCompletion(any(), any()))
+        Mockito.when(onboardingService.onboardingPgCompletion(any(), any()))
                 .thenReturn(Uni.createFrom().item(new OnboardingResponse()));
 
         given()
@@ -691,7 +691,7 @@ void onboardingCompletePg() {
                 .statusCode(200);
 
         ArgumentCaptor<Onboarding> captor = ArgumentCaptor.forClass(Onboarding.class);
-        Mockito.verify(onboardingService, times(1)).onboardingCompletion(captor.capture(), any());
+        Mockito.verify(onboardingService, times(1)).onboardingPgCompletion(captor.capture(), any());
         assertEquals(InstitutionType.PG, captor.getValue().getInstitution().getInstitutionType());
     }
 

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
@@ -2144,6 +2144,47 @@ void onboardingCompletion(UniAsserter asserter) {
         });
     }
 
+    @Test
+    @RunOnVertxContext
+    void onboardingPgCompletion(UniAsserter asserter) {
+        Onboarding request = new Onboarding();
+        Product product = createDummyProduct(PROD_PN.getValue(), false);
+        List<UserRequest> users = List.of(manager);
+        request.setProductId(PROD_PN.getValue());
+        Institution institutionBaseRequest = new Institution();
+        institutionBaseRequest.setTaxCode("taxCode");
+        institutionBaseRequest.setInstitutionType(InstitutionType.PG);
+        institutionBaseRequest.setOrigin(Origin.INFOCAMERE);
+        request.setInstitution(institutionBaseRequest);
+
+        mockPersistOnboarding(asserter);
+        mockPersistToken(asserter);
+
+        mockSimpleSearchPOSTAndPersist(asserter);
+        mockSimpleProductValidAssert(request.getProductId(), false, asserter);
+        mockVerifyOnboardingNotFound();
+        mockVerifyAllowedMap(request.getInstitution().getTaxCode(), request.getProductId(), asserter);
+
+        asserter.execute(() -> when(productService.getProduct(any())).thenReturn(product));
+
+        asserter.execute(() -> when(userRegistryApi.updateUsingPATCH(any(), any()))
+                .thenReturn(Uni.createFrom().item(Response.noContent().build())));
+
+        InstitutionResource institutionResource = new InstitutionResource();
+        institutionResource.setCategory("L37");
+        asserter.execute(() -> when(institutionRegistryProxyApi.findInstitutionUsingGET(institutionBaseRequest.getTaxCode(), null, null))
+                .thenReturn(Uni.createFrom().item(institutionResource)));
+
+        asserter.assertThat(() -> onboardingService.onboardingPgCompletion(request, users), Assertions::assertNotNull);
+
+        asserter.execute(() -> {
+            PanacheMock.verify(Onboarding.class).persist(any(Onboarding.class), any());
+            PanacheMock.verify(Onboarding.class).persistOrUpdate(any(List.class));
+            PanacheMock.verify(Onboarding.class).find(any(Document.class));
+            PanacheMock.verifyNoMoreInteractions(Onboarding.class);
+        });
+    }
+
     @Test
     @RunOnVertxContext
     void onboardingUsers(UniAsserter asserter) {