From 7521c43ac3350271a438898ddd8ad995410eac82 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Wed, 20 Mar 2024 12:20:44 +0000 Subject: [PATCH 1/9] DTSCCI-26 New branch added to claimant response --- .../resources/camunda/claimant_response.bpmn | 500 +++++++++++------- 1 file changed, 296 insertions(+), 204 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index f93bfe895..178833d17 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -1,6 +1,6 @@ - - + + Flow_0g2t112 @@ -25,8 +25,8 @@ Flow_1hi1wxo Flow_0hc82e2 - Flow_1d4uygd - Flow_1hr7okm + Flow_0mzdxwg + Flow_18p0npf @@ -46,12 +46,10 @@ - Flow_19mft34 Flow_FULL_DEFENCE_NOT_PROCEED Flow_FULL_DEFENCE_PROCEED - Flow_1d4uygd Flow_1iwzrak @@ -75,7 +73,7 @@ NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED - Flow_1hr7okm + Flow_1if3psp Flow_1omrvfy @@ -204,7 +202,6 @@ Flow_1v0mmcy - Flow_05d62x8 Flow_1hi1wxo Flow_0wuppw6 @@ -237,11 +234,9 @@ - - ${flowState == "MAIN.FULL_DEFENCE_PROCEED" && !empty flowFlags.IS_MULTI_TRACK} - Flow_1kz0xra + Flow_07ua8xi Flow_1h1gnhq Flow_05wizle @@ -252,7 +247,7 @@ ${!empty flowFlags.IS_MULTI_TRACK} - ${flowState == "MAIN.FULL_DEFENCE_PROCEED" && empty flowFlags.IS_MULTI_TRACK && (empty flowFlags.SDO_ENABLED || !flowFlags.SDO_ENABLED)} + ${flowState == "MAIN.FULL_DEFENCE_PROCEED" && !empty flowFlags.IS_MULTI_TRACK} @@ -261,9 +256,59 @@ Flow_1iwzrak - Flow_05d62x8 + Flow_0mzdxwg + + + + Flow_18p0npf + Flow_1if3psp + Flow_1iix8cj + + + + + + + NOTIFY_RESPONDENT_SOLICITOR1_FOR_CASE_HANDED_OFFLINE + + + Flow_1iix8cj + Flow_1ocoaw0 + + + ${!empty flowFlags.IS_MULTI_TRACK} + + + Flow_1ocoaw0 + Flow_17zmdjb + Flow_1qewnk9 + + + + + NOTIFY_RESPONDENT_SOLICITOR2_FOR_CASE_HANDED_OFFLINE + + + Flow_1qewnk9 + Flow_15x0e7z + + + + + NOTIFY_RESPONDENT_SOLICITOR1_FOR_CASE_HANDED_OFFLINE + + + Flow_17zmdjb + Flow_15x0e7z + Flow_07ua8xi - + + + + ${!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES && flowFlags.TWO_RESPONDENT_REPRESENTATIVES} + + + 2 Respondent representatives @@ -284,174 +329,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -470,26 +347,29 @@ + + + - + - + - + - + @@ -497,6 +377,10 @@ + + + + @@ -517,16 +401,37 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -534,29 +439,215 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + @@ -565,3 +656,4 @@ + From 00a6f899ebbba7955d9d552f7608ed5992c723ba Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Thu, 21 Mar 2024 16:07:48 +0000 Subject: [PATCH 2/9] DTSCCI-26 New branch added to claimant response --- src/main/resources/camunda/claimant_response.bpmn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index 178833d17..67c93efb9 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -265,7 +265,9 @@ Flow_1iix8cj - + + ${empty flowFlags.IS_MULTI_TRACK} + @@ -656,4 +658,3 @@ - From 157238686ab0cbb94e3756ab9bbb80a7a98ede0b Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Fri, 22 Mar 2024 12:14:36 +0000 Subject: [PATCH 3/9] DTSCCI-26 New branch added to claimant response --- .../resources/camunda/claimant_response.bpmn | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index 67c93efb9..ba87ab7b2 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -268,16 +268,16 @@ ${empty flowFlags.IS_MULTI_TRACK} - + - NOTIFY_RESPONDENT_SOLICITOR1_FOR_CASE_HANDED_OFFLINE + NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK Flow_1iix8cj Flow_1ocoaw0 - + ${!empty flowFlags.IS_MULTI_TRACK} @@ -285,32 +285,32 @@ Flow_17zmdjb Flow_1qewnk9 - + - NOTIFY_RESPONDENT_SOLICITOR2_FOR_CASE_HANDED_OFFLINE + NOTIFY_RESPONDENT_SOLICITOR2_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK Flow_1qewnk9 Flow_15x0e7z - + - NOTIFY_RESPONDENT_SOLICITOR1_FOR_CASE_HANDED_OFFLINE + NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK Flow_17zmdjb Flow_15x0e7z Flow_07ua8xi - - - + + + ${!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES && flowFlags.TWO_RESPONDENT_REPRESENTATIVES} - - + + 2 Respondent representatives @@ -414,18 +414,18 @@ - + - + - + From bc4998fc38f069561debafbb6701fae13bcfde51 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Fri, 22 Mar 2024 12:43:26 +0000 Subject: [PATCH 4/9] DTSCCI-26 update id name --- src/main/resources/camunda/claimant_response.bpmn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index ba87ab7b2..f481052c9 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -271,7 +271,7 @@ - NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK + NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK Flow_1iix8cj @@ -288,7 +288,7 @@ - NOTIFY_RESPONDENT_SOLICITOR2_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK + NOTIFY_RES_SOLICITOR2_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK Flow_1qewnk9 @@ -297,7 +297,7 @@ - NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK + NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK Flow_17zmdjb From 4a30d10a666193c98b2fe0dbcbec796ac9ce2b66 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Wed, 27 Mar 2024 12:02:58 +0000 Subject: [PATCH 5/9] DTSCCI-26 Unit test for multitrack and update --- .../resources/camunda/claimant_response.bpmn | 10 +++--- .../civil/bpmn/ClaimantResponseTest.java | 35 +++++++------------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index f481052c9..d04e82e9f 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -1,6 +1,6 @@ - + Flow_0g2t112 @@ -246,10 +246,10 @@ ${!empty flowFlags.IS_MULTI_TRACK} - + ${flowState == "MAIN.FULL_DEFENCE_PROCEED" && !empty flowFlags.IS_MULTI_TRACK} - + PROCEEDS_IN_HERITAGE_SYSTEM @@ -258,7 +258,7 @@ Flow_1iwzrak Flow_0mzdxwg - + Flow_18p0npf Flow_1if3psp @@ -408,7 +408,7 @@ - + diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java index a9a956845..fa08d914c 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java @@ -27,6 +27,9 @@ class ClaimantResponseTest extends BpmnBaseTest { private static final String NOTIFY_RPA_ON_CASE_HANDED_OFFLINE_ACTIVITY_ID = "NotifyRoboticsOnCaseHandedOffline"; public static final String PROCEED_OFFLINE_FOR_RESPONSE_TO_DEFENCE_ACTIVITY_ID = "ProceedOfflineForResponseToDefence"; + + public static final String PROCEED_OFFLINE_FOR_RESPONSE_TO_DEFENCE_ACTIVITY_ID_MULTITRACK + = "ProceedOfflineForResponseToDefenceMultitrack"; public static final String TRIGGER_APPLICATION_PROCEEDS_IN_HERITAGE = "TRIGGER_APPLICATION_PROCEEDS_IN_HERITAGE"; private static final String APPLICATION_PROCEEDS_IN_HERITAGE_ACTIVITY_ID = "UpdateGeneralApplicationStatus"; public static final String APPLICATION_OFFLINE_UPDATE_CLAIM = "APPLICATION_OFFLINE_UPDATE_CLAIM"; @@ -144,9 +147,7 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_W variables.put(FLOW_FLAGS, Map.of( ONE_RESPONDENT_REPRESENTATIVE, true, TWO_RESPONDENT_REPRESENTATIVES, false, - GENERAL_APPLICATION_ENABLED, true, - IS_MULTI_TRACK, true, - "SDO_ENABLED", true + IS_MULTI_TRACK, true )); //complete the start business process @@ -159,23 +160,13 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_W variables ); - //complete the Judicial Referral event - ExternalTask judicialReferral = assertNextExternalTask(PROCESS_CASE_EVENT); - assertCompleteExternalTask( - judicialReferral, - PROCESS_CASE_EVENT, - JUDICIAL_REFERRAL_EVENT, - JUDICIAL_REFERRAL_ACTIVITY_ID, - variables - ); - - //complete the Trigger and Update GA Location event - ExternalTask triggerAndUpdateGenAppLocation = assertNextExternalTask(PROCESS_CASE_EVENT); + //complete the take offline event + ExternalTask takeOffline = assertNextExternalTask(PROCESS_CASE_EVENT); assertCompleteExternalTask( - triggerAndUpdateGenAppLocation, + takeOffline, PROCESS_CASE_EVENT, - TRIGGER_UPDATE_GA_LOCATION, - TRIGGER_UPDATE_GA_LOCATION_ACTIVITY_ID, + PROCEED_OFFLINE_EVENT, + PROCEED_OFFLINE_FOR_RESPONSE_TO_DEFENCE_ACTIVITY_ID_MULTITRACK, variables ); @@ -194,8 +185,8 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_W assertCompleteExternalTask( notifyRespondent, PROCESS_CASE_EVENT, - "NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED", - "ClaimantConfirmsToProceedNotifyRespondentSolicitor1" + "NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_MULTITRACK", + "ClaimantConfirmsToProceedNotifyRespondentSolicitor1Multitrack" ); //complete the CC notification to applicant @@ -203,8 +194,8 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_W assertCompleteExternalTask( notifyApplicant, PROCESS_CASE_EVENT, - "NOTIFY_RESPONDENT_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC", - "ClaimantConfirmsToProceedNotifyApplicantSolicitor1CC" + "NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK", + "ClaimantConfirmsToProceedNotifyApplicantSolicitor1CCMultitrack" ); //complete the Robotics notification From 3540a25af9e52e29315b80b658fec981c26beb89 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Wed, 27 Mar 2024 17:58:16 +0000 Subject: [PATCH 6/9] DTSCCI-26 Unit test for multitrack --- .../java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java | 2 +- .../gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java index e8ea1f1dd..fabc2b7c3 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java @@ -43,7 +43,7 @@ public abstract class BpmnBaseTest { public static final String UNREPRESENTED_DEFENDANT_ONE = "UNREPRESENTED_DEFENDANT_ONE"; public static final String UNREPRESENTED_DEFENDANT_TWO = "UNREPRESENTED_DEFENDANT_TWO"; public static final String FLOW_STATE = "flowState"; - public static final String IS_MULTI_TRACK = "MULTI_CLAIM"; + public static final String IS_MULTI_TRACK = "IS_MULTI_TRACK"; public static final String BULK_CLAIM_ENABLED = "BULK_CLAIM_ENABLED"; public static final String LIP_CASE = "LIP_CASE"; public static final String PIP_ENABLED = "PIP_ENABLED"; diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java index fa08d914c..965874ae5 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java @@ -134,7 +134,7 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndProcessGALocationUpdate_ // claimant response with intention to proceed and claim is Multi track @Test - void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_WhenApplicantConfirmsToProceed() { + void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaim_WhenApplicantConfirmsToProceed() { //assert process has started assertFalse(processInstance.isEnded()); @@ -203,8 +203,8 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaimAndProcessGA_W assertCompleteExternalTask( forRobotics, PROCESS_CASE_EVENT, - NOTIFY_RPA_ON_CONTINUOUS_FEED, - NOTIFY_RPA_ON_CONTINUOUS_FEED_ACTIVITY_ID, + NOTIFY_RPA_ON_CASE_HANDED_OFFLINE, + NOTIFY_RPA_ON_CASE_HANDED_OFFLINE_ACTIVITY_ID, variables ); From bfdff752e804fa096d572c0ef4e47eb8f827e620 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Tue, 9 Apr 2024 13:35:20 +0100 Subject: [PATCH 7/9] DTSCCI-26 Update name --- src/main/resources/camunda/claimant_response.bpmn | 4 ++-- .../uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index d04e82e9f..de57b20e1 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -1,6 +1,6 @@ - + Flow_0g2t112 @@ -297,7 +297,7 @@ - NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK + NOTIFY_APP_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK Flow_17zmdjb diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java index 965874ae5..0a184e9a7 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java @@ -194,7 +194,7 @@ void shouldSuccessfullyCompleteClaimantResponsewithDQAndMultiClaim_WhenApplicant assertCompleteExternalTask( notifyApplicant, PROCESS_CASE_EVENT, - "NOTIFY_RES_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK", + "NOTIFY_APP_SOLICITOR1_FOR_CLAIMANT_CONFIRMS_TO_PROCEED_CC_MULTITRACK", "ClaimantConfirmsToProceedNotifyApplicantSolicitor1CCMultitrack" ); From d4b4b648d93b670f0f8b0d9879b2d4d1192c59a9 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Thu, 11 Apr 2024 23:07:09 +0100 Subject: [PATCH 8/9] DTSCCI-26 Update condition --- src/main/resources/camunda/claimant_response.bpmn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index de57b20e1..88b0ccb3e 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -305,7 +305,9 @@ Flow_07ua8xi - + + ${empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES} + ${!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES && flowFlags.TWO_RESPONDENT_REPRESENTATIVES} From f66fc21eae42ddc27868e60a63a485b9c8e86ab0 Mon Sep 17 00:00:00 2001 From: tiagreaney Date: Fri, 12 Apr 2024 11:54:13 +0100 Subject: [PATCH 9/9] DTSCCI-26 Update condition for one respondent --- src/main/resources/camunda/claimant_response.bpmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/camunda/claimant_response.bpmn b/src/main/resources/camunda/claimant_response.bpmn index 88b0ccb3e..ce775fc46 100644 --- a/src/main/resources/camunda/claimant_response.bpmn +++ b/src/main/resources/camunda/claimant_response.bpmn @@ -306,7 +306,7 @@ - ${empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES} + ${!empty flowFlags.ONE_RESPONDENT_REPRESENTATIVE && flowFlags.ONE_RESPONDENT_REPRESENTATIVE} ${!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES && flowFlags.TWO_RESPONDENT_REPRESENTATIVES}