Merge Dfpl 1095 into superbranch

ccd-definition/AuthorisationCaseEvent/CareSupervision/AuthorisationCaseEvent.json

@@ -1763,5 +1763,18 @@
         "CRUD": "CR"
       }
     ]
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-publiclaw-courtadmin"
+        ],
+        "CRUD": "CR"
+      }
+    ]
   }
 ]

ccd-definition/AuthorisationCaseField/CareSupervision/court-admin.json

@@ -4884,5 +4884,40 @@
     "CaseFieldID": "latestRoleSent",
     "UserRole": "caseworker-publiclaw-courtadmin",
     "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "hasHearingsMissingOrders",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "listOfHearingsMissingOrders",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "hearingsMissingOrdersMessage",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "noHearingsMissingOrdersMessage",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "shouldSendOrderReminder",
+    "UserRole": "caseworker-publiclaw-courtadmin",
+    "CRUD": "CRU"
   }
 ]

ccd-definition/CaseEvent/CareSupervision/MultiState.json

@@ -1081,6 +1081,23 @@
     "ShowEventNotes": "N",
     "EndButtonLabel": "Done"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "sendOrderReminder",
+    "Name": "Send order reminder",
+    "Description": "Lets the CTSC send a reminder to the LA to upload an order.",
+    "DisplayOrder": 31,
+    "PreConditionState(s)": "PREPARE_FOR_HEARING;FINAL_HEARING;",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/about-to-start",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/about-to-submit",
+    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/submitted",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "EndButtonLabel": "Send reminder"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseEventToFields/CareSupervision/sendOrderReminder.json

@@ -0,0 +1,62 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "CaseFieldID": "hasHearingsMissingOrders",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "listOfHearingsMissingOrders=\"DO_NOT_SHOW\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "CaseFieldID": "listOfHearingsMissingOrders",
+    "PageFieldDisplayOrder": 2,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "hasHearingsMissingOrders=\"DO_NOT_SHOW\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "CaseFieldID": "hearingsMissingOrdersMessage",
+    "PageFieldDisplayOrder": 3,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "hasHearingsMissingOrders=\"YES\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "CaseFieldID": "noHearingsMissingOrdersMessage",
+    "PageFieldDisplayOrder": 4,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "hasHearingsMissingOrders=\"NO\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "sendOrderReminder",
+    "CaseFieldID": "shouldSendOrderReminder",
+    "PageFieldDisplayOrder": 5,
+    "DisplayContext": "MANDATORY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "FieldShowCondition": "hasHearingsMissingOrders=\"YES\""
+  }
+]

ccd-definition/CaseField/CareSupervision/sendOrderReminder.json

@@ -0,0 +1,48 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "hasHearingsMissingOrders",
+    "Label": "Are any hearings missing orders?",
+    "FieldType": "YesOrNo",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "listOfHearingsMissingOrders",
+    "Label": "-",
+    "FieldType": "Text",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "hearingsMissingOrdersMessage",
+    "Label": "These concluded hearings do not have CMOs attached (in draft or sealed): <br/> ${listOfHearingsMissingOrders} <br/>",
+    "FieldType": "Label",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "noHearingsMissingOrdersMessage",
+    "Label": "There are no concluded hearings missing CMOs on this case.",
+    "FieldType": "Label",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "shouldSendOrderReminder",
+    "Label": "Would you like to remind the applicant to upload the CMO for these hearings?",
+    "FieldType": "FixedRadioList",
+    "FieldTypeParameter": "YesOrNoFixedList",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  }
+]

ccd-definition/ComplexTypes/CareSupervision/HearingOrders/CaseManagementOrder.json

@@ -68,6 +68,15 @@
     "ElementLabel": "Hearing",
     "SecurityClassification": "Public"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "UploadedCaseManagementOrder",
+    "ListElementCode": "hearingId",
+    "FieldType": "Text",
+    "ElementLabel": "Hearing UUID",
+    "SecurityClassification": "Public",
+    "FieldShowCondition": "status=\"DO_NOT_SHOW\""
+  },
   {
     "LiveFrom": "01/01/2017",
     "ID": "UploadedCaseManagementOrder",

ccd-definition/ComplexTypes/CareSupervision/HearingOrders/HearingOrder.json

@@ -43,6 +43,15 @@
     "SecurityClassification": "Public",
     "FieldShowCondition": "status=\"DO_NOT_SHOW\""
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "HearingOrder",
+    "ListElementCode": "hearingId",
+    "FieldType": "Text",
+    "ElementLabel": "Hearing UUID",
+    "SecurityClassification": "Public",
+    "FieldShowCondition": "status=\"DO_NOT_SHOW\""
+  },
   {
     "LiveFrom": "01/01/2017",
     "ID": "HearingOrder",

ccd-definition/FixedLists/CareSupervision/YesOrNoFixedList.json

@@ -0,0 +1,16 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "YesOrNoFixedList",
+    "ListElementCode": "YES",
+    "ListElement": "Yes",
+    "DisplayOrder": 0
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "YesOrNoFixedList",
+    "ListElementCode": "NO",
+    "ListElement": "No",
+    "DisplayOrder": 1
+  }
+]

service/src/integrationTest/java/uk/gov/hmcts/reform/fpl/controllers/SendOrderReminderControllerAboutToStartTest.java

@@ -0,0 +1,147 @@
+package uk.gov.hmcts.reform.fpl.controllers;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
+import uk.gov.hmcts.reform.ccd.client.model.CallbackRequest;
+import uk.gov.hmcts.reform.fpl.enums.HearingType;
+import uk.gov.hmcts.reform.fpl.enums.YesNo;
+import uk.gov.hmcts.reform.fpl.model.CaseData;
+import uk.gov.hmcts.reform.fpl.model.HearingBooking;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.DATE;
+import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.formatLocalDateTimeBaseUsingFormat;
+import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.element;
+
+@WebMvcTest(SendOrderReminderController.class)
+@OverrideAutoConfiguration(enabled = true)
+public class SendOrderReminderControllerAboutToStartTest extends AbstractCallbackTest {
+
+    public static final String HAS_MISSING_ORDERS_FLAG = "hasHearingsMissingOrders";
+
+    SendOrderReminderControllerAboutToStartTest() {
+        super("send-order-reminder");
+    }
+
+    @Test
+    void shouldCheckForMissingCMOs() {
+        LocalDateTime startDate = now().minusDays(5);
+        CaseData caseData = CaseData.builder()
+            .id(12345L)
+            .hearingDetails(List.of(
+                element(HearingBooking.builder()
+                    .type(HearingType.CASE_MANAGEMENT)
+                    .startDate(startDate)
+                    .endDate(startDate.plusHours(1))
+                    .build())
+            ))
+            .build();
+
+        CallbackRequest callbackRequest = CallbackRequest.builder()
+            .caseDetails(asCaseDetails(caseData))
+            .build();
+
+        AboutToStartOrSubmitCallbackResponse response = postAboutToStartEvent(callbackRequest);
+
+        assertThat(response.getData()).extracting(HAS_MISSING_ORDERS_FLAG).isEqualTo(YesNo.YES.toString());
+        assertThat(response.getData()).extracting("listOfHearingsMissingOrders")
+            .isEqualTo(String.format("<ul><li>Case management hearing, %s</li></ul>",
+                formatLocalDateTimeBaseUsingFormat(startDate, DATE)));
+    }
+
+    @Test
+    void shouldCheckForMissingCMOsOnMultipleHearings() {
+        LocalDateTime startDate = now().minusDays(5);
+        CaseData caseData = CaseData.builder()
+            .id(12345L)
+            .hearingDetails(List.of(
+                element(HearingBooking.builder()
+                    .type(HearingType.CASE_MANAGEMENT)
+                    .startDate(startDate)
+                    .endDate(startDate.plusHours(1))
+                    .build()),
+                element(HearingBooking.builder()
+                    .type(HearingType.FURTHER_CASE_MANAGEMENT)
+                    .startDate(startDate.plusDays(1))
+                    .endDate(startDate.plusDays(1).plusHours(1))
+                    .build())
+            ))
+            .build();
+
+        CallbackRequest callbackRequest = CallbackRequest.builder()
+            .caseDetails(asCaseDetails(caseData))
+            .build();
+
+        AboutToStartOrSubmitCallbackResponse response = postAboutToStartEvent(callbackRequest);
+
+        assertThat(response.getData()).extracting(HAS_MISSING_ORDERS_FLAG).isEqualTo(YesNo.YES.toString());
+        assertThat(response.getData()).extracting("listOfHearingsMissingOrders")
+            .isEqualTo(String.format("<ul><li>Case management hearing, %s</li>"
+                    + "<li>Further case management hearing, %s</li></ul>",
+                formatLocalDateTimeBaseUsingFormat(startDate, DATE),
+                formatLocalDateTimeBaseUsingFormat(startDate.plusDays(1), DATE)));
+    }
+
+
+    @Test
+    void shouldReturnNoHearingsIfAllHearingsHaveCMOs() {
+        CaseData caseData = CaseData.builder()
+            .id(12345L)
+            .hearingDetails(List.of(
+                element(HearingBooking.builder()
+                    .type(HearingType.CASE_MANAGEMENT)
+                    .startDate(now().minusDays(5))
+                    .endDate(now().minusDays(5).plusHours(1))
+                    .caseManagementOrderId(UUID.randomUUID())
+                    .build())
+            ))
+            .build();
+
+        CallbackRequest callbackRequest = CallbackRequest.builder()
+            .caseDetails(asCaseDetails(caseData))
+            .build();
+
+        AboutToStartOrSubmitCallbackResponse response = postAboutToStartEvent(callbackRequest);
+
+        assertThat(response.getData()).extracting(HAS_MISSING_ORDERS_FLAG).isEqualTo(YesNo.NO.toString());
+    }
+
+    @Test
+    void shouldReturnNoHearingsIfNoHearingsOnCase() {
+        CaseData caseData = CaseData.builder()
+            .id(12345L)
+            .hearingDetails(List.of())
+            .build();
+
+        CallbackRequest callbackRequest = CallbackRequest.builder()
+            .caseDetails(asCaseDetails(caseData))
+            .build();
+
+        AboutToStartOrSubmitCallbackResponse response = postAboutToStartEvent(callbackRequest);
+
+        assertThat(response.getData()).extracting(HAS_MISSING_ORDERS_FLAG).isEqualTo(YesNo.NO.toString());
+    }
+
+    @Test
+    void shouldAlwaysClearShouldSendOrderReminderField() {
+        CaseData caseData = CaseData.builder()
+            .id(12345L)
+            .shouldSendOrderReminder(YesNo.YES)
+            .build();
+
+        CallbackRequest callbackRequest = CallbackRequest.builder()
+            .caseDetails(asCaseDetails(caseData))
+            .build();
+
+        CaseData after = extractCaseData(postAboutToStartEvent(callbackRequest));
+
+        assertThat(after.getShouldSendOrderReminder()).isNull();
+    }
+
+}