Skip to content

Commit

Permalink
chore: Avoiding to update activated at when workflow import
Browse files Browse the repository at this point in the history 
(cherry picked from commit 95a0d2b)
  • Loading branch information
@andrea-putzu
andrea-putzu committed Oct 19, 2024
1 parent 22eaa07 commit e9c0e50
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
8 changes: 7 additions & 1 deletion ...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,19 @@
import static it.pagopa.selfcare.onboarding.common.OnboardingStatus.COMPLETED;
import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
import static it.pagopa.selfcare.onboarding.utils.Utils.*;

public interface WorkflowExecutor {

Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, OnboardingWorkflow onboardingWorkflow);

Optional<OnboardingStatus> executeToBeValidatedState(TaskOrchestrationContext ctx, OnboardingWorkflow onboardingWorkflow);

Optional<OnboardingStatus> executePendingState(TaskOrchestrationContext ctx, OnboardingWorkflow onboardingWorkflow);

OnboardingWorkflow createOnboardingWorkflow(Onboarding onboarding);

ObjectMapper objectMapper();

TaskOptions optionsRetry();

default Optional<OnboardingStatus> execute(TaskOrchestrationContext ctx, Onboarding onboarding) {
Expand Down Expand Up @@ -63,7 +69,7 @@ default String createInstitutionAndOnboarding(TaskOrchestrationContext ctx, Onbo

default void createTestEnvironmentsOnboarding(TaskOrchestrationContext ctx, Onboarding onboarding, String onboardingWithInstitutionIdString) {
// Create onboarding for test environments if exists (ex. prod-interop-coll)
if(Objects.nonNull(onboarding.getTestEnvProductIds()) && !onboarding.getTestEnvProductIds().isEmpty()) {
if (Objects.nonNull(onboarding.getTestEnvProductIds()) && !onboarding.getTestEnvProductIds().isEmpty()) {
// Schedule each task to run in parallel
List<Task<String>> parallelTasks = new ArrayList<>();
onboarding.getTestEnvProductIds().stream()
Expand Down
24 changes: 12 additions & 12 deletions ...ctions/src/test/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void startAndWaitOrchestration_failedOrchestration() throws Exception {
final DurableTaskClient client = mock(DurableTaskClient.class);
final String scheduleNewOrchestrationInstance = "scheduleNewOrchestrationInstance";
doReturn(client).when(durableContext).getClient();
doReturn(scheduleNewOrchestrationInstance).when(client).scheduleNewOrchestrationInstance("Onboardings",onboardingId);
doReturn(scheduleNewOrchestrationInstance).when(client).scheduleNewOrchestrationInstance("Onboardings", onboardingId);

// Invoke
HttpResponseMessage responseMessage = function.startOrchestration(req, durableContext, context);
Expand Down Expand Up @@ -131,7 +131,7 @@ void onboardingsOrchestratorContractRegistration() {

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(3))
.callActivity(captorActivity.capture(), any(), any(),any());
.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));
Expand All @@ -141,7 +141,7 @@ void onboardingsOrchestratorContractRegistration() {
}

@Test
void onboardingOrchestratorContractRegistrationAggregator(){
void onboardingOrchestratorContractRegistrationAggregator() {
Onboarding onboarding = new Onboarding();
onboarding.setId("onboardingId");
onboarding.setStatus(OnboardingStatus.REQUEST);
Expand All @@ -165,7 +165,7 @@ void onboardingOrchestratorContractRegistrationAggregator(){
}

@Test
void onboardingOrchestratorContractRegistrationAggregator_Pending(){
void onboardingOrchestratorContractRegistrationAggregator_Pending() {
Onboarding onboarding = new Onboarding();
onboarding.setId("onboardingId");
onboarding.setStatus(OnboardingStatus.PENDING);
Expand Down Expand Up @@ -267,7 +267,7 @@ void onboardingsOrchestratorNewAdminRequest() {

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(3))
.callActivity(captorActivity.capture(), any(), any(),any());
.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));
Expand All @@ -290,7 +290,7 @@ void onboardingsOrchestratorForApprove() {

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(1))
.callActivity(captorActivity.capture(), any(), any(),any());
.callActivity(captorActivity.capture(), any(), any(), any());
assertEquals(SEND_MAIL_ONBOARDING_APPROVE_ACTIVITY, captorActivity.getAllValues().get(0));

verify(service, times(1))
Expand Down Expand Up @@ -421,7 +421,7 @@ void onboardingsAggregateOrchestrator(){
function.onboardingsAggregateOrchestrator(orchestrationContext, executionContext);

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(2))
verify(orchestrationContext, times(1))
.callActivity(captorActivity.capture(), any(), any(),any());
verify(orchestrationContext, times(1))
.callSubOrchestrator(eq("Onboardings"), any(), any());
Expand Down Expand Up @@ -494,13 +494,13 @@ void onboardingsOrchestratorImport() {
function.onboardingsOrchestrator(orchestrationContext, executionContext);

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(5))
verify(orchestrationContext, times(4))
.callActivity(captorActivity.capture(), any(), any(),any());
assertEquals(CREATE_INSTITUTION_ACTIVITY, captorActivity.getAllValues().get(0));
assertEquals(CREATE_ONBOARDING_ACTIVITY, captorActivity.getAllValues().get(1));
assertEquals(CREATE_USERS_ACTIVITY, captorActivity.getAllValues().get(2));
assertEquals(STORE_ONBOARDING_ACTIVATEDAT, captorActivity.getAllValues().get(3));
assertEquals(REJECT_OUTDATED_ONBOARDINGS, captorActivity.getAllValues().get(4));
// assertEquals(STORE_ONBOARDING_ACTIVATEDAT, captorActivity.getAllValues().get(3));
assertEquals(REJECT_OUTDATED_ONBOARDINGS, captorActivity.getAllValues().get(3));

verify(service, times(1))
.updateOnboardingStatus(onboarding.getId(), OnboardingStatus.COMPLETED);
Expand Down Expand Up @@ -564,7 +564,7 @@ void onboardingsOrchestratorForApprovePtWhenToBeValidated() {
function.onboardingsOrchestrator(orchestrationContext, executionContext);

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(6))
verify(orchestrationContext, times(5))
.callActivity(captorActivity.capture(), any(), any(),any());
assertEquals(CREATE_INSTITUTION_ACTIVITY, captorActivity.getAllValues().get(0));
assertEquals(CREATE_ONBOARDING_ACTIVITY, captorActivity.getAllValues().get(1));
Expand Down Expand Up @@ -701,7 +701,7 @@ void onboardingCompletionOrchestrator() {
function.onboardingsOrchestrator(orchestrationContext, executionContext);

ArgumentCaptor<String> captorActivity = ArgumentCaptor.forClass(String.class);
verify(orchestrationContext, times(6))
verify(orchestrationContext, times(5))
.callActivity(captorActivity.capture(), any(), any(),any());
assertEquals(CREATE_INSTITUTION_ACTIVITY, captorActivity.getAllValues().get(0));
assertEquals(CREATE_ONBOARDING_ACTIVITY, captorActivity.getAllValues().get(1));
Expand Down

0 comments on commit e9c0e50

Please sign in to comment.