CIV-14300 And CIV-14210 Bug Fixes (#5127)

* CIV-14300 and CIV-13642 bug fixes * CIV-14210 fixing tests * CIV-14300 bug fix * CIV-14300 & 14166 Trial arrangements task list doesn't update to done when there is an LR in the case * CIV-14300 & 14166 fixing test issues * CIV-14300 & 14166 fixing test * CIV-14300 & 14166 fixing test * CIV-14300 & 14166 fixing test * CIV-14300 & 14166 removing unnecessary scenario * CIV-14300 & 14166 renaming scenario --------- Co-authored-by: dharmendra kumar <[email protected]>
hmcts · Jul 31, 2024 · eab2d4b · eab2d4b
1 parent 928075d
commit eab2d4b
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 60 deletions.
diff --git a/.../civil/controllers/dashboard/scenarios/claimant/EvidenceUploadedClaimantScenarioTest.java b/.../civil/controllers/dashboard/scenarios/claimant/EvidenceUploadedClaimantScenarioTest.java
@@ -53,9 +53,9 @@ void should_enable_view_documents_task_list_when_claimant_uploads_document_scena
                 jsonPath("$[0].categoryEn").value("Hearing"),
                 jsonPath("$[0].role").value("CLAIMANT"),
                 jsonPath("$[0].taskOrder").value("11"),
-                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
+                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
                 jsonPath("$[0].currentStatusCy").value("Ar gael"),
-                jsonPath("$[0].categoryCy").value("Hearing")
+                jsonPath("$[0].categoryCy").value("Gwrandawiad")
             );
     }
 
@@ -88,9 +88,9 @@ void should_enable_view_documents_task_list_when_defendant_uploads_document_scen
                 jsonPath("$[0].categoryEn").value("Hearing"),
                 jsonPath("$[0].role").value("CLAIMANT"),
                 jsonPath("$[0].taskOrder").value("11"),
-                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
+                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
                 jsonPath("$[0].currentStatusCy").value("Ar gael"),
-                jsonPath("$[0].categoryCy").value("Hearing")
+                jsonPath("$[0].categoryCy").value("Gwrandawiad")
             );
     }
 

diff --git a/...ntrollers/dashboard/scenarios/claimant/TrialArrangementsNotifyOtherPartyScenarioTest.java b/...ntrollers/dashboard/scenarios/claimant/TrialArrangementsNotifyOtherPartyScenarioTest.java
@@ -21,43 +21,62 @@ public class TrialArrangementsNotifyOtherPartyScenarioTest extends CaseProgressi
 
     @Test
     void should_create_notification_for_claimant_when_defendant_finalises_trial_arrangements() throws Exception {
+        String caseId = "10002348";
+        CaseData caseData = createCaseData(caseId, YesOrNo.NO);
+
+        handler.handle(callbackParams(caseData));
+
+        verifyNotificationCreated(caseId);
+        verifyTaskStatus(caseId, "DEFENDANT", TaskStatus.DONE);
+    }
 
+    @Test
+    void should_update_task_list_for_defendant_when_defendant_finalises_trial_arrangements() throws Exception {
         String caseId = "10002348";
-        CaseData caseData = CaseDataBuilder.builder().atStateAwaitingResponseNotFullDefenceReceived().build()
+        CaseData caseData = createCaseData(caseId, YesOrNo.YES);
+
+        handler.handle(callbackParams(caseData));
+
+        verifyNotificationNotCreated(caseId);
+        verifyTaskStatus(caseId, "DEFENDANT", TaskStatus.DONE);
+    }
+
+    private CaseData createCaseData(String caseId, YesOrNo applicant1Represented) {
+        return CaseDataBuilder.builder().atStateAwaitingResponseNotFullDefenceReceived().build()
             .toBuilder()
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
-            .applicant1Represented(YesOrNo.NO)
+            .applicant1Represented(applicant1Represented)
             .respondent1(Party.builder().type(Party.Type.INDIVIDUAL).build())
             .build();
+    }
 
-        handler.handle(callbackParams(caseData));
-
-        //Verify Notification is created
+    private void verifyNotificationCreated(String caseId) throws Exception {
         doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "CLAIMANT")
             .andExpect(status().isOk())
             .andExpectAll(
-                status().is(HttpStatus.OK.value()),
                 jsonPath("$[0].titleEn").value("The other side has confirmed their trial arrangements"),
                 jsonPath("$[0].titleCy").value("Mae'r parti arall wedi cadarnhau eu trefniadau treial"),
-                jsonPath("$[0].descriptionEn")
-                    .value(
-                        "<p class=\"govuk-body\">You can <a href=\"{VIEW_ORDERS_AND_NOTICES_REDIRECT}\" class=\"govuk-link\">view the arrangements that they've confirmed</a>.</p>"),
-                jsonPath("$[0].descriptionCy")
-                    .value(
-                        "<p class=\"govuk-body\">Gallwch <a href=\"{VIEW_ORDERS_AND_NOTICES_REDIRECT}\" class=\"govuk-link\">weld y trefniadau y maent wedi'u cadarnhau</a>.</p>")
+                jsonPath("$[0].descriptionEn").value("<p class=\"govuk-body\">You can <a href=\"{VIEW_ORDERS_AND_NOTICES_REDIRECT}\" class=\"govuk-link\">view the arrangements that they've confirmed</a>.</p>"),
+                jsonPath("$[0].descriptionCy").value("<p class=\"govuk-body\">Gallwch <a href=\"{VIEW_ORDERS_AND_NOTICES_REDIRECT}\" class=\"govuk-link\">weld y trefniadau y maent wedi'u cadarnhau</a>.</p>")
             );
+    }
+
+    private void verifyNotificationNotCreated(String caseId) throws Exception {
+        doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "CLAIMANT")
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$").isEmpty());
+    }
 
-        doGet(BEARER_TOKEN, GET_TASKS_ITEMS_URL, caseId, "DEFENDANT")
+    private void verifyTaskStatus(String caseId, String role, TaskStatus status) throws Exception {
+        doGet(BEARER_TOKEN, GET_TASKS_ITEMS_URL, caseId, role)
             .andExpectAll(
                 status().is(HttpStatus.OK.value()),
-                jsonPath("$[0].reference").value(caseId.toString()),
-                jsonPath("$[0].taskNameEn").value(
-                    "<a>Add the trial arrangements</a>"),
-                jsonPath("$[0].currentStatusEn").value(TaskStatus.DONE.getName()),
-                jsonPath("$[0].taskNameCy").value(
-                    "<a>Ychwanegu trefniadau'r treial</a>"),
-                jsonPath("$[0].currentStatusCy").value(TaskStatus.DONE.getWelshName())
+                jsonPath("$[0].reference").value(caseId),
+                jsonPath("$[0].taskNameEn").value("<a>Add the trial arrangements</a>"),
+                jsonPath("$[0].currentStatusEn").value(status.getName()),
+                jsonPath("$[0].taskNameCy").value("<a>Ychwanegu trefniadau'r treial</a>"),
+                jsonPath("$[0].currentStatusCy").value(status.getWelshName())
             );
     }
 }
diff --git a/...ivil/controllers/dashboard/scenarios/defendant/EvidenceUploadedDefendantScenarioTest.java b/...ivil/controllers/dashboard/scenarios/defendant/EvidenceUploadedDefendantScenarioTest.java
@@ -53,9 +53,9 @@ void should_enable_view_documents_task_list_when_defendant_uploads_document_scen
                 jsonPath("$[0].categoryEn").value("Hearing"),
                 jsonPath("$[0].role").value("DEFENDANT"),
                 jsonPath("$[0].taskOrder").value("11"),
-                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
+                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
                 jsonPath("$[0].currentStatusCy").value("Ar gael"),
-                jsonPath("$[0].categoryCy").value("Hearing")
+                jsonPath("$[0].categoryCy").value("Gwrandawiad")
             );
     }
 
@@ -88,9 +88,9 @@ void should_enable_view_documents_task_list_when_claimant_uploads_document_scena
                 jsonPath("$[0].categoryEn").value("Hearing"),
                 jsonPath("$[0].role").value("DEFENDANT"),
                 jsonPath("$[0].taskOrder").value("11"),
-                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
+                jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
                 jsonPath("$[0].currentStatusCy").value("Ar gael"),
-                jsonPath("$[0].categoryCy").value("Hearing")
+                jsonPath("$[0].categoryCy").value("Gwrandawiad")
             );
     }
 

diff --git a/...mcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java b/...mcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java
@@ -180,7 +180,8 @@ public enum DashboardScenarios {
     SCENARIO_AAA6_UPDATE_DASHBOARD_DEFENDANT_TASK_LIST_UPLOAD_DOCUMENTS_FINAL_ORDERS("Scenario.AAA6.Update.Defendant.TaskList.UploadDocuments.FinalOrders"),
     SCENARIO_AAA6_UPDATE_DASHBOARD_CLAIMANT_TASK_LIST_UPLOAD_DOCUMENTS_FINAL_ORDERS("Scenario.AAA6.Update.Claimant.TaskList.UploadDocuments.FinalOrders"),
     SCENARIO_AAA6_DECISION_REQUEST_FOR_RECONSIDERATION_CLAIMANT("Scenario.AAA6.CP.ReconDecisionMade.Claimant"),
-    SCENARIO_AAA6_DECISION_REQUEST_FOR_RECONSIDERATION_DEFENDANT("Scenario.AAA6.CP.ReconDecisionMade.Defendant");
+    SCENARIO_AAA6_DECISION_REQUEST_FOR_RECONSIDERATION_DEFENDANT("Scenario.AAA6.CP.ReconDecisionMade.Defendant"),
+    SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_LR_CLAIMANT("Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Lr.Claimant");
 
     private final String scenario;
 

diff --git a/...dashboardnotifications/claimant/TrialArrangementsNotifyOtherPartyNotificationHandler.java b/...dashboardnotifications/claimant/TrialArrangementsNotifyOtherPartyNotificationHandler.java
@@ -13,6 +13,7 @@
 
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.CREATE_DASHBOARD_NOTIFICATION_TRIAL_ARRANGEMENTS_NOTIFY_CLAIMANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_LR_CLAIMANT;
 
 @Service
 public class TrialArrangementsNotifyOtherPartyNotificationHandler extends CaseProgressionDashboardCallbackHandler {
@@ -39,11 +40,8 @@ public List<CaseEvent> handledEvents() {
 
     @Override
     public String getScenario(CaseData caseData) {
-        return SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_CLAIMANT.getScenario();
-    }
-
-    @Override
-    public boolean shouldRecordScenario(CaseData caseData) {
-        return caseData.isApplicantNotRepresented();
+        return caseData.isApplicantNotRepresented()
+            ? SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_CLAIMANT.getScenario()
+            : SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_NOTIFY_OTHER_PARTY_LR_CLAIMANT.getScenario();
     }
 }
diff --git a/...n/V2024_04_02_1500__CIV-11302_trial_arrangements_notify_other_party_claimant_scenario.sql b/...n/V2024_04_02_1500__CIV-11302_trial_arrangements_notify_other_party_claimant_scenario.sql
@@ -3,7 +3,7 @@
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Required.BothParties"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
         '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant" : []}');
 
 /**
@@ -20,4 +20,4 @@ VALUES ('Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant',
 INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, category_cy, template_name,
                                     scenario_name, task_status_sequence, role, task_order)
 values ('<a>Add the trial arrangements</a>', 'Hearing' ,'<a>Ychwanegu trefniadau''r treial</a>',
-        'Gwrandawiad', 'Hearing.Arrangements.Add', 'Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant', '{7, 7}', 'DEFENDANT', 12);
+        'Gwrandawiad', 'Hearing.Arrangements.Add', 'Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant', '{7, 7}', 'DEFENDANT', 11);
diff --git a/.../V2024_04_04_1500__CIV-13259_trial_arrangements_notify_other_party_defendant_scenario.sql b/.../V2024_04_04_1500__CIV-13259_trial_arrangements_notify_other_party_defendant_scenario.sql
@@ -3,7 +3,7 @@
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Required.BothParties"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
         '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant" : []}');
 
 /**

diff --git a/src/main/resources/db/migration/V2024_04_04_1632__CIV-11303_bundle_created_scenario.sql b/src/main/resources/db/migration/V2024_04_04_1632__CIV-11303_bundle_created_scenario.sql
@@ -3,16 +3,16 @@
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.CP.Bundle.Ready.Claimant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant", "Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
         '{"Notice.AAA6.CP.Bundle.Ready.Claimant" : []}'),
        ('Scenario.AAA6.CP.Bundle.Ready.Defendant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant", "Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
         '{"Notice.AAA6.CP.Bundle.Ready.Defendant" : []}'),
        ('Scenario.AAA6.CP.Bundle.Ready.TrialReady.Claimant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant", "Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
         '{"Notice.AAA6.CP.Bundle.Ready.Claimant" : []}'),
        ('Scenario.AAA6.CP.Bundle.Ready.TrialReady.Defendant',
-        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant"}',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant", "Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
         '{"Notice.AAA6.CP.Bundle.Ready.Defendant" : []}');
 
 /**

diff --git a/...esources/db/migration/V2024_05_15_1300__CIV-11832_hearing_documents_uploaded_scenario.sql b/...esources/db/migration/V2024_05_15_1300__CIV-11832_hearing_documents_uploaded_scenario.sql
@@ -20,11 +20,11 @@ VALUES ('Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant',
  */
 INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, category_cy, template_name,
                                     scenario_name, task_status_sequence, role, task_order, hint_text_en, hint_text_cy)
-values ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
-        'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
-        ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
-        'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
-       ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
-        'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null),
-        ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
-        'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null);
+values ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
+        'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
+        ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
+        'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
+       ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
+        'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null),
+        ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
+        'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null);
diff --git a/...7_26_1100__CIV-14300_trial_arrangements_required_remove_when_LR_is_invlolved_scenario.sql b/...7_26_1100__CIV-14300_trial_arrangements_required_remove_when_LR_is_invlolved_scenario.sql
@@ -0,0 +1,12 @@
+/**
+ * Add scenario
+ */
+INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
+VALUES ('Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Lr.Claimant',
+        '{"Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
+        '{}');
+
+INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, category_cy, template_name,
+                                    scenario_name, task_status_sequence, role, task_order)
+values ('<a>Add the trial arrangements</a>', 'Hearing' ,'<a>Ychwanegu trefniadau''r treial</a>',
+        'Gwrandawiad', 'Hearing.Arrangements.Add', 'Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Lr.Claimant', '{7, 7}', 'DEFENDANT', 11);