From 493ddfda8620afaf48ddcfc1a51eb133a4e48069 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Tue, 11 Feb 2025 16:25:30 +0000 Subject: [PATCH 1/8] CIV-16608 changes --- .../civil/service/flowstate/FlowStateAllowedEventService.java | 3 ++- .../service/flowstate/FlowStateAllowedEventServiceTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index bba3608686a..5ec99270ec0 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -1277,7 +1277,8 @@ public class FlowStateAllowedEventService { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index 359314772c3..30563f1170d 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -1321,7 +1321,8 @@ public Stream provideArguments(ExtensionContext context) { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( From 15753ce2b074ec362176ab29f359ef5699a7efef Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Wed, 12 Feb 2025 12:26:39 +0000 Subject: [PATCH 2/8] CIV-16608 changes --- .../flowstate/FlowStateAllowedEventService.java | 12 ++++++++---- .../flowstate/FlowStateAllowedEventServiceTest.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index 5ec99270ec0..6ddaf009928 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -1485,7 +1485,8 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( @@ -1531,7 +1532,8 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -2220,7 +2222,8 @@ public class FlowStateAllowedEventService { VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, ADD_CASE_NOTE, NOC_REQUEST, - APPLY_NOC_DECISION + APPLY_NOC_DECISION, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( @@ -2255,7 +2258,8 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index 30563f1170d..0336f31a780 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -1525,7 +1525,8 @@ public Stream provideArguments(ExtensionContext context) { ADD_CASE_NOTE, CONFIRM_ORDER_REVIEW, NOC_REQUEST, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -1570,7 +1571,8 @@ public Stream provideArguments(ExtensionContext context) { ADD_CASE_NOTE, CONFIRM_ORDER_REVIEW, NOC_REQUEST, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -2228,7 +2230,8 @@ public Stream provideArguments(ExtensionContext context) { LIP_CLAIM_SETTLED, DISCONTINUE_CLAIM_CLAIMANT, VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - ADD_CASE_NOTE + ADD_CASE_NOTE, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -2259,7 +2262,8 @@ public Stream provideArguments(ExtensionContext context) { MANAGE_STAY, ADD_CASE_NOTE, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( From c26fa8d971ca1c64fd1b96cc7d41daac675022f4 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Wed, 12 Feb 2025 15:30:51 +0000 Subject: [PATCH 3/8] CIV-16608 changes --- .../service/flowstate/FlowStateAllowedEventService.java | 6 ++++-- .../service/flowstate/FlowStateAllowedEventServiceTest.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index 6ddaf009928..55ed880e769 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -1611,7 +1611,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, ORDER_REVIEW_OBLIGATION_CHECK, - REQUEST_JUDGEMENT_ADMISSION_SPEC + REQUEST_JUDGEMENT_ADMISSION_SPEC, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( @@ -1652,7 +1653,8 @@ public class FlowStateAllowedEventService { SET_ASIDE_JUDGMENT, ADD_CASE_NOTE, NOC_REQUEST, - APPLY_NOC_DECISION + APPLY_NOC_DECISION, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index 0336f31a780..77ba059db20 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -1642,7 +1642,8 @@ public Stream provideArguments(ExtensionContext context) { ADD_CASE_NOTE, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REQUEST_JUDGEMENT_ADMISSION_SPEC + REQUEST_JUDGEMENT_ADMISSION_SPEC, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -1680,7 +1681,8 @@ public Stream provideArguments(ExtensionContext context) { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - ADD_CASE_NOTE + ADD_CASE_NOTE, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( From edef21ef1a2303955f737ef03b682abce2b5242a Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Wed, 26 Feb 2025 18:07:14 +0000 Subject: [PATCH 4/8] CIV-16608 changes --- .../flowstate/FlowStateAllowedEventService.java | 15 ++++++++++----- .../FlowStateAllowedEventServiceTest.java | 9 ++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index ff262356950..ecb38db9316 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -318,7 +318,8 @@ public class FlowStateAllowedEventService { JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -711,7 +712,8 @@ public class FlowStateAllowedEventService { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -742,7 +744,8 @@ public class FlowStateAllowedEventService { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -2045,7 +2048,8 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( @@ -2066,7 +2070,8 @@ public class FlowStateAllowedEventService { INITIATE_GENERAL_APPLICATION, CONFIRM_ORDER_REVIEW, COURT_OFFICER_ORDER, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED ) ), entry( diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index 8dd4aa661c8..4ba0791edb5 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -369,7 +369,8 @@ public Stream provideArguments(ExtensionContext context) { JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -752,7 +753,8 @@ public Stream provideArguments(ExtensionContext context) { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -782,7 +784,8 @@ public Stream provideArguments(ExtensionContext context) { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( From bf36be6e4c2e090fe05a8b1b81f87c9840bbb073 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Thu, 27 Feb 2025 10:44:26 +0000 Subject: [PATCH 5/8] CIV-16608 changes --- .../flowstate/FlowStateAllowedEventService.java | 15 ++++++++++----- .../FlowStateAllowedEventServiceTest.java | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index ecb38db9316..19f182e6e60 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -227,7 +227,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -252,7 +253,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -277,7 +279,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -1192,7 +1195,8 @@ public class FlowStateAllowedEventService { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED ) ), @@ -1218,7 +1222,8 @@ public class FlowStateAllowedEventService { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED ) ), diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index 4ba0791edb5..c75dca90ed5 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -281,7 +281,8 @@ public Stream provideArguments(ExtensionContext context) { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -305,7 +306,8 @@ public Stream provideArguments(ExtensionContext context) { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -329,7 +331,8 @@ public Stream provideArguments(ExtensionContext context) { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -1238,7 +1241,8 @@ public Stream provideArguments(ExtensionContext context) { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( @@ -1263,7 +1267,8 @@ public Stream provideArguments(ExtensionContext context) { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT + SET_ASIDE_JUDGMENT, + REFER_JUDGE_DEFENCE_RECEIVED } ), of( From 46d1f97191ec2f724dbcaa33b64d2f46ad523561 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Thu, 27 Feb 2025 16:24:36 +0000 Subject: [PATCH 6/8] CIV-16608 changes --- .../FlowStateAllowedEventService.java | 45 ++++++++++++------- .../FlowStateAllowedEventServiceTest.java | 30 ++++++++----- 2 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index 19f182e6e60..579e3a21fe2 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -716,7 +716,8 @@ public class FlowStateAllowedEventService { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -748,7 +749,8 @@ public class FlowStateAllowedEventService { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -1196,7 +1198,8 @@ public class FlowStateAllowedEventService { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -1223,7 +1226,8 @@ public class FlowStateAllowedEventService { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -1286,7 +1290,8 @@ public class FlowStateAllowedEventService { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -1494,7 +1499,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -1541,7 +1547,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -1622,7 +1629,8 @@ public class FlowStateAllowedEventService { REQUEST_JUDGEMENT_ADMISSION_SPEC, JUDGMENT_PAID_IN_FULL, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -1639,7 +1647,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, REQUEST_JUDGEMENT_ADMISSION_SPEC, - REFER_JUDGE_DEFENCE_RECEIVED) + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER) ), entry( FULL_ADMIT_PROCEED.fullName(), @@ -1666,7 +1675,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -1738,7 +1748,8 @@ public class FlowStateAllowedEventService { APPLY_NOC_DECISION, MEDIATION_SUCCESSFUL, MEDIATION_UNSUCCESSFUL, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + GENERATE_DIRECTIONS_ORDER ) ), @@ -2054,7 +2065,8 @@ public class FlowStateAllowedEventService { NOC_REQUEST, APPLY_NOC_DECISION, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -2076,7 +2088,8 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, COURT_OFFICER_ORDER, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -2241,7 +2254,8 @@ public class FlowStateAllowedEventService { APPLY_NOC_DECISION, JUDGMENT_PAID_IN_FULL, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( @@ -2278,7 +2292,8 @@ public class FlowStateAllowedEventService { APPLY_NOC_DECISION, ORDER_REVIEW_OBLIGATION_CHECK, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), entry( diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index c75dca90ed5..c9f44f2f5b1 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -757,7 +757,8 @@ public Stream provideArguments(ExtensionContext context) { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -788,7 +789,8 @@ public Stream provideArguments(ExtensionContext context) { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1330,7 +1332,8 @@ public Stream provideArguments(ExtensionContext context) { MANAGE_STAY, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1534,7 +1537,8 @@ public Stream provideArguments(ExtensionContext context) { CONFIRM_ORDER_REVIEW, NOC_REQUEST, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1580,7 +1584,8 @@ public Stream provideArguments(ExtensionContext context) { CONFIRM_ORDER_REVIEW, NOC_REQUEST, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1653,7 +1658,8 @@ public Stream provideArguments(ExtensionContext context) { REQUEST_JUDGEMENT_ADMISSION_SPEC, JUDGMENT_PAID_IN_FULL, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1692,7 +1698,8 @@ public Stream provideArguments(ExtensionContext context) { JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, ADD_CASE_NOTE, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -1761,7 +1768,8 @@ public Stream provideArguments(ExtensionContext context) { CONFIRM_ORDER_REVIEW, MEDIATION_UNSUCCESSFUL, MEDIATION_SUCCESSFUL, - ORDER_REVIEW_OBLIGATION_CHECK + ORDER_REVIEW_OBLIGATION_CHECK, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -2245,7 +2253,8 @@ public Stream provideArguments(ExtensionContext context) { ADD_CASE_NOTE, JUDGMENT_PAID_IN_FULL, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -2278,7 +2287,8 @@ public Stream provideArguments(ExtensionContext context) { CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, INITIATE_GENERAL_APPLICATION, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( From 7256271c4501b299ad3af0414b72657573982206 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Thu, 27 Feb 2025 16:30:12 +0000 Subject: [PATCH 7/8] CIV-16608 chanegs --- .../flowstate/FlowStateAllowedEventService.java | 12 ++++++++---- .../flowstate/FlowStateAllowedEventServiceTest.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index 579e3a21fe2..79522454404 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -228,7 +228,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -254,7 +255,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -280,7 +282,8 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), @@ -322,7 +325,8 @@ public class FlowStateAllowedEventService { SET_ASIDE_JUDGMENT, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER ) ), diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java index c9f44f2f5b1..4156d25c834 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventServiceTest.java @@ -282,7 +282,8 @@ public Stream provideArguments(ExtensionContext context) { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -307,7 +308,8 @@ public Stream provideArguments(ExtensionContext context) { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -332,7 +334,8 @@ public Stream provideArguments(ExtensionContext context) { EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( @@ -373,7 +376,8 @@ public Stream provideArguments(ExtensionContext context) { SET_ASIDE_JUDGMENT, CONFIRM_ORDER_REVIEW, ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED + REFER_JUDGE_DEFENCE_RECEIVED, + GENERATE_DIRECTIONS_ORDER } ), of( From f418778a18ded6f18a8ff115b0e33811964f27d3 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Fri, 28 Feb 2025 14:04:21 +0000 Subject: [PATCH 8/8] CIV-16608 changes --- .../FlowStateAllowedEventService.java | 51 +++++-------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java index 87dc5c47974..d20ca53c061 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/flowstate/FlowStateAllowedEventService.java @@ -227,9 +227,7 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT ) ), @@ -253,9 +251,7 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT ) ), @@ -279,9 +275,7 @@ public class FlowStateAllowedEventService { SETTLE_CLAIM, SETTLE_CLAIM_MARK_PAID_FULL, DISCONTINUE_CLAIM_CLAIMANT, - VALIDATE_DISCONTINUE_CLAIM_CLAIMANT, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT ) ), @@ -321,9 +315,7 @@ public class FlowStateAllowedEventService { JUDGMENT_PAID_IN_FULL, SET_ASIDE_JUDGMENT, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), @@ -706,9 +698,7 @@ public class FlowStateAllowedEventService { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), @@ -738,9 +728,7 @@ public class FlowStateAllowedEventService { DISMISS_CASE, MANAGE_STAY, CONFIRM_ORDER_REVIEW, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), @@ -1163,9 +1151,7 @@ public class FlowStateAllowedEventService { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + SET_ASIDE_JUDGMENT ) ), @@ -1191,9 +1177,7 @@ public class FlowStateAllowedEventService { RECORD_JUDGMENT, EDIT_JUDGMENT, JUDGMENT_PAID_IN_FULL, - SET_ASIDE_JUDGMENT, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + SET_ASIDE_JUDGMENT ) ), @@ -1461,9 +1445,7 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), entry( @@ -1508,9 +1490,7 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), @@ -1699,8 +1679,7 @@ public class FlowStateAllowedEventService { APPLY_NOC_DECISION, MEDIATION_SUCCESSFUL, MEDIATION_UNSUCCESSFUL, - ORDER_REVIEW_OBLIGATION_CHECK, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), @@ -2008,9 +1987,7 @@ public class FlowStateAllowedEventService { CONFIRM_ORDER_REVIEW, NOC_REQUEST, APPLY_NOC_DECISION, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), entry( @@ -2030,9 +2007,7 @@ public class FlowStateAllowedEventService { INITIATE_GENERAL_APPLICATION, CONFIRM_ORDER_REVIEW, COURT_OFFICER_ORDER, - ORDER_REVIEW_OBLIGATION_CHECK, - REFER_JUDGE_DEFENCE_RECEIVED, - GENERATE_DIRECTIONS_ORDER + ORDER_REVIEW_OBLIGATION_CHECK ) ), entry(