Fix workflowType for GSP IPA (#954)

Author: pierpaolodidato89

apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/impl/OnboardingServiceDefault.java

@@ -77,6 +77,7 @@
 
 import static it.pagopa.selfcare.onboarding.common.OnboardingStatus.COMPLETED;
 import static it.pagopa.selfcare.onboarding.common.OnboardingStatus.PENDING;
+import static it.pagopa.selfcare.onboarding.common.Origin.IPA;
 import static it.pagopa.selfcare.onboarding.common.ProductId.*;
 import static it.pagopa.selfcare.onboarding.common.WorkflowType.USERS;
 import static it.pagopa.selfcare.onboarding.constants.CustomError.*;
@@ -107,6 +108,7 @@ public class OnboardingServiceDefault implements OnboardingService {
             "User is not manager of the institution on the registry";
     private static final String INTEGRATION_PROFILE = "integrationProfile";
     private static final String TIMEOUT_ORCHESTRATION_RESPONSE = "70";
+    private static final String ONBOARDING_ID = "onboardingId";
     private static final Pattern INDIVIDUAL_CF_PATTERN =
             Pattern.compile("^[A-Z]{6}\\d{2}[A-Z]\\d{2}[A-Z]\\d{3}[A-Z]$");
 
@@ -787,7 +789,7 @@ private WorkflowType getWorkflowType(Onboarding onboarding) {
         }
 
         if (InstitutionType.PA.equals(institutionType)
-                || verifyInstitutionOnInterop(institutionType, onboarding.getProductId())
+                || verifyInstitutionOnGSP(institutionType, onboarding.getInstitution().getOrigin().getValue())
                 || InstitutionType.SA.equals(institutionType)
                 || InstitutionType.AS.equals(institutionType)
                 || Objects.nonNull(product.getParentId())
@@ -808,10 +810,10 @@ private WorkflowType getWorkflowType(Onboarding onboarding) {
         return WorkflowType.FOR_APPROVE;
     }
 
-    private boolean verifyInstitutionOnInterop(InstitutionType institutionType, String productId) {
+    private boolean verifyInstitutionOnGSP(InstitutionType institutionType, String origin) {
         Set<InstitutionType> allowedInstitutionType = Set.of(InstitutionType.GSP, InstitutionType.SCEC);
         return Objects.nonNull(institutionType) && allowedInstitutionType.contains(institutionType)
-                && PROD_INTEROP.getValue().equalsIgnoreCase(productId);
+                && IPA.getValue().equals(origin);
     }
 
     private Uni<Product> product(String productId) {
@@ -1514,7 +1516,7 @@ private Uni<String> updateTokenWithFilePath(String filepath, Token token) {
 
     private Uni<Void> updateTokenUpdatedAt(String onboardingId) {
         return Token.update("updatedAt", LocalDateTime.now())
-                .where("onboardingId", onboardingId)
+                .where(ONBOARDING_ID, onboardingId)
                 .onItem()
                 .transform(ignore -> null);
     }
@@ -1598,13 +1600,13 @@ private Uni<String> retrieveContractDigest(String onboardingId) {
     }
 
     private Uni<Token> retrieveToken(String onboardingId) {
-        return Token.list("onboardingId", onboardingId)
+        return Token.list(ONBOARDING_ID, onboardingId)
                 .map(tokens -> tokens.stream().findFirst().map(Token.class::cast).orElseThrow());
     }
 
     Uni<Token> retrieveToken(Onboarding onboarding, FormItem formItem) {
         String onboardingId = onboarding.getId();
-        return Token.list("onboardingId", onboardingId)
+        return Token.list(ONBOARDING_ID, onboardingId)
                 .flatMap(tokens -> {
                     if (tokens.isEmpty()) {
                         return getProductByOnboarding(onboarding)

apps/onboarding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefaultTest.java

@@ -243,10 +243,9 @@ class OnboardingServiceDefaultTest {
     @Test
     @RunOnVertxContext
     void onboardingPa_throwExceptionIfProductThrowException(UniAsserter asserter) {
-        Onboarding onboardingRequest = new Onboarding();
+        Onboarding onboardingRequest = createDummyOnboarding();
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
-        onboardingRequest.setInstitution(new Institution());
 
         Product productResource = new Product();
         asserter.execute(() -> when(productService.getProductIsValid(onboardingRequest.getProductId()))
@@ -261,10 +260,9 @@ void onboardingPa_throwExceptionIfProductThrowException(UniAsserter asserter) {
     @Test
     @RunOnVertxContext
     void onboarding_throwExceptionIfProductIsNotValid(UniAsserter asserter) {
-        Onboarding onboardingRequest = new Onboarding();
+        Onboarding onboardingRequest = createDummyOnboarding();
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
-        onboardingRequest.setInstitution(new Institution());
 
         Product productResource = new Product();
         asserter.execute(() -> when(productService.getProductIsValid(onboardingRequest.getProductId()))
@@ -458,12 +456,10 @@ void onboarding_throwExceptionIfProductIsNotDelegable(UniAsserter asserter) {
     @Test
     @RunOnVertxContext
     void onboarding_throwExceptionIfProductRoleIsNotValid(UniAsserter asserter) {
-        Onboarding onboardingRequest = new Onboarding();
+        Onboarding onboardingRequest = createDummyOnboarding();
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("prod-pn");
-        Institution institutionBaseRequest = new Institution();
-        institutionBaseRequest.setInstitutionType(InstitutionType.PG);
-        onboardingRequest.setInstitution(institutionBaseRequest);
+        onboardingRequest.getInstitution().setInstitutionType(InstitutionType.PG);
 
         Product productResource = new Product();
         productResource.setRoleMappings(new HashMap<>());
@@ -482,10 +478,9 @@ void onboarding_throwExceptionIfProductRoleIsNotValid(UniAsserter asserter) {
     @Test
     @RunOnVertxContext
     void onboardingPa_throwExceptionIfProductParentRoleIsNotValid(UniAsserter asserter) {
-        Onboarding onboardingRequest = new Onboarding();
+        Onboarding onboardingRequest = createDummyOnboarding();
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
-        onboardingRequest.setInstitution(new Institution());
 
         Product productResource = new Product();
         Product productParent = new Product();
@@ -1063,33 +1058,6 @@ void onboarding_SELC_WorkflowType_CONFIRMATION(UniAsserter asserter) {
         asserter.assertThat(() -> onboardingService.onboardingCompletion(request, users), Assertions::assertNotNull);
     }
 
-    @Test
-    @RunOnVertxContext
-    void onboarding_SELC_Forbidden_WorkflowType(UniAsserter asserter) {
-        Onboarding request = new Onboarding();
-        List<UserRequest> users = List.of(manager);
-        request.setProductId(PROD_INTEROP.getValue());
-        Institution institutionBaseRequest = new Institution();
-        institutionBaseRequest.setDescription("name");
-        institutionBaseRequest.setDigitalAddress("pec");
-        institutionBaseRequest.setInstitutionType(InstitutionType.GSP);
-        institutionBaseRequest.setTaxCode("taxCode");
-        request.setInstitution(institutionBaseRequest);
-        mockPersistOnboarding(asserter);
-
-        asserter.execute(() -> when(userRegistryApi.updateUsingPATCH(any(), any()))
-                .thenReturn(Uni.createFrom().item(Response.noContent().build())));
-
-
-        mockSimpleSearchPOSTAndPersist(asserter);
-        mockSimpleProductValidAssert(request.getProductId(), false, asserter, false, true);
-        mockVerifyOnboardingNotFound();
-        mockVerifyAllowedProductList(request.getProductId(), asserter, true);
-
-        // onboarding will set the workflowType to CONTRACT_REGISTRATION when institutionType is GSP and product is interop, which is not allowed for GSP with origin SELC
-        asserter.assertFailedWith(() -> onboardingService.onboarding(request, users, null), InvalidRequestException.class);
-    }
-
     /*@Test
     @RunOnVertxContext
     void onboarding_PRV_Bad_Request(UniAsserter asserter) {
@@ -1408,12 +1376,11 @@ Product createDummyProduct(String productId, boolean hasParent,
     @Test
     @RunOnVertxContext
     void onboardingPsp_whenUserFoundedAndWillNotUpdate(UniAsserter asserter) {
-        Onboarding onboardingRequest = new Onboarding();
+        Onboarding onboardingRequest = createDummyOnboarding();
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
-        Institution institutionPspRequest = new Institution();
-        institutionPspRequest.setInstitutionType(PSP);
-        onboardingRequest.setInstitution(institutionPspRequest);
+        onboardingRequest.getInstitution().setOrigin(Origin.SELC);
+        onboardingRequest.getInstitution().setInstitutionType(PSP);
 
         mockPersistOnboarding(asserter);
         mockSimpleSearchPOSTAndPersist(asserter);
@@ -1618,12 +1585,13 @@ void onboarding_whenUserFoundAndWillNotUpdate(UniAsserter asserter) {
                 .role(PartyRole.MANAGER)
                 .build();
 
-        Onboarding request = new Onboarding();
+        Onboarding request = createDummyOnboarding();
         List<UserRequest> users = List.of(wrongManager);
         request.setProductId(PROD_PAGOPA.getValue());
-        Institution institutionPspRequest = new Institution();
-        institutionPspRequest.setInstitutionType(InstitutionType.GSP);
-        request.setInstitution(institutionPspRequest);
+        request.getInstitution().setInstitutionType(InstitutionType.GSP);
+        request.getInstitution().setOrigin(Origin.SELC);
+
+
 
         mockSimpleProductValidAssert(request.getProductId(), false, asserter, false, true);
         mockVerifyOnboardingNotFound();
@@ -1659,12 +1627,11 @@ void onboarding_whenUserFoundedAndWillUpdateMailUuid(UniAsserter asserter) {
                 .email("example@live.it")
                 .build();
 
-        Onboarding request = new Onboarding();
+        Onboarding request = createDummyOnboarding();
         List<UserRequest> users = List.of(newManager);
         request.setProductId(PROD_IO.getValue());
-        Institution institutionPspRequest = new Institution();
-        institutionPspRequest.setInstitutionType(InstitutionType.GSP);
-        request.setInstitution(institutionPspRequest);
+        request.getInstitution().setInstitutionType(InstitutionType.GSP);
+
 
         mockSimpleProductValidAssert(request.getProductId(), false, asserter, false, true);
         mockVerifyOnboardingNotFound();
@@ -1703,6 +1670,7 @@ void onboarding_whenUserNotFoundedAndWillSave(UniAsserter asserter) {
         List<UserRequest> users = List.of(manager);
         request.setProductId("productId");
         request.setInstitution(dummyInstitution());
+        request.getInstitution().setOrigin(Origin.SELC);
         final UUID createUserId = UUID.randomUUID();
 
         mockPersistOnboarding(asserter);
@@ -1746,9 +1714,10 @@ void onboarding_whenUserNotFoundedAndWillSave(UniAsserter asserter) {
     @Test
     @RunOnVertxContext
     void onboarding_shouldThrowExceptionIfUserRegistryFails(UniAsserter asserter) {
-        Onboarding onboardingDefaultRequest = new Onboarding();
+        Onboarding onboardingDefaultRequest = createDummyOnboarding();
         Institution institution = new Institution();
         institution.setInstitutionType(InstitutionType.GSP);
+        institution.setOrigin(Origin.SELC);
         onboardingDefaultRequest.setInstitution(institution);
         onboardingDefaultRequest.setProductId(PROD_PAGOPA.getValue());
         List<UserRequest> users = List.of(manager);
@@ -2096,6 +2065,7 @@ private Onboarding createDummyOnboarding() {
         Institution institution = new Institution();
         institution.setTaxCode("taxCode");
         institution.setSubunitCode("subunitCode");
+        institution.setOrigin(Origin.IPA);
         onboarding.setInstitution(institution);
 
         User user = new User();
@@ -4424,6 +4394,9 @@ void onboarding_whenValidIndividualCFWithAllowIndividualOnboarding_shouldSucceed
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
         Institution institution = dummyInstitution();
+        institution.setOrigin(Origin.IVASS);
+        institution.setDigitalAddress(DIGITAL_ADDRESS_FIELD);
+        institution.setDescription(DESCRIPTION_FIELD);
         institution.setTaxCode(individualCF);
         onboardingRequest.setInstitution(institution);
 
@@ -4459,6 +4432,9 @@ void onboarding_whenValidIndividualCFWithDisallowIndividualOnboarding_shouldThro
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
         Institution institution = dummyInstitution();
+        institution.setOrigin(Origin.IVASS);
+        institution.setDigitalAddress(DIGITAL_ADDRESS_FIELD);
+        institution.setDescription(DESCRIPTION_FIELD);
         institution.setTaxCode(individualCF);
         institution.setOriginId("originId");
         onboardingRequest.setInstitution(institution);
@@ -4489,6 +4465,9 @@ void onboarding_whenCompanyTaxCodeWithAllowCompanyOnboarding_shouldSucceed(UniAs
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
         Institution institution = dummyInstitution();
+        institution.setOrigin(Origin.IVASS);
+        institution.setDigitalAddress(DIGITAL_ADDRESS_FIELD);
+        institution.setDescription(DESCRIPTION_FIELD);
         institution.setTaxCode(companyTaxCode);
         onboardingRequest.setInstitution(institution);
 
@@ -4525,6 +4504,9 @@ void onboarding_whenCompanyTaxCodeWithDisallowCompanyOnboarding_shouldThrowInval
         List<UserRequest> users = List.of(manager);
         onboardingRequest.setProductId("productId");
         Institution institution = dummyInstitution();
+        institution.setOrigin(Origin.IVASS);
+        institution.setDigitalAddress(DIGITAL_ADDRESS_FIELD);
+        institution.setDescription(DESCRIPTION_FIELD);
         institution.setTaxCode(companyTaxCode);
         onboardingRequest.setInstitution(institution);
 

apps/onboarding-ms/src/test/resources/integration-data/selc/invalid_gsp_selc_request.json

@@ -17,7 +17,7 @@
     }
   ],
   "institution": {
-    "institutionType": "GSP",
+    "institutionType": "PA",
     "taxCode": "00001910111",
     "origin": "SELC",
     "originId": "00001910111",