update wording and remove consent part

Author: chak-shing-lo-justice

ccd-definition/CaseField/CareSupervision/hearingOrders.json

@@ -1239,7 +1239,7 @@
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",
     "ID": "previewOrderLabel",
-    "Label": "Cover sheets will be automatically added to the following C21 orders. If the content is incorrect, please return to the previous step and upload a revised document.",
+    "Label": "If you click 'Continue', the draft order will be approved without any changes. A coversheet will be added showing your name and the date of approval, and a court seal will also be applied to the final version.<br/><br/>Please note that the preview shown below will not display the court seal, but it reflects the content that will be issued.<br/><br/>If you wish to make any amendments, please return to the previous screen and select either 'No, I need to make changes' or 'No, the applicant needs to make changes'.",
     "FieldType": "Label",
     "SecurityClassification": "Public",
     "Searchable": "N"

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

@@ -156,7 +156,7 @@ void shouldNotReturnErrorsWhenJudgeDoesNotReviewOneOfTheDraftOrdersInTheBundle()
             .reviewDraftOrdersData(reviewDraftOrdersData).build();
 
         when(judicialService.isCurrentUserFeePaidJudge()).thenReturn(Boolean.FALSE);
-        when(hearingOrderGenerator.addCoverSheet(caseData, order, draftOrder1)).thenReturn(orderWithCoverSheet);
+        when(hearingOrderGenerator.addCoverSheet(caseData, order)).thenReturn(orderWithCoverSheet);
         AboutToStartOrSubmitCallbackResponse callbackResponse = postMidEvent(caseData, validateDecisionEventPath);
 
         assertThat(callbackResponse.getErrors()).isEmpty();

service/src/main/java/uk/gov/hmcts/reform/fpl/model/docmosis/DocmosisApprovedOrderCoverSheet.java

@@ -15,6 +15,5 @@ public class DocmosisApprovedOrderCoverSheet implements DocmosisData {
     private final List<DocmosisChild> children;
     private final String judgeTitleAndName;
     private final String dateOfApproval;
-    private final String orderByConsent;
     private final String crest;
 }

service/src/main/java/uk/gov/hmcts/reform/fpl/service/cmo/ApproveDraftOrdersService.java

@@ -424,7 +424,7 @@ public Map<String, Object> previewOrderWithCoverSheet(CaseData caseData) {
 
                 data.put("previewApprovedOrder" + labelCounter,
                     hearingOrderGenerator.addCoverSheet(caseData, (approvedOrder.isConfidentialOrder()
-                        ? approvedOrder.getOrderConfidential() : approvedOrder.getOrder()), orderElement));
+                        ? approvedOrder.getOrderConfidential() : approvedOrder.getOrder())));
                 data.put("previewApprovedOrderTitle" + labelCounter,
                     String.format("Order %d %s", (i + 1), approvedOrder.getTitle()));
                 labelCounter++;

service/src/main/java/uk/gov/hmcts/reform/fpl/service/cmo/HearingOrderGenerator.java

@@ -62,7 +62,7 @@ public Element<HearingOrder> buildSealedHearingOrder(CaseData caseData,
 
         if (addCoverSheet) {
             // add a sealed cover sheet to the order
-            sealedOrder = documentSealingService.sealDocument(addCoverSheet(caseData, sealedOrder, hearingOrderElement),
+            sealedOrder = documentSealingService.sealDocument(addCoverSheet(caseData, sealedOrder),
                 caseData.getCourt(), caseData.getSealType());
         }
 
@@ -81,11 +81,10 @@ public Element<HearingOrder> buildRejectedHearingOrder(
             .build());
     }
 
-    public DocumentReference addCoverSheet(CaseData caseData, DocumentReference orderDoc,
-                                           Element<HearingOrder> hearingOrderElement) {
+    public DocumentReference addCoverSheet(CaseData caseData, DocumentReference orderDoc) {
         try {
             DocmosisDocument orderWithCoverSheet = docmosisApprovedOrderCoverSheetService
-                .addCoverSheetToApprovedOrder(caseData, orderDoc, hearingOrderElement);
+                .addCoverSheetToApprovedOrder(caseData, orderDoc);
 
             return buildFromDocument(uploadDocumentService
                 .uploadPDF(orderWithCoverSheet.getBytes(), orderDoc.getFilename()));

service/src/main/java/uk/gov/hmcts/reform/fpl/service/docmosis/DocmosisApprovedOrderCoverSheetService.java

@@ -10,32 +10,24 @@
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.fpl.enums.docmosis.RenderFormat;
 import uk.gov.hmcts.reform.fpl.model.CaseData;
-import uk.gov.hmcts.reform.fpl.model.common.C2DocumentBundle;
 import uk.gov.hmcts.reform.fpl.model.common.DocmosisDocument;
 import uk.gov.hmcts.reform.fpl.model.common.DocumentReference;
-import uk.gov.hmcts.reform.fpl.model.common.Element;
 import uk.gov.hmcts.reform.fpl.model.configuration.Language;
 import uk.gov.hmcts.reform.fpl.model.docmosis.DocmosisApprovedOrderCoverSheet;
-import uk.gov.hmcts.reform.fpl.model.order.HearingOrder;
 import uk.gov.hmcts.reform.fpl.service.CaseDataExtractionService;
 import uk.gov.hmcts.reform.fpl.service.orders.generator.DocumentMerger;
 import uk.gov.hmcts.reform.fpl.service.time.Time;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Stream;
 
-import static uk.gov.hmcts.reform.fpl.enums.C2ApplicationType.WITHOUT_NOTICE;
 import static uk.gov.hmcts.reform.fpl.enums.DocmosisImages.CREST;
 import static uk.gov.hmcts.reform.fpl.enums.DocmosisTemplates.APPROVED_ORDER_COVER;
-import static uk.gov.hmcts.reform.fpl.enums.YesNo.YES;
 import static uk.gov.hmcts.reform.fpl.model.configuration.Language.WELSH;
 import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.DATE;
 import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.formatLocalDateToString;
-import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.unwrapElements;
 
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@@ -48,10 +40,9 @@ public class DocmosisApprovedOrderCoverSheetService {
     private final DocumentMerger documentMerger;
     private final Time time;
 
-    public DocmosisDocument addCoverSheetToApprovedOrder(CaseData caseData, DocumentReference order,
-                                                         Element<HearingOrder> hearingOrderElement) throws IOException {
+    public DocmosisDocument addCoverSheetToApprovedOrder(CaseData caseData, DocumentReference order) throws IOException {
         // Create
-        DocmosisDocument coverSheet = createCoverSheet(caseData, hearingOrderElement);
+        DocmosisDocument coverSheet = createCoverSheet(caseData);
 
         // Add cover sheet to the order
         DocmosisDocument orderWithCoverSheet = documentMerger.mergeDocuments(coverSheet, List.of(order));
@@ -94,25 +85,22 @@ public DocmosisDocument addCoverSheetToApprovedOrder(CaseData caseData, Document
         }
     }
 
-    public DocmosisDocument createCoverSheet(CaseData caseData, Element<HearingOrder> hearingOrder) {
-        DocmosisApprovedOrderCoverSheet coverDocumentData = buildCoverDocumentsData(caseData, hearingOrder);
+    public DocmosisDocument createCoverSheet(CaseData caseData) {
+        DocmosisApprovedOrderCoverSheet coverDocumentData = buildCoverDocumentsData(caseData);
         return docmosisDocumentGeneratorService.generateDocmosisDocument(coverDocumentData,
             APPROVED_ORDER_COVER,
             RenderFormat.PDF,
             getCaseLanguage(caseData));
     }
 
-    public DocmosisApprovedOrderCoverSheet buildCoverDocumentsData(CaseData caseData,
-                                                                   Element<HearingOrder> hearingOrder) {
-
+    public DocmosisApprovedOrderCoverSheet buildCoverDocumentsData(CaseData caseData) {
         return DocmosisApprovedOrderCoverSheet.builder()
             .familyManCaseNumber(caseData.getFamilyManCaseNumber())
             .courtName(caseDataExtractionService.getCourtName(caseData))
             .children(caseDataExtractionService.getChildrenDetails(caseData.getAllChildren()))
             .judgeTitleAndName(caseData.getReviewDraftOrdersData().getJudgeTitleAndName())
             .dateOfApproval(formatLocalDateToString(time.now().toLocalDate(), DATE, getCaseLanguage(caseData)))
             .crest(CREST.getValue())
-            .orderByConsent(isC2OrderByConsent(caseData, hearingOrder) ? YES.getValue() : null)
             .build();
     }
 
@@ -123,22 +111,4 @@ private String getAnnexText(CaseData caseData) {
     private Language getCaseLanguage(CaseData caseData) {
         return Optional.ofNullable(caseData.getC110A().getLanguageRequirementApplication()).orElse(Language.ENGLISH);
     }
-
-    private boolean isC2OrderByConsent(CaseData caseData, Element<HearingOrder> hearingOrder) {
-        // 1. filter out all additional applications bundles by consent
-        // 2. check if the hearing order id is present in any of the bundle
-        return unwrapElements(caseData.getAdditionalApplicationsBundle()).stream()
-            .anyMatch(additionalApplicationsBundle ->
-                Stream.of(additionalApplicationsBundle.getC2DocumentBundle(),
-                        additionalApplicationsBundle.getC2DocumentBundleConfidential())
-                    .filter(Objects::nonNull)
-                    .filter(documentBundle -> WITHOUT_NOTICE.equals(documentBundle.getType()))
-                    .map(C2DocumentBundle::getDraftOrdersBundle)
-                    .filter(Objects::nonNull)
-                    .flatMap(List::stream)
-                    .anyMatch(draftOrderElement ->
-                        draftOrderElement.getValue().getDocument().getUrl()
-                            .equals(hearingOrder.getValue().getOrderOrOrderConfidential().getUrl()))
-            );
-    }
 }

service/src/test/java/uk/gov/hmcts/reform/fpl/service/cmo/HearingOrderGeneratorTest.java

@@ -86,8 +86,7 @@ void shouldBuildSealedHearingOrderWhenReviewDecisionIsApproved() throws IOExcept
             .build();
 
         when(documentSealingService.sealDocument(order, court, SealType.ENGLISH)).thenReturn(sealedOrder);
-        when(docmosisApprovedOrderCoverSheetService.addCoverSheetToApprovedOrder(caseData, sealedOrder,
-            element(ORDER_ID, hearingOrder)))
+        when(docmosisApprovedOrderCoverSheetService.addCoverSheetToApprovedOrder(caseData, sealedOrder))
             .thenReturn(DOCMOSIS_DOCUMENT_ORDER_WITH_COVER_SHEET);
         when(uploadDocumentService.uploadPDF(eq(ORDER_WITH_COVER_SHEET_BYTES), any()))
             .thenReturn(ORDER_WITH_COVER_SHEET_DOCUMENT);
@@ -122,8 +121,7 @@ void shouldBuildSealedHearingOrderWhenJudgeAmendsTheDocument() throws IOExceptio
             .reviewCMODecision(reviewDecision)
             .build();
         when(documentSealingService.sealDocument(amendedOrder, court, SealType.ENGLISH)).thenReturn(sealedOrder);
-        when(docmosisApprovedOrderCoverSheetService.addCoverSheetToApprovedOrder(caseData, sealedOrder,
-            element(ORDER_ID, hearingOrder)))
+        when(docmosisApprovedOrderCoverSheetService.addCoverSheetToApprovedOrder(caseData, sealedOrder))
             .thenReturn(DOCMOSIS_DOCUMENT_ORDER_WITH_COVER_SHEET);
         when(uploadDocumentService.uploadPDF(eq(ORDER_WITH_COVER_SHEET_BYTES), any()))
             .thenReturn(ORDER_WITH_COVER_SHEET_DOCUMENT);

service/src/test/java/uk/gov/hmcts/reform/fpl/service/docmosis/DocmosisApprovedOrderCoverSheetServiceTest.java

@@ -37,7 +37,6 @@
 import static org.mockito.BDDMockito.given;
 import static uk.gov.hmcts.reform.fpl.enums.DocmosisImages.CREST;
 import static uk.gov.hmcts.reform.fpl.enums.DocmosisTemplates.APPROVED_ORDER_COVER;
-import static uk.gov.hmcts.reform.fpl.enums.YesNo.YES;
 import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.DATE;
 import static uk.gov.hmcts.reform.fpl.utils.DateFormatterHelper.formatLocalDateToString;
 import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.element;
@@ -131,7 +130,7 @@ void shouldGenerateApprovedOrderCoverSheet() {
                 RenderFormat.PDF, LANGUAGE))
             .willReturn(COVER_SHEET);
 
-        DocmosisDocument result = underTest.createCoverSheet(caseData, HEARING_ORDER);
+        DocmosisDocument result = underTest.createCoverSheet(caseData);
 
         assertThat(result).isEqualTo(COVER_SHEET);
     }
@@ -172,50 +171,10 @@ void shouldAddCoverSheetAndAddAnnexAWording() throws IOException {
         DocmosisDocument mergedOrder = new DocmosisDocument("merged_order.pdf", mergedOrderBytes);
         given(documentMerger.mergeDocuments(any(), any())).willReturn(mergedOrder);
 
-        DocmosisDocument result = underTest.addCoverSheetToApprovedOrder(caseData, testDocumentReference(),
-            HEARING_ORDER);
+        DocmosisDocument result = underTest.addCoverSheetToApprovedOrder(caseData, testDocumentReference());
 
         String resultText = (new DocmosisHelper()).extractPdfContent(result.getBytes());
 
         assertThat(resultText).isEqualToNormalizingWhitespace("First page Second page ANNEX A: ");
     }
-
-    @Test
-    void shouldAddCoverSheetWithConsentWording() {
-        CaseData caseData = CaseData.builder()
-            .id(CASE_ID)
-            .familyManCaseNumber(FAMILY_MAN_NUMBER)
-            .court(COURT)
-            .c110A(C110A.builder()
-                .languageRequirementApplication(LANGUAGE)
-                .build())
-            .children1(List.of(CHILD))
-            .confidentialChildren(List.of(CONFIDENTIAL_CHILD))
-            .reviewDraftOrdersData(ReviewDraftOrdersData.builder().judgeTitleAndName(JUDGE_NAME).build())
-            .additionalApplicationsBundle(List.of(C2_BUNDLE_WITH_CONSENT))
-            .build();
-
-        given(caseDataExtractionService.getCourtName(caseData)).willReturn(COURT_NAME);
-        given(caseDataExtractionService.getChildrenDetails(caseData.getAllChildren())).willReturn(DOCMOSIS_CHILDREN);
-        given(time.now()).willReturn(TEST_TIME);
-
-        DocmosisApprovedOrderCoverSheet expectedDocmosisData = DocmosisApprovedOrderCoverSheet.builder()
-            .familyManCaseNumber(FAMILY_MAN_NUMBER)
-            .courtName(COURT_NAME)
-            .children(DOCMOSIS_CHILDREN)
-            .judgeTitleAndName(JUDGE_NAME)
-            .dateOfApproval(formatLocalDateToString(TEST_TIME.toLocalDate(), DATE, Language.ENGLISH))
-            .crest(CREST.getValue())
-            .orderByConsent(YES.getValue())
-            .build();
-
-
-        given(docmosisDocumentGeneratorService.generateDocmosisDocument(expectedDocmosisData, APPROVED_ORDER_COVER,
-            RenderFormat.PDF, LANGUAGE))
-            .willReturn(COVER_SHEET);
-
-        DocmosisDocument result = underTest.createCoverSheet(caseData, HEARING_ORDER_WITH_CONSENT);
-
-        assertThat(result).isEqualTo(COVER_SHEET);
-    }
 }