[SELC-4992] feat: Added new workflow executor to manage the administrator addition flow

apps/onboarding-cdc/pom.xml

@@ -24,7 +24,7 @@
         <quarkus.platform.version>3.5.2</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
-        <onboarding-sdk.version>0.1.11</onboarding-sdk.version>
+        <onboarding-sdk.version>0.1.12</onboarding-sdk.version>
         <quarkus-openapi-generator.version>2.2.13</quarkus-openapi-generator.version>
     </properties>
     <dependencyManagement>

apps/onboarding-functions/pom.xml

@@ -21,7 +21,7 @@
     <quarkus.platform.version>3.5.1</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
-    <onboarding-sdk.version>0.1.11</onboarding-sdk.version>
+    <onboarding-sdk.version>0.1.12</onboarding-sdk.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
   </properties>
 

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctions.java

@@ -124,6 +124,7 @@ public void onboardingsOrchestrator(
                 case FOR_APPROVE_PT -> workflowExecutor = new WorkflowExecutorForApprovePt(objectMapper, optionsRetry);
                 case CONFIRMATION -> workflowExecutor = new WorkflowExecutorConfirmation(objectMapper, optionsRetry);
                 case IMPORT -> workflowExecutor = new WorkflowExecutorImport(objectMapper, optionsRetry);
+                case USERS -> workflowExecutor = new WorkflowExecutorForUsers(objectMapper, optionsRetry);
                 default -> throw new IllegalArgumentException("Workflow options not found!");
             }
 

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutor.java

@@ -7,12 +7,10 @@
 import it.pagopa.selfcare.onboarding.common.OnboardingStatus;
 import it.pagopa.selfcare.onboarding.entity.Onboarding;
 
-import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
 import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingString;
@@ -74,6 +72,13 @@ default Optional<OnboardingStatus> onboardingCompletionActivity(TaskOrchestratio
         return Optional.of(OnboardingStatus.COMPLETED);
     }
 
+    default Optional<OnboardingStatus> onboardingCompletionUsersActivity(TaskOrchestrationContext ctx, Onboarding onboarding) {
+        final String onboardingString = getOnboardingString(objectMapper(), onboarding);
+        ctx.callActivity(CREATE_USERS_ACTIVITY, onboardingString, optionsRetry(), String.class).await();
+        ctx.callActivity(SEND_MAIL_COMPLETION_ACTIVITY, onboardingString, optionsRetry(), String.class).await();
+        return Optional.of(OnboardingStatus.COMPLETED);
+    }
+
     default Optional<OnboardingStatus> onboardingCompletionActivityWithoutMail(TaskOrchestrationContext ctx, Onboarding onboarding) {
         createInstitutionAndOnboarding(ctx, onboarding);
         return Optional.of(OnboardingStatus.COMPLETED);

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorConfirmation.java

@@ -8,15 +8,8 @@
 
 import java.util.Optional;
 
-public class WorkflowExecutorConfirmation implements WorkflowExecutor {
+public record WorkflowExecutorConfirmation(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
 
-    private final ObjectMapper objectMapper;
-    private final TaskOptions optionsRetry;
-
-    public WorkflowExecutorConfirmation(ObjectMapper objectMapper, TaskOptions optionsRetry) {
-        this.objectMapper = objectMapper;
-        this.optionsRetry = optionsRetry;
-    }
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return Optional.empty();
@@ -31,14 +24,4 @@ public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationCon
     public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return onboardingCompletionActivity(ctx, onboarding);
     }
-
-    @Override
-    public ObjectMapper objectMapper() {
-        return this.objectMapper;
-    }
-
-    @Override
-    public TaskOptions optionsRetry() {
-        return this.optionsRetry;
-    }
 }

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorContractRegistration.java

@@ -11,15 +11,8 @@
 import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
 import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingString;
 
-public class WorkflowExecutorContractRegistration implements WorkflowExecutor {
+public record WorkflowExecutorContractRegistration(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
 
-    private final ObjectMapper objectMapper;
-    private final TaskOptions optionsRetry;
-
-    public WorkflowExecutorContractRegistration(ObjectMapper objectMapper, TaskOptions optionsRetry) {
-        this.objectMapper = objectMapper;
-        this.optionsRetry = optionsRetry;
-    }
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         String onboardingString = getOnboardingString(objectMapper, onboarding);
@@ -38,14 +31,4 @@ public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationCon
     public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return onboardingCompletionActivity(ctx, onboarding);
     }
-
-    @Override
-    public ObjectMapper objectMapper() {
-        return this.objectMapper;
-    }
-
-    @Override
-    public TaskOptions optionsRetry() {
-        return this.optionsRetry;
-    }
 }

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorForApprove.java

@@ -11,15 +11,8 @@
 import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
 import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingString;
 
-public class WorkflowExecutorForApprove implements WorkflowExecutor {
+public record WorkflowExecutorForApprove(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
 
-    private final ObjectMapper objectMapper;
-    private final TaskOptions optionsRetry;
-
-    public WorkflowExecutorForApprove(ObjectMapper objectMapper, TaskOptions optionsRetry) {
-        this.objectMapper = objectMapper;
-        this.optionsRetry = optionsRetry;
-    }
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         String onboardingString = getOnboardingString(objectMapper, onboarding);
@@ -40,14 +33,4 @@ public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationCon
     public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return onboardingCompletionActivity(ctx, onboarding);
     }
-
-    @Override
-    public ObjectMapper objectMapper() {
-        return this.objectMapper;
-    }
-
-    @Override
-    public TaskOptions optionsRetry() {
-        return this.optionsRetry;
-    }
 }

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorForApprovePt.java

@@ -12,15 +12,8 @@
 import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.SEND_MAIL_REGISTRATION_REQUEST_ACTIVITY;
 import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingString;
 
-public class WorkflowExecutorForApprovePt implements WorkflowExecutor {
+public record WorkflowExecutorForApprovePt(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
 
-    private final ObjectMapper objectMapper;
-    private final TaskOptions optionsRetry;
-
-    public WorkflowExecutorForApprovePt(ObjectMapper objectMapper, TaskOptions optionsRetry) {
-        this.objectMapper = objectMapper;
-        this.optionsRetry = optionsRetry;
-    }
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         String onboardingString = getOnboardingString(objectMapper, onboarding);
@@ -38,14 +31,4 @@ public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationCon
     public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return Optional.empty();
     }
-
-    @Override
-    public ObjectMapper objectMapper() {
-        return this.objectMapper;
-    }
-
-    @Override
-    public TaskOptions optionsRetry() {
-        return this.optionsRetry;
-    }
 }

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorForUsers.java

@@ -0,0 +1,34 @@
+package it.pagopa.selfcare.onboarding.workflow;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.microsoft.durabletask.TaskOptions;
+import com.microsoft.durabletask.TaskOrchestrationContext;
+import it.pagopa.selfcare.onboarding.common.OnboardingStatus;
+import it.pagopa.selfcare.onboarding.entity.Onboarding;
+
+import java.util.Optional;
+
+import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
+import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingString;
+
+public record WorkflowExecutorForUsers(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
+
+    @Override
+    public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
+        String onboardingString = getOnboardingString(objectMapper, onboarding);
+        ctx.callActivity(BUILD_CONTRACT_ACTIVITY_NAME, onboardingString, optionsRetry, String.class).await();
+        ctx.callActivity(SAVE_TOKEN_WITH_CONTRACT_ACTIVITY_NAME, onboardingString, optionsRetry, String.class).await();
+        ctx.callActivity(SEND_MAIL_REGISTRATION_FOR_CONTRACT, onboardingString, optionsRetry, String.class).await();
+        return Optional.of(OnboardingStatus.PENDING);
+    }
+
+    @Override
+    public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationContext ctx, Onboarding onboarding) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
+        return onboardingCompletionUsersActivity(ctx, onboarding);
+    }
+}

apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorImport.java

@@ -8,15 +8,8 @@
 
 import java.util.Optional;
 
-public class WorkflowExecutorImport implements WorkflowExecutor {
+public record WorkflowExecutorImport(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
 
-    private final ObjectMapper objectMapper;
-    private final TaskOptions optionsRetry;
-
-    public WorkflowExecutorImport(ObjectMapper objectMapper, TaskOptions optionsRetry) {
-        this.objectMapper = objectMapper;
-        this.optionsRetry = optionsRetry;
-    }
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return Optional.empty();
@@ -31,14 +24,4 @@ public Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationCon
     public Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, Onboarding onboarding) {
         return onboardingCompletionActivityWithoutMail(ctx, onboarding);
     }
-
-    @Override
-    public ObjectMapper objectMapper() {
-        return this.objectMapper;
-    }
-
-    @Override
-    public TaskOptions optionsRetry() {
-        return this.optionsRetry;
-    }
 }

apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctionsTest.java

@@ -138,6 +138,28 @@ void onboardingsOrchestratorContractRegistration() {
                 .updateOnboardingStatus(onboarding.getId(), OnboardingStatus.PENDING);
     }
 
+    @Test
+    void onboardingsOrchestratorNewAdminRequest() {
+        Onboarding onboarding = new Onboarding();
+        onboarding.setId("onboardingId");
+        onboarding.setStatus(OnboardingStatus.REQUEST);
+        onboarding.setWorkflowType(WorkflowType.USERS);
+
+        TaskOrchestrationContext orchestrationContext = mockTaskOrchestrationContext(onboarding);
+
+        function.onboardingsOrchestrator(orchestrationContext, executionContext);
+
+        ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
+        Mockito.verify(orchestrationContext, times(3))
+                .callActivity(captorActivity.capture(), any(), any(),any());
+        assertEquals(BUILD_CONTRACT_ACTIVITY_NAME, captorActivity.getAllValues().get(0));
+        assertEquals(SAVE_TOKEN_WITH_CONTRACT_ACTIVITY_NAME, captorActivity.getAllValues().get(1));
+        assertEquals(SEND_MAIL_REGISTRATION_FOR_CONTRACT, captorActivity.getAllValues().get(2));
+
+        Mockito.verify(service, times(1))
+                .updateOnboardingStatus(onboarding.getId(), OnboardingStatus.PENDING);
+    }
+
     @Test
     void onboardingsOrchestratorForApprove() {
         Onboarding onboarding = new Onboarding();
@@ -258,6 +280,27 @@ void onboardingsOrchestratorImport() {
                 .updateOnboardingStatus(onboarding.getId(), OnboardingStatus.COMPLETED);
     }
 
+    @Test
+    void onboardingsOrchestratorNewAdmin() {
+        Onboarding onboarding = new Onboarding();
+        onboarding.setId("onboardingId");
+        onboarding.setStatus(OnboardingStatus.PENDING);
+        onboarding.setWorkflowType(WorkflowType.USERS);
+        onboarding.setInstitution(new Institution());
+
+        TaskOrchestrationContext orchestrationContext = mockTaskOrchestrationContext(onboarding);
+
+        function.onboardingsOrchestrator(orchestrationContext, executionContext);
+
+        ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
+        Mockito.verify(orchestrationContext, times(2))
+                .callActivity(captorActivity.capture(), any(), any(),any());
+        assertEquals(CREATE_USERS_ACTIVITY, captorActivity.getAllValues().get(0));
+        assertEquals(SEND_MAIL_COMPLETION_ACTIVITY, captorActivity.getAllValues().get(1));
+        Mockito.verify(service, times(1))
+                .updateOnboardingStatus(onboarding.getId(), OnboardingStatus.COMPLETED);
+    }
+
     @Test
     void onboardingsOrchestratorRegistrationRequestApprove() {
         Onboarding onboarding = new Onboarding();

apps/onboarding-ms/pom.xml

@@ -22,7 +22,7 @@
     <quarkus.platform.version>3.5.2</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
-    <onboarding-sdk.version>0.1.11</onboarding-sdk.version>
+    <onboarding-sdk.version>0.1.12</onboarding-sdk.version>
     <quarkus-openapi-generator.version>2.2.13</quarkus-openapi-generator.version>
   </properties>
   <dependencyManagement>