CIV-15646 coo dashboard notification

src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/CourtOfficerOrderClaimantScenarioTest.java

@@ -0,0 +1,89 @@
+package uk.gov.hmcts.reform.civil.controllers.dashboard.scenarios.claimant;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import uk.gov.hmcts.reform.civil.controllers.DashboardBaseIntegrationTest;
+import uk.gov.hmcts.reform.civil.enums.CaseState;
+import uk.gov.hmcts.reform.civil.enums.YesOrNo;
+import uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.claimant.CourtOfficerOrderClaimantNotificationHandler;
+import uk.gov.hmcts.reform.civil.model.CaseData;
+import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
+
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class CourtOfficerOrderClaimantScenarioTest extends DashboardBaseIntegrationTest {
+
+    @Autowired
+    private CourtOfficerOrderClaimantNotificationHandler handler;
+
+    @Test
+    void should_create_court_officer_order_claimant_scenario() throws Exception {
+
+        String caseId = "72016565145";
+
+        CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
+                .toBuilder()
+                .legacyCaseReference("reference")
+                .ccdCaseReference(Long.valueOf(caseId))
+                .applicant1Represented(YesOrNo.NO)
+                .respondent1Represented(YesOrNo.NO)
+                .previousCCDState(CaseState.DECISION_OUTCOME)
+                .build();
+
+        handler.handle(callbackParams(caseData));
+
+        //Verify Notification is created
+        doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "CLAIMANT")
+                .andExpect(status().isOk())
+                .andExpectAll(
+                        status().is(HttpStatus.OK.value()),
+                        jsonPath("$[0].titleEn").value("An order has been made"),
+                        jsonPath("$[0].descriptionEn").value(
+                            "<p class=\"govuk-body\">The Court has made an order on your claim.</p>" +
+                                "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                                "class=\"govuk-link\">View the order</a></p>"),
+                        jsonPath("$[0].titleCy").value("Mae gorchymyn wedi’i wneud"),
+                        jsonPath("$[0].descriptionCy").value(
+                            "<p class=\"govuk-body\">Mae’r Llys wedi gwneud gorchymyn ar eich hawliad.</p>" +
+                                "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                                "class=\"govuk-link\">Gweld y gorchymyn</a></p>"));
+
+    }
+
+    @Test
+    void should_create_court_officer_order_claimant_scenario_without_tasks() throws Exception {
+
+        when(featureToggleService.isCaseProgressionEnabled()).thenReturn(true);
+        String caseId = "72016565145";
+
+        CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
+            .toBuilder()
+            .legacyCaseReference("reference")
+            .ccdCaseReference(Long.valueOf(caseId))
+            .applicant1Represented(YesOrNo.NO)
+            .respondent1Represented(YesOrNo.NO)
+            .previousCCDState(CaseState.HEARING_READINESS)
+            .build();
+
+        handler.handle(callbackParams(caseData));
+
+        //Verify Notification is created
+        doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "CLAIMANT")
+            .andExpect(status().isOk())
+            .andExpectAll(
+                status().is(HttpStatus.OK.value()),
+                jsonPath("$[0].titleEn").value("An order has been made"),
+                jsonPath("$[0].descriptionEn").value(
+                    "<p class=\"govuk-body\">The Court has made an order on your claim.</p>" +
+                        "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                        "class=\"govuk-link\">View the order</a></p>"),
+                jsonPath("$[0].titleCy").value("Mae gorchymyn wedi’i wneud"),
+                jsonPath("$[0].descriptionCy").value(
+                    "<p class=\"govuk-body\">Mae’r Llys wedi gwneud gorchymyn ar eich hawliad.</p>" +
+                        "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                        "class=\"govuk-link\">Gweld y gorchymyn</a></p>"));
+    }
+}

src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/CourtOfficerOrderDefendantScenarioTest.java

@@ -0,0 +1,91 @@
+package uk.gov.hmcts.reform.civil.controllers.dashboard.scenarios.defendant;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import uk.gov.hmcts.reform.civil.controllers.DashboardBaseIntegrationTest;
+import uk.gov.hmcts.reform.civil.enums.CaseState;
+import uk.gov.hmcts.reform.civil.enums.YesOrNo;
+import uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.defendant.CourtOfficerOrderDefendantNotificationHandler;
+import uk.gov.hmcts.reform.civil.model.CaseData;
+import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
+
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class CourtOfficerOrderDefendantScenarioTest extends DashboardBaseIntegrationTest {
+
+    @Autowired
+    private CourtOfficerOrderDefendantNotificationHandler handler;
+
+    @Test
+    void should_create_court_officer_order_defendant_scenario() throws Exception {
+
+        String caseId = "72016577145";
+
+        CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
+                .toBuilder()
+                .legacyCaseReference("reference")
+                .ccdCaseReference(Long.valueOf(caseId))
+                .respondent1Represented(YesOrNo.NO)
+                .applicant1Represented(YesOrNo.NO)
+                .previousCCDState(CaseState.HEARING_READINESS)
+                .build();
+
+        handler.handle(callbackParams(caseData));
+
+        //Verify Notification is created
+        doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "DEFENDANT")
+                .andExpect(status().isOk())
+                .andExpectAll(
+                        status().is(HttpStatus.OK.value()),
+                        jsonPath("$[0].titleEn").value("An order has been made"),
+                        jsonPath("$[0].descriptionEn").value(
+                            "<p class=\"govuk-body\">The Court has made an order on your claim.</p>" +
+                                "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                                "class=\"govuk-link\">View the order</a></p>"),
+                        jsonPath("$[0].titleCy").value("Mae gorchymyn wedi’i wneud"),
+                        jsonPath("$[0].descriptionCy").value(
+                            "<p class=\"govuk-body\">Mae’r Llys wedi gwneud gorchymyn ar eich hawliad.</p>" +
+                                "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                                "class=\"govuk-link\">Gweld y gorchymyn</a></p>"));
+    }
+
+    @Test
+    void should_create_court_officer_order_defendant_scenario_without_tasks() throws Exception {
+
+        String caseId = "72016577183";
+
+        CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
+            .toBuilder()
+            .legacyCaseReference("reference")
+            .ccdCaseReference(Long.valueOf(caseId))
+            .respondent1Represented(YesOrNo.NO)
+            .applicant1Represented(YesOrNo.NO)
+            .previousCCDState(CaseState.DECISION_OUTCOME)
+            .build();
+
+        when(featureToggleService.isLipVLipEnabled()).thenReturn(true);
+        when(featureToggleService.isCaseEventsEnabled()).thenReturn(true);
+        handler.handle(callbackParams(caseData));
+
+        //Verify Notification is created
+        doGet(BEARER_TOKEN, GET_NOTIFICATIONS_URL, caseId, "DEFENDANT")
+            .andExpect(status().isOk())
+            .andExpectAll(
+                status().is(HttpStatus.OK.value()),
+                jsonPath("$[0].titleEn").value("An order has been made"),
+                jsonPath("$[0].descriptionEn").value(
+                    "<p class=\"govuk-body\">The Court has made an order on your claim.</p>" +
+                        "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                        "class=\"govuk-link\">View the order</a></p>"),
+                jsonPath("$[0].titleCy").value("Mae gorchymyn wedi’i wneud"),
+                jsonPath("$[0].descriptionCy").value(
+                    "<p class=\"govuk-body\">Mae’r Llys wedi gwneud gorchymyn ar eich hawliad.</p>" +
+                        "<p class=\"govuk-body\"><a href=\"{VIEW_FINAL_ORDER}\" rel=\"noopener noreferrer\" target=\"_blank\" " +
+                        "class=\"govuk-link\">Gweld y gorchymyn</a></p>"));
+
+    }
+
+}

src/main/java/uk/gov/hmcts/reform/civil/callback/CaseEvent.java

@@ -189,6 +189,8 @@ public enum CaseEvent {
     NOTIFY_APPLICANT_SOLICITOR1_FOR_COURT_OFFICER_ORDER(CAMUNDA),
     NOTIFY_RESPONDENT_SOLICITOR1_FOR_COURT_OFFICER_ORDER(CAMUNDA),
     NOTIFY_RESPONDENT_SOLICITOR2_FOR_COURT_OFFICER_ORDER(CAMUNDA),
+    CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_CLAIMANT(CAMUNDA),
+    CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_DEFENDANT(CAMUNDA),
     NOTIFY_RESPONDENT_SOLICITOR1_FOR_GENERATE_ORDER(CAMUNDA),
     NOTIFY_RESPONDENT_SOLICITOR2_FOR_GENERATE_ORDER(CAMUNDA),
     NOTIFY_APPLICANT_SOLICITOR_FOR_OTHER_TRIAL_READY(CAMUNDA),

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java

@@ -217,7 +217,12 @@ public enum DashboardScenarios {
     SCENARIO_AAA6_UPDATE_CASE_PROCEED_IN_CASE_MAN_DEFENDANT("Scenario.AAA6.Update.CaseProceedsInCaseman.Defendant"),
     SCENARIO_AAA6_UPDATE_CASE_PROCEED_IN_CASE_MAN_DEFENDANT_FAST_TRACK("Scenario.AAA6.Update.CaseProceedsInCaseman.Defendant.FastTrack"),
     SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_RELIST_HEARING_CLAIMANT("Scenario.AAA6.CP.Trial.Arrangements.Relist.Hearing.Claimant"),
-    SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_RELIST_HEARING_DEFENDANT("Scenario.AAA6.CP.Trial.Arrangements.Relist.Hearing.Defendant");
+    SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_RELIST_HEARING_DEFENDANT("Scenario.AAA6.CP.Trial.Arrangements.Relist.Hearing.Defendant"),
+    SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_CLAIMANT("Scenario.AAA6.CP.Court.Officer.Order.Claimant"),
+    SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_HEARING_FEE_CLAIMANT("Scenario.AAA6.CP.Court.Officer.Order.HearingFee.Claimant"),
+    SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_CLAIMANT("Scenario.AAA6.CP.Court.Officer.Order.TrialReady.Claimant"),
+    SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_DEFENDANT("Scenario.AAA6.CP.Court.Officer.Order.Defendant"),
+    SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_DEFENDANT("Scenario.AAA6.CP.Court.Officer.Order.TrialReady.Defendant");
 
     private final String scenario;
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/claimant/CourtOfficerOrderClaimantNotificationHandler.java

@@ -0,0 +1,68 @@
+package uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.claimant;
+
+import org.springframework.stereotype.Service;
+import uk.gov.hmcts.reform.civil.callback.CallbackParams;
+import uk.gov.hmcts.reform.civil.callback.CaseEvent;
+import uk.gov.hmcts.reform.civil.callback.CaseEventsDashboardCallbackHandler;
+import uk.gov.hmcts.reform.civil.client.DashboardApiClient;
+import uk.gov.hmcts.reform.civil.enums.AllocatedTrack;
+import uk.gov.hmcts.reform.civil.model.CaseData;
+import uk.gov.hmcts.reform.civil.service.DashboardNotificationsParamsMapper;
+import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
+
+import java.util.List;
+import java.util.Objects;
+
+import static uk.gov.hmcts.reform.civil.callback.CaseEvent.CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_HEARING_FEE_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_CLAIMANT;
+
+@Service
+public class CourtOfficerOrderClaimantNotificationHandler extends CaseEventsDashboardCallbackHandler {
+
+    private static final List<CaseEvent> EVENTS = List.of(CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_CLAIMANT);
+
+    public static final String TASK_ID = "GenerateClaimantDashboardNotificationCourtOfficerOrder";
+
+    public CourtOfficerOrderClaimantNotificationHandler(DashboardApiClient dashboardApiClient,
+                                                        DashboardNotificationsParamsMapper mapper,
+                                                        FeatureToggleService featureToggleService) {
+        super(dashboardApiClient, mapper, featureToggleService);
+    }
+
+    @Override
+    public List<CaseEvent> handledEvents() {
+        return EVENTS;
+    }
+
+    @Override
+    public String getScenario(CaseData caseData) {
+        return caseData.isHearingFeePaid()
+            ? SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_CLAIMANT.getScenario()
+            : SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_HEARING_FEE_CLAIMANT.getScenario();
+    }
+
+    @Override
+    public String getExtraScenario() {
+        return SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_CLAIMANT.getScenario();
+    }
+
+    @Override
+    public String camundaActivityId(CallbackParams callbackParams) {
+        return TASK_ID;
+    }
+
+    @Override
+    public boolean shouldRecordScenario(CaseData caseData) {
+        return featureToggleService.isCaseEventsEnabled() && caseData.isApplicantLiP();
+    }
+
+    @Override
+    public boolean shouldRecordExtraScenario(CaseData caseData) {
+        return featureToggleService.isCaseEventsEnabled()
+            && caseData.isApplicantLiP()
+            && AllocatedTrack.FAST_CLAIM.name().equals(caseData.getAssignedTrack())
+            && Objects.isNull(caseData.getTrialReadyApplicant());
+    }
+}

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/claimant/HearingScheduledClaimantNotificationHandler.java

@@ -9,6 +9,7 @@
 import uk.gov.hmcts.reform.civil.callback.CallbackParams;
 import uk.gov.hmcts.reform.civil.callback.CaseEvent;
 import uk.gov.hmcts.reform.civil.client.DashboardApiClient;
+import uk.gov.hmcts.reform.civil.enums.AllocatedTrack;
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.common.DynamicList;
@@ -120,7 +121,8 @@ private CallbackResponse configureScenarioForHearingScheduled(CallbackParams cal
         }
 
         if (caseData.isApplicant1NotRepresented()) {
-            if (isNull(caseData.getTrialReadyApplicant())) {
+            if (AllocatedTrack.FAST_CLAIM.name().equals(caseData.getAssignedTrack())
+                && isNull(caseData.getTrialReadyApplicant())) {
                 dashboardApiClient.recordScenario(caseData.getCcdCaseReference().toString(),
                                                   SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_RELIST_HEARING_CLAIMANT.getScenario(), authToken,
                                                   ScenarioRequestParams.builder().params(mapper.mapCaseDataToParams(caseData)).build()

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/defendant/CourtOfficerOrderDefendantNotificationHandler.java

@@ -0,0 +1,65 @@
+package uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.defendant;
+
+import org.springframework.stereotype.Service;
+import uk.gov.hmcts.reform.civil.callback.CallbackParams;
+import uk.gov.hmcts.reform.civil.callback.CaseEvent;
+import uk.gov.hmcts.reform.civil.callback.CaseEventsDashboardCallbackHandler;
+import uk.gov.hmcts.reform.civil.client.DashboardApiClient;
+import uk.gov.hmcts.reform.civil.enums.AllocatedTrack;
+import uk.gov.hmcts.reform.civil.model.CaseData;
+import uk.gov.hmcts.reform.civil.service.DashboardNotificationsParamsMapper;
+import uk.gov.hmcts.reform.civil.service.FeatureToggleService;
+
+import java.util.List;
+import java.util.Objects;
+
+import static uk.gov.hmcts.reform.civil.callback.CaseEvent.CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_DEFENDANT;
+
+@Service
+public class CourtOfficerOrderDefendantNotificationHandler extends CaseEventsDashboardCallbackHandler {
+
+    private static final List<CaseEvent> EVENTS = List.of(CREATE_DASHBOARD_NOTIFICATION_COURT_OFFICER_ORDER_DEFENDANT);
+
+    public static final String TASK_ID = "GenerateDefendantDashboardNotificationCourtOfficerOrder";
+
+    public CourtOfficerOrderDefendantNotificationHandler(DashboardApiClient dashboardApiClient,
+                                                         DashboardNotificationsParamsMapper mapper,
+                                                         FeatureToggleService featureToggleService) {
+        super(dashboardApiClient, mapper, featureToggleService);
+    }
+
+    @Override
+    public String camundaActivityId(CallbackParams callbackParams) {
+        return TASK_ID;
+    }
+
+    @Override
+    public String getScenario(CaseData caseData) {
+        return SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_DEFENDANT.getScenario();
+    }
+
+    @Override
+    public String getExtraScenario() {
+        return SCENARIO_AAA6_CASE_PROCEED_COURT_OFFICER_ORDER_TRIAL_READY_DEFENDANT.getScenario();
+    }
+
+    @Override
+    public List<CaseEvent> handledEvents() {
+        return EVENTS;
+    }
+
+    @Override
+    public boolean shouldRecordScenario(CaseData caseData) {
+        return featureToggleService.isCaseEventsEnabled() && caseData.isRespondent1LiP();
+    }
+
+    @Override
+    public boolean shouldRecordExtraScenario(CaseData caseData) {
+        return featureToggleService.isCaseEventsEnabled()
+            && caseData.isRespondent1LiP()
+            && AllocatedTrack.FAST_CLAIM.name().equals(caseData.getAssignedTrack())
+            && Objects.isNull(caseData.getTrialReadyRespondent1());
+    }
+}

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/dashboardnotifications/defendant/HearingScheduledDefendantNotificationHandler.java

@@ -9,6 +9,7 @@
 import uk.gov.hmcts.reform.civil.callback.CallbackParams;
 import uk.gov.hmcts.reform.civil.callback.CaseEvent;
 import uk.gov.hmcts.reform.civil.client.DashboardApiClient;
+import uk.gov.hmcts.reform.civil.enums.AllocatedTrack;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.referencedata.model.LocationRefData;
 import uk.gov.hmcts.reform.civil.service.DashboardNotificationsParamsMapper;
@@ -74,7 +75,8 @@ private CallbackResponse configureScenarioForHearingScheduled(CallbackParams cal
                                               ScenarioRequestParams.builder().params(mapper.mapCaseDataToParams(caseData)).build()
             );
 
-            if (isNull(caseData.getTrialReadyRespondent1())) {
+            if (AllocatedTrack.FAST_CLAIM.name().equals(caseData.getAssignedTrack())
+                && isNull(caseData.getTrialReadyRespondent1())) {
                 dashboardApiClient.recordScenario(caseData.getCcdCaseReference().toString(),
                                                   SCENARIO_AAA6_CP_TRIAL_ARRANGEMENTS_RELIST_HEARING_DEFENDANT.getScenario(), authToken,
                                                   ScenarioRequestParams.builder().params(mapper.mapCaseDataToParams(caseData)).build()