From c6496e6a47a8ee0921d1d644613e46effcee5e09 Mon Sep 17 00:00:00 2001
From: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:47:15 +0100
Subject: [PATCH] CIV-13793 LiP dashboard notification JBA issued (#1110)
* CIV-13793 changes
* CIV-13793 changes
---------
Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com>
---
.../camunda/claimant_response_cui.bpmn | 28 +++-
...gment_by_admission_non_divergent_spec.bpmn | 134 ++++++++++--------
.../civil/bpmn/ClaimantResponseCuiTest.java | 7 +
...stNonDivergentJudgmentByAdmissionTest.java | 12 ++
4 files changed, 118 insertions(+), 63 deletions(-)
diff --git a/src/main/resources/camunda/claimant_response_cui.bpmn b/src/main/resources/camunda/claimant_response_cui.bpmn
index f56854dd7..4b909a527 100644
--- a/src/main/resources/camunda/claimant_response_cui.bpmn
+++ b/src/main/resources/camunda/claimant_response_cui.bpmn
@@ -330,7 +330,7 @@
Flow_08src12
Flow_1daatex
-
+
${flowState != "MAIN.IN_MEDIATION" && (!empty flowFlags.LIP_JUDGMENT_ADMISSION && flowFlags.LIP_JUDGMENT_ADMISSION) && !(!empty flowFlags.JO_ONLINE_LIVE_ENABLED && flowFlags.JO_ONLINE_LIVE_ENABLED)}
@@ -343,10 +343,20 @@
CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT
- Flow_1daatex
+ Flow_0sfs0bs
Flow_17kbmjo
+
+
+
+ CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT
+
+
+ Flow_1daatex
+ Flow_0sfs0bs
+
+
@@ -477,7 +487,11 @@
-
+
+
+
+
+
@@ -708,7 +722,7 @@
-
+
@@ -727,10 +741,14 @@
-
+
+
+
+
+
diff --git a/src/main/resources/camunda/judgment_by_admission_non_divergent_spec.bpmn b/src/main/resources/camunda/judgment_by_admission_non_divergent_spec.bpmn
index 0a0f432d8..c78ac52d7 100644
--- a/src/main/resources/camunda/judgment_by_admission_non_divergent_spec.bpmn
+++ b/src/main/resources/camunda/judgment_by_admission_non_divergent_spec.bpmn
@@ -45,7 +45,7 @@
CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT
- Flow_1qe9fnl
+ Flow_0gr1zzh
Flow_0hypzcm
@@ -62,7 +62,6 @@
Flow_1a58dzr
Flow_1qe9fnl
-
${!empty flowFlags.UNREPRESENTED_DEFENDANT_ONE && flowFlags.UNREPRESENTED_DEFENDANT_ONE}
@@ -116,15 +115,32 @@
Flow_0mxt6kw
+
+
+
+
+ CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT
+
+
+ Flow_1qe9fnl
+ Flow_0gr1zzh
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
@@ -132,45 +148,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -178,25 +192,38 @@
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
@@ -206,27 +233,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -239,6 +245,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseCuiTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseCuiTest.java
index 7cd8fa3aa..d83941773 100644
--- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseCuiTest.java
+++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseCuiTest.java
@@ -80,6 +80,8 @@ public class ClaimantResponseCuiTest extends BpmnBaseTest {
private static final String CREATE_DEFENDANT_DASHBOARD_NOTIFICATION_FOR_CLAIMANT_RESPONSE_EVENT_ID = "GenerateDashboardNotificationRespondent1";
private static final String CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT = "CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT";
private static final String CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT_EVENT_ID = "GenerateDefendantCCJDashboardNotification";
+ public static final String DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT = "CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT";
+ public static final String DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_EVENT_ID = "GenerateClaimantCCJDashboardNotification";
private static final String GENERATE_DASHBOARD_NOTIFICATION_ACTIVITY_ID
= "GenerateClaimantDashboardNotificationClaimantResponse";
@@ -459,6 +461,7 @@ void shouldRunProcess_ClaimIsInFullAdmitRepaymentAcceptedAndJudgmentOnlineLive()
generateDQPdf();
updateClaimantClaimState();
sendJudgmentToCjesService();
+ createClaimantDashboardNotificationForJOIssued();
createDefendantDashboardNotificationForJOIssued();
endBusinessProcess();
assertNoExternalTasksLeft();
@@ -578,4 +581,8 @@ private void updateClaimantClaimState() {
private void createDefendantDashboardNotificationForJOIssued() {
assertCompletedCaseEvent(CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT, CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_DEFENDANT_EVENT_ID);
}
+
+ private void createClaimantDashboardNotificationForJOIssued() {
+ assertCompletedCaseEvent(DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT, DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_EVENT_ID);
+ }
}
diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/RequestNonDivergentJudgmentByAdmissionTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/RequestNonDivergentJudgmentByAdmissionTest.java
index e98aa238b..0bb5e4d69 100644
--- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/RequestNonDivergentJudgmentByAdmissionTest.java
+++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/RequestNonDivergentJudgmentByAdmissionTest.java
@@ -24,6 +24,8 @@ class RequestNonDivergentJudgmentByAdmissionTest extends BpmnBaseTest {
public static final String GENERATE_JUDGMENT_BY_ADMISSION_DOC_CLAIMANT_ACTIVITY_ID = "GenerateJudgmentByAdmissionDocClaimant";
public static final String GENERATE_JUDGMENT_BY_ADMISSION_DOC_DEFENDANT_ACTIVITY_ID = "GenerateJudgmentByAdmissionDocDefendant";
public static final String SEND_JUDGMENT_DETAILS_ACTIVITY_ID = "SendJudgmentDetailsToCJES";
+ public static final String DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_EVENT_ID = "CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT";
+ public static final String DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_ACTIVITY_ID = "GenerateDashboardNotificationJudgementByAdmissionClaimant";
public RequestNonDivergentJudgmentByAdmissionTest() {
super("judgment_by_admission_non_divergent_spec.bpmn", PROCESS_ID);
@@ -103,6 +105,16 @@ void shouldSuccessfullyCompleteRequestJudgmentByAdmission(boolean isLiPDefendant
variables
);
+ //complete the notification dashboard
+ ExternalTask dashboardClaimant = assertNextExternalTask(PROCESS_CASE_EVENT);
+ assertCompleteExternalTask(
+ dashboardClaimant,
+ PROCESS_CASE_EVENT,
+ DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_EVENT_ID,
+ DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT_ACTIVITY_ID,
+ variables
+ );
+
//complete the notification dashboard
ExternalTask dashboardDefendant = assertNextExternalTask(PROCESS_CASE_EVENT);
assertCompleteExternalTask(