Dtsstci 1276

src/integrationTest/java/uk/gov/hmcts/sptribs/caseworker/event/CaseworkerIssueCaseIT.java

@@ -13,13 +13,15 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
+import uk.gov.hmcts.ccd.sdk.type.YesOrNo;
 import uk.gov.hmcts.sptribs.caseworker.model.CaseIssue;
 import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
 import uk.gov.hmcts.sptribs.ciccase.model.CicCase;
 import uk.gov.hmcts.sptribs.common.config.WebMvcConfig;
 import uk.gov.hmcts.sptribs.notification.NotificationServiceCIC;
 import uk.gov.hmcts.sptribs.testutil.IdamWireMock;
 
+import java.time.LocalDate;
 import java.util.Set;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
@@ -160,6 +162,8 @@ void shouldReturnConfirmationMessageIfNotificationsDispatchedOnSubmitted() throw
                 .respondentEmail("respondent@test.com")
                 .applicantFullName("Applicant Name")
                 .applicantEmailAddress("applicant@test.com")
+                .respondentBundleDueDate(LocalDate.now())
+                .isCaseInTime(YesOrNo.YES)
                 .build()
         );
 

src/integrationTest/java/uk/gov/hmcts/sptribs/common/notification/CaseIssuedNotificationIT.java

@@ -14,6 +14,7 @@
 import uk.gov.hmcts.ccd.sdk.type.DynamicListElement;
 import uk.gov.hmcts.ccd.sdk.type.DynamicMultiSelectList;
 import uk.gov.hmcts.ccd.sdk.type.ListValue;
+import uk.gov.hmcts.ccd.sdk.type.YesOrNo;
 import uk.gov.hmcts.sptribs.caseworker.model.CaseIssue;
 import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
 import uk.gov.hmcts.sptribs.ciccase.model.CicCase;
@@ -23,6 +24,8 @@
 import uk.gov.hmcts.sptribs.notification.dispatcher.CaseIssuedNotification;
 import uk.gov.hmcts.sptribs.notification.model.NotificationRequest;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +38,7 @@
 import static uk.gov.hmcts.sptribs.ciccase.model.ContactPreferenceType.POST;
 import static uk.gov.hmcts.sptribs.common.CommonConstants.ADDRESS_LINE_1;
 import static uk.gov.hmcts.sptribs.common.CommonConstants.ADDRESS_LINE_7;
+import static uk.gov.hmcts.sptribs.common.CommonConstants.CIC_BUNDLE_DUE_DATE_TEXT;
 import static uk.gov.hmcts.sptribs.common.CommonConstants.CIC_CASE_NUMBER;
 import static uk.gov.hmcts.sptribs.common.CommonConstants.CIC_CASE_RESPONDENT_NAME;
 import static uk.gov.hmcts.sptribs.common.CommonConstants.CIC_CASE_SUBJECT_NAME;
@@ -263,12 +267,60 @@ void shouldSendLetterToRepresentative() {
     }
 
     @Test
-    void shouldSendEmailToRespondent() {
+    void shouldSendEmailToRespondentDateInTime() {
+
+        LocalDate today = LocalDate.now();
+        String todayFormatted = today.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+
+        final CaseData data = CaseData.builder()
+            .cicCase(CicCase.builder()
+                .fullName("Subject Name")
+                .respondentName("Respondent Name")
+                .alternativeRespondentEmail("test@email.com")
+                .respondentBundleDueDate(today)
+                .isCaseInTime(YesOrNo.YES)
+                .build())
+            .build();
+
+        final Map<String, Object> expectedTemplateVars = Map.of(
+            TRIBUNAL_NAME, CIC,
+            CIC_CASE_NUMBER, TEST_CASE_ID.toString(),
+            CIC_CASE_SUBJECT_NAME, "Subject Name",
+            CONTACT_NAME, "Respondent Name",
+            CIC_CASE_RESPONDENT_NAME, "Respondent Name",
+            CIC_BUNDLE_DUE_DATE_TEXT, "You should provide the tribunal and the Subject/Applicant/Representative "
+                + "with a case bundle by " + todayFormatted
+        );
+
+        caseIssuedNotification.sendToRespondent(data, TEST_CASE_ID.toString());
+
+        verify(notificationServiceCIC).sendEmail(notificationRequestCaptor.capture(), eq(TEST_CASE_ID.toString()));
+
+        NotificationRequest notificationRequest = notificationRequestCaptor.getValue();
+
+        assertThat(notificationRequest.getDestinationAddress())
+            .isEqualTo("test@email.com");
+        assertThat(notificationRequest.getTemplate())
+            .isEqualTo(CASE_ISSUED_RESPONDENT_EMAIL);
+        assertThat(notificationRequest.getTemplateVars())
+            .containsAllEntriesOf(expectedTemplateVars);
+        assertThat(notificationRequest.getUploadedDocuments())
+            .isNull();
+    }
+
+    @Test
+    void shouldSendEmailToRespondentDateOutOfTime() {
+
+        LocalDate today = LocalDate.now();
+        String todayFormatted = today.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+
         final CaseData data = CaseData.builder()
             .cicCase(CicCase.builder()
                 .fullName("Subject Name")
                 .respondentName("Respondent Name")
                 .alternativeRespondentEmail("test@email.com")
+                .respondentBundleDueDate(today)
+                .isCaseInTime(YesOrNo.NO)
                 .build())
             .build();
 
@@ -277,7 +329,10 @@ void shouldSendEmailToRespondent() {
             CIC_CASE_NUMBER, TEST_CASE_ID.toString(),
             CIC_CASE_SUBJECT_NAME, "Subject Name",
             CONTACT_NAME, "Respondent Name",
-            CIC_CASE_RESPONDENT_NAME, "Respondent Name"
+            CIC_CASE_RESPONDENT_NAME, "Respondent Name",
+            CIC_BUNDLE_DUE_DATE_TEXT, "Out of time appeal - You should provide the tribunal with a case bundle by "
+                + todayFormatted
+                + ". Do not issue to the Subject/Applicant/Representative until we notify you the appeal has been admitted."
         );
 
         caseIssuedNotification.sendToRespondent(data, TEST_CASE_ID.toString());
@@ -297,7 +352,82 @@ void shouldSendEmailToRespondent() {
     }
 
     @Test
-    void shouldSendEmailToRespondentWithDocument() {
+    void shouldSendEmailToRespondentWithDocumentDateInTime() {
+        final String documentLabel =
+            "[Document 1.pdf A - First decision](http://exui.net/documents/5e32a0d2-9b37-4548-b007-b9b2eb580d0a/binary)";
+        final DynamicListElement listItem = DynamicListElement
+            .builder()
+            .label(documentLabel)
+            .code(UUID.randomUUID())
+            .build();
+        final Document document = Document.builder()
+            .categoryId("A")
+            .filename("Document 1.pdf")
+            .binaryUrl("http://exui.net/documents/5e32a0d2-9b37-4548-b007-b9b2eb580d0a/binary")
+            .url("http://exui.net/documents/5e32a0d2-9b37-4548-b007-b9b2eb580d0a")
+            .build();
+
+        final CaseworkerCICDocument cicDocument = CaseworkerCICDocument.builder()
+            .documentLink(document)
+            .documentEmailContent("Description")
+            .documentCategory(DocumentType.EVIDENCE_CORRESPONDENCE_FROM_THE_APPELLANT)
+            .build();
+        final List<ListValue<CaseworkerCICDocument>> applicantCaseDocuments =
+            List.of(ListValue.<CaseworkerCICDocument>builder().value(cicDocument).build());
+        final List<CaseworkerCICDocument> selectedDocuments = List.of(cicDocument);
+
+        final List<DynamicListElement> listItems = new ArrayList<>();
+        listItems.add(listItem);
+
+        final DynamicMultiSelectList documentList = new DynamicMultiSelectList();
+        documentList.setListItems(listItems);
+        documentList.setValue(listItems);
+
+        LocalDate today = LocalDate.now();
+        String todayFormatted = today.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+
+        final CaseData data = CaseData.builder()
+            .cicCase(CicCase.builder()
+                .fullName("Subject Name")
+                .respondentName("Respondent Name")
+                .alternativeRespondentEmail("test@email.com")
+                .applicantDocumentsUploaded(applicantCaseDocuments)
+                .respondentBundleDueDate(today)
+                .isCaseInTime(YesOrNo.YES)
+                .build())
+            .caseIssue(CaseIssue.builder()
+                .documentList(documentList)
+                .build())
+            .build();
+
+        final Map<String, Object> expectedTemplateVars = Map.of(
+            TRIBUNAL_NAME, CIC,
+            CIC_CASE_NUMBER, TEST_CASE_ID.toString(),
+            CIC_CASE_SUBJECT_NAME, "Subject Name",
+            CONTACT_NAME, "Respondent Name",
+            CIC_CASE_RESPONDENT_NAME, "Respondent Name",
+            CIC_BUNDLE_DUE_DATE_TEXT, "You should provide the tribunal and the Subject/Applicant/Representative "
+                + "with a case bundle by " + todayFormatted
+        );
+
+        caseIssuedNotification.sendToRespondent(data, TEST_CASE_ID.toString());
+
+        verify(notificationServiceCIC).sendEmail(notificationRequestCaptor.capture(), eq(selectedDocuments), eq(TEST_CASE_ID.toString()));
+
+        NotificationRequest notificationRequest = notificationRequestCaptor.getValue();
+
+        assertThat(notificationRequest.getDestinationAddress())
+            .isEqualTo("test@email.com");
+        assertThat(notificationRequest.getTemplate())
+            .isEqualTo(CASE_ISSUED_RESPONDENT_EMAIL);
+        assertThat(notificationRequest.getTemplateVars())
+            .containsAllEntriesOf(expectedTemplateVars);
+        assertThat(notificationRequest.getUploadedDocuments())
+            .isNotNull();
+    }
+
+    @Test
+    void shouldSendEmailToRespondentWithDocumentDateOutOfTime() {
         final String documentLabel =
             "[Document 1.pdf A - First decision](http://exui.net/documents/5e32a0d2-9b37-4548-b007-b9b2eb580d0a/binary)";
         final DynamicListElement listItem = DynamicListElement
@@ -328,12 +458,17 @@ void shouldSendEmailToRespondentWithDocument() {
         documentList.setListItems(listItems);
         documentList.setValue(listItems);
 
+        LocalDate today = LocalDate.now();
+        String todayFormatted = today.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+
         final CaseData data = CaseData.builder()
             .cicCase(CicCase.builder()
                 .fullName("Subject Name")
                 .respondentName("Respondent Name")
                 .alternativeRespondentEmail("test@email.com")
                 .applicantDocumentsUploaded(applicantCaseDocuments)
+                .respondentBundleDueDate(today)
+                .isCaseInTime(YesOrNo.NO)
                 .build())
             .caseIssue(CaseIssue.builder()
                 .documentList(documentList)
@@ -345,7 +480,10 @@ void shouldSendEmailToRespondentWithDocument() {
             CIC_CASE_NUMBER, TEST_CASE_ID.toString(),
             CIC_CASE_SUBJECT_NAME, "Subject Name",
             CONTACT_NAME, "Respondent Name",
-            CIC_CASE_RESPONDENT_NAME, "Respondent Name"
+            CIC_CASE_RESPONDENT_NAME, "Respondent Name",
+            CIC_BUNDLE_DUE_DATE_TEXT, "Out of time appeal - You should provide the tribunal with a case bundle by "
+                + todayFormatted
+                + ". Do not issue to the Subject/Applicant/Representative until we notify you the appeal has been admitted."
         );
 
         caseIssuedNotification.sendToRespondent(data, TEST_CASE_ID.toString());

src/integrationTest/resources/responses/caseworker-issue-case-about-to-submit-response.json

@@ -22,4 +22,4 @@
     "orderDueDates" : [ ],
     "cicCaseSelectedDocument" : { }
   }
-}
+}

src/main/java/uk/gov/hmcts/sptribs/caseworker/event/CaseworkerIssueCase.java

@@ -124,7 +124,7 @@ public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(final CaseDet
         LocalDate dueDate = LocalDate.now().plusDays(ALLOWED_RESPONSE_TIME_DAYS);
         LocalDate verifiedDueDate = isWorkingDay(dueDate, bankHolidays) ? dueDate : getNextWorkingDay(dueDate, bankHolidays);
         cicCase.setRespondentBundleDueDate(verifiedDueDate);
-        
+
         return AboutToStartOrSubmitResponse.<CaseData, State>builder()
             .data(caseData)
             .state(details.getState())

src/main/java/uk/gov/hmcts/sptribs/common/CommonConstants.java

@@ -25,6 +25,7 @@ public final class CommonConstants {
     public static final String CIC_CASE_RECORD_HEARING_1FACE_TO_FACE = "hearingFormatFaceToFace";
     public static final String CIC_CASE_RECORD_REMOTE_HEARING = "Remote Hearing";
     public static final String CIC_CASE_UK_DATE_FORMAT = "dd-MM-yyyy";
+    public static final String CIC_BUNDLE_DUE_DATE_TEXT = "bundleDueDateText";
 
     public static final String HEARING_DATE = "HearingDate";
     public static final String HEARING_TIME = "HearingTime";

src/main/java/uk/gov/hmcts/sptribs/notification/EmailRespondentResponses.java

@@ -0,0 +1,23 @@
+package uk.gov.hmcts.sptribs.notification;
+
+public enum EmailRespondentResponses {
+
+    OUT_OF_TIME_RESPONSE(
+        "Out of time appeal - You should provide the tribunal with a case bundle by %s. "
+            + "Do not issue to the Subject/Applicant/Representative until we notify you the appeal has been admitted."
+    ),
+    IN_TIME_RESPONSE(
+        "You should provide the tribunal and the "
+            + "Subject/Applicant/Representative with a case bundle by %s"
+    );
+
+    private final String template;
+
+    EmailRespondentResponses(String template) {
+        this.template = template;
+    }
+
+    public String format(String date) {
+        return String.format(template, date);
+    }
+}

src/main/java/uk/gov/hmcts/sptribs/notification/dispatcher/CaseIssuedNotification.java

@@ -12,16 +12,22 @@
 import uk.gov.hmcts.sptribs.ciccase.model.NotificationResponse;
 import uk.gov.hmcts.sptribs.common.CommonConstants;
 import uk.gov.hmcts.sptribs.document.model.CaseworkerCICDocument;
+import uk.gov.hmcts.sptribs.notification.EmailRespondentResponses;
 import uk.gov.hmcts.sptribs.notification.NotificationHelper;
 import uk.gov.hmcts.sptribs.notification.NotificationServiceCIC;
 import uk.gov.hmcts.sptribs.notification.PartiesNotification;
 import uk.gov.hmcts.sptribs.notification.TemplateName;
 import uk.gov.hmcts.sptribs.notification.model.NotificationRequest;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static uk.gov.hmcts.sptribs.notification.EmailRespondentResponses.IN_TIME_RESPONSE;
+import static uk.gov.hmcts.sptribs.notification.EmailRespondentResponses.OUT_OF_TIME_RESPONSE;
+
 @RequiredArgsConstructor
 @Component
 @Slf4j
@@ -98,6 +104,10 @@ public void sendToRespondent(final CaseData caseData, final String caseNumber) {
         final Map<String, Object> templateVarsRespondent = notificationHelper.getRespondentCommonVars(caseNumber, caseData);
         templateVarsRespondent.put(CommonConstants.CIC_CASE_RESPONDENT_NAME, caseData.getCicCase().getRespondentName());
 
+        LocalDate dueDate = cicCase.getRespondentBundleDueDate();
+        templateVarsRespondent.put(CommonConstants.CIC_BUNDLE_DUE_DATE_TEXT,
+            cicCase.getIsCaseInTime().toBoolean() ? buildTimeString(true, dueDate) : buildTimeString(false, dueDate));
+
         final NotificationResponse notificationResponse;
         if (ObjectUtils.isNotEmpty(caseData.getCaseIssue().getDocumentList())) {
             final Map<String, String> uploadedDocuments = getUploadedDocuments(caseData);
@@ -116,6 +126,17 @@ public void sendToRespondent(final CaseData caseData, final String caseNumber) {
         }
     }
 
+    private String buildTimeString(boolean isInTime, LocalDate dueDate) {
+        EmailRespondentResponses response = isInTime
+            ? IN_TIME_RESPONSE
+            : OUT_OF_TIME_RESPONSE;
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+        String formattedDate = dueDate.format(formatter);
+
+        return response.format(formattedDate);
+    }
+
     private NotificationResponse sendEmailNotification(final Map<String, Object> templateVars, String toEmail,
                                                        TemplateName emailTemplateName, String caseReferenceNumber) {
         return notificationService.sendEmail(

src/main/resources/application.yaml

@@ -91,7 +91,7 @@ uk:
           APPLICATION_RECEIVED_CY: '86e6988c-dfc8-43de-8890-e38269ee40d1'
           CASE_ISSUED_CITIZEN_EMAIL: '03a0bbaa-10ee-4304-a1b1-6fdf76a2fd69'
           CASE_ISSUED_CITIZEN_POST: 'eedc916f-088f-4653-99ed-b954e1dbd58d'
-          CASE_ISSUED_RESPONDENT_EMAIL: 'd90a4a2d-1406-48d3-a319-924cc8f67d5e'
+          CASE_ISSUED_RESPONDENT_EMAIL: 'a8f94ce2-e220-4879-83cf-486bec2c188f'
           CASE_LINKED_EMAIL: '14633cea-db23-4a44-a477-3f3b37202b72'
           CASE_LINKED_POST: 'd69207af-ed64-4a60-b0a3-224d429d8b17'
           CASE_STAYED_EMAIL: '474266c4-f583-43b6-b464-3faad6567037'#