Dfpl 2111 2334 demo

ccd-definition/AuthorisationCaseEvent/CareSupervision/AuthorisationCaseEvent.json

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

ccd-definition/AuthorisationCaseField/CareSupervision/eps-managing.json

@@ -2106,6 +2106,13 @@
     "UserRole": "[EPSMANAGING]",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "[EPSMANAGING]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/AuthorisationCaseField/CareSupervision/la-barrister.json

@@ -1490,6 +1490,13 @@
     "UserRole": "[LABARRISTER]",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "[LABARRISTER]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/AuthorisationCaseField/CareSupervision/la-managing.json

@@ -2099,6 +2099,13 @@
     "UserRole": "[LAMANAGING]",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "[LAMANAGING]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/AuthorisationCaseField/CareSupervision/la-shared.json

@@ -2167,6 +2167,13 @@
     "UserRole": "[LASHARED]",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "[LASHARED]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/AuthorisationCaseField/CareSupervision/la-solicitor.json

@@ -3213,6 +3213,13 @@
     "UserRole": "[LASOLICITOR]",
     "CRUD": "CRUD"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "[LASOLICITOR]",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/AuthorisationCaseField/CareSupervision/system-update.json

@@ -1826,6 +1826,13 @@
     "UserRole": "caseworker-publiclaw-systemupdate",
     "CRUD": "CRU"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "UserRole": "caseworker-publiclaw-systemupdate",
+    "CRUD": "CRU"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseEvent/CareSupervision/DEPRECATED.json

@@ -366,5 +366,22 @@
     "ShowSummary": "N",
     "ShowEventNotes": "Y",
     "EndButtonLabel": "Submit"
+  },
+  {
+    "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": 22,
+    "PreConditionState(s)": "PREPARE_FOR_HEARING;FINAL_HEARING;",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/about-to-start",
+    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/submitted",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "Publish": "Y",
+    "EndButtonLabel": "Send reminder"
   }
 ]

ccd-definition/CaseEvent/CareSupervision/MultiState.json

@@ -1052,23 +1052,6 @@
     "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",
-    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/send-order-reminder/submitted",
-    "ShowSummary": "N",
-    "ShowEventNotes": "N",
-    "Publish": "Y",
-    "EndButtonLabel": "Send reminder"
-  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseEventToFields/CareSupervision/messageJudge.json

@@ -105,5 +105,18 @@
     "PageDisplayOrder": 3,
     "Publish": "Y",
     "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"DO_NOT_SHOW\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "messageJudgeOrLegalAdviser",
+    "CaseFieldID": "court",
+    "PageFieldDisplayOrder": 100,
+    "DisplayContext": "READONLY",
+    "PageID": "NewMessageNote",
+    "PageDisplayOrder": 3,
+    "PageColumnNumber": 1,
+    "Publish": "Y",
+    "FieldShowCondition": "isMessageRegardingAdditionalApplications=\"DO_NOT_SHOW\""
   }
 ]

ccd-definition/CaseEventToFields/CareSupervision/replyToMessageJudge.json

@@ -83,5 +83,18 @@
     "ShowSummaryChangeOption": "N",
     "Publish": "Y",
     "FieldShowCondition": "judicialMessageReply=\"DO_NOT_SHOW\""
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "replyToMessageJudgeOrLegalAdviser",
+    "CaseFieldID": "court",
+    "PageFieldDisplayOrder": 100,
+    "DisplayContext": "READONLY",
+    "PageID": "ReplyToMessage",
+    "PageDisplayOrder": 2,
+    "PageColumnNumber": 1,
+    "Publish": "Y",
+    "FieldShowCondition": "judicialMessageReply=\"DO_NOT_SHOW\""
   }
 ]

ccd-definition/CaseEventToFields/CareSupervision/uploadAdditionalApplications.json

@@ -12,6 +12,19 @@
     "ShowSummaryChangeOption": "N",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/upload-additional-applications/initial-choice/mid-event"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "uploadAdditionalApplications",
+    "CaseFieldID": "court",
+    "PageFieldDisplayOrder": 100,
+    "DisplayContext": "READONLY",
+    "PageID": 1,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "Publish": "Y",
+    "FieldShowCondition": "additionalApplicationsLabel=\"DO_NOT_SHOW\""
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseEventToFields/CareSupervision/uploadCMO.json

@@ -12,6 +12,33 @@
     "ShowSummaryChangeOption": "N",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/upload-draft-orders/populate-initial-data/mid-event"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "uploadCMO",
+    "CaseFieldID": "court",
+    "PageID": "OrderDraftKindSelection",
+    "PageFieldDisplayOrder": 100,
+    "PageColumnNumber": 1,
+    "PageDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "FieldShowCondition": "hearingOrderDraftKind=\"DO_NOT_SHOW\"",
+    "Publish": "Y"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "CaseEventID": "uploadCMO",
+    "CaseFieldID": "draftOrderNeedsReviewUploaded",
+    "PageID": "OrderDraftKindSelection",
+    "DisplayContext": "MANDATORY",
+    "PageFieldDisplayOrder": 101,
+    "PageDisplayOrder": 1,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "N",
+    "FieldShowCondition": "hearingOrderDraftKind=\"DO_NOT_SHOW\"",
+    "Publish": "Y"
+  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseField/CareSupervision/workAllocation.json

@@ -8,5 +8,14 @@
     "Label": "Last created work allocation task",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "draftOrderNeedsReviewUploaded",
+    "FieldType": "YesOrNo",
+    "Label": "Last upload draft order event resulted in a review order task",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
   }
 ]

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

@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.fpl.model.RespondentParty;
 import uk.gov.hmcts.reform.fpl.model.judicialmessage.JudicialMessage;
 import uk.gov.hmcts.reform.fpl.model.summary.SyntheticCaseSummary;
+import uk.gov.hmcts.reform.fpl.service.FeatureToggleService;
 import uk.gov.hmcts.reform.fpl.service.ccd.CCDConcurrencyHelper;
 import uk.gov.service.notify.NotificationClient;
 import uk.gov.service.notify.NotificationClientException;
@@ -44,6 +45,9 @@ class MessageJudgeControllerSubmittedTest extends AbstractCallbackTest {
     @MockBean
     private CCDConcurrencyHelper concurrencyHelper;
 
+    @MockBean
+    private FeatureToggleService featureToggleService;
+
     MessageJudgeControllerSubmittedTest() {
         super("message-judge");
     }
@@ -87,6 +91,7 @@ void shouldNotifyJudicialMessageRecipientWhenNewJudicialMessageAdded() throws No
                     .build())))
             .build();
 
+        when(featureToggleService.isCourtNotificationEnabledForWa(any())).thenReturn(true);
         when(concurrencyHelper.startEvent(any(), any(String.class))).thenAnswer(i -> StartEventResponse.builder()
             .caseDetails(asCaseDetails(caseData))
             .eventId(i.getArgument(1))

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

@@ -10,6 +10,7 @@
 import uk.gov.hmcts.reform.fpl.model.Respondent;
 import uk.gov.hmcts.reform.fpl.model.RespondentParty;
 import uk.gov.hmcts.reform.fpl.model.judicialmessage.JudicialMessage;
+import uk.gov.hmcts.reform.fpl.service.FeatureToggleService;
 import uk.gov.hmcts.reform.fpl.service.ccd.CCDConcurrencyHelper;
 import uk.gov.service.notify.NotificationClient;
 import uk.gov.service.notify.NotificationClientException;
@@ -18,8 +19,10 @@
 import java.util.Map;
 import java.util.UUID;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 import static uk.gov.hmcts.reform.fpl.Constants.LOCAL_AUTHORITY_1_CODE;
 import static uk.gov.hmcts.reform.fpl.NotifyTemplates.JUDICIAL_MESSAGE_REPLY_TEMPLATE;
 import static uk.gov.hmcts.reform.fpl.enums.JudicialMessageStatus.CLOSED;
@@ -42,6 +45,9 @@ class ReplyToMessageJudgeControllerSubmittedTest extends AbstractCallbackTest {
     @MockBean
     private CCDConcurrencyHelper concurrencyHelper;
 
+    @MockBean
+    private FeatureToggleService featureToggleService;
+
     ReplyToMessageJudgeControllerSubmittedTest() {
         super("reply-message-judge");
     }
@@ -85,6 +91,8 @@ void shouldNotifyJudicialMessageRecipientWhenJudicialMessageReplyAdded() throws
                     .build())))
             .build();
 
+        when(featureToggleService.isCourtNotificationEnabledForWa(any())).thenReturn(true);
+
         postSubmittedEvent(asCaseDetails(caseData));
 
         Map<String, Object> expectedData = Map.of(

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

@@ -32,6 +32,7 @@
 import uk.gov.hmcts.reform.fpl.model.common.Element;
 import uk.gov.hmcts.reform.fpl.model.common.OtherApplicationsBundle;
 import uk.gov.hmcts.reform.fpl.service.DocumentDownloadService;
+import uk.gov.hmcts.reform.fpl.service.FeatureToggleService;
 import uk.gov.hmcts.reform.fpl.service.SendDocumentService;
 import uk.gov.hmcts.reform.fpl.service.UploadDocumentService;
 import uk.gov.hmcts.reform.fpl.service.additionalapplications.UploadAdditionalApplicationsService;
@@ -143,6 +144,8 @@ class UploadAdditionalApplicationsSubmittedControllerTest extends AbstractCallba
     private CafcassNotificationService cafcassNotificationService;
     @MockBean
     private SendDocumentService sendDocumentService;
+    @MockBean
+    private FeatureToggleService featureToggleService;
     @Captor
     private ArgumentCaptor<Function<CaseDetails, Map<String, Object>>> changeFunctionCaptor;
 
@@ -213,6 +216,7 @@ void init() {
 
         doNothing().when(sendDocumentService).sendDocuments(any());
         doNothing().when(cafcassNotificationService).sendEmail(any(), any(), any());
+        when(featureToggleService.isCourtNotificationEnabledForWa(any())).thenReturn(true);
     }