DTSPB-4373 Send Sealed and Certified Email

Jenkinsfile_CNP

@@ -41,6 +41,7 @@ def secrets = [
                 secret('excelaEmail', 'EXCELA_EMAIL'),
                 secret('smeeAndFordEmail', 'SMEE_AND_FORD_EMAIL'),
                 secret('hmrcEmail', 'HMRC_EMAIL'),
+                secret('sealedAndCertifiedEmail', 'SEALED_AND_CERTIFIED_EMAIL'),
                 secret('ftpSignature', 'FTP_SIGNATURE'),
                 secret('ftpEnv', 'FTP_ENV'),
                 secret('probate-bo-grantSignatureKey', 'PDF_SERVICE_GRANTSIGNATURESECRETKEY'),

charts/probate-back-office/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 description: A Helm chart for the HMCTS probate back office service
 name: probate-back-office
 home: https://github.com/hmcts/probate-back-office
-version: 1.0.47
+version: 1.0.48
 maintainers:
   - name: HMCTS Probate Team
     email: [email protected]

charts/probate-back-office/values.preview.template.yaml

@@ -305,6 +305,8 @@ java:
           alias: smeeAndFordEmail
         - name: hmrcEmail
           alias: hmrcEmail
+        - name: sealedAndCertifiedEmail
+          alias: sealedAndCertifiedEmail
         - name: ftpSignature
           alias: ftp.client.signature
         - name: ftpEnv

charts/probate-back-office/values.yaml

@@ -76,6 +76,8 @@ java:
           alias: smeeAndFordEmail
         - name: hmrcEmail
           alias: hmrcEmail
+        - name: sealedAndCertifiedEmail
+          alias: sealedAndCertifiedEmail
         - name: ftpSignature
           alias: ftp.client.signature
         - name: ftpEnv

src/integrationTest/java/uk/gov/hmcts/probate/controller/DocumentControllerIT.java

@@ -186,6 +186,8 @@ public void setUp() throws NotificationClientException {
 
         when(notificationService.sendEmail(any(State.class), any(CaseDetails.class))).thenReturn(document);
 
+        when(notificationService.sendSealedAndCertifiedEmail(any(CaseDetails.class))).thenReturn(document);
+
         when(documentGeneratorService.generateGrantReissue(any(), any(), any())).thenReturn(document);
         when(documentGeneratorService.generateCoversheet(any(CallbackRequest.class)))
             .thenReturn(Document.builder().documentType(DocumentType.GRANT_COVERSHEET).build());
@@ -293,6 +295,7 @@ void generateDigitalGrantReissueWithBulkPrint() throws Exception {
                 is(DIGITAL_GRANT_REISSUE.getTemplateName())))
             .andReturn();
 
+        verify(notificationService).sendSealedAndCertifiedEmail(any(CaseDetails.class));
         verify(bulkPrintService)
             .optionallySendToBulkPrint(any(CallbackRequest.class), any(Document.class), any(Document.class), eq(true));
     }
@@ -334,6 +337,7 @@ void generateDigitalGrantIfLocalPrint() throws Exception {
                 jsonPath("$.data.probateDocumentsGenerated[1].value.DocumentType", is(DIGITAL_GRANT.getTemplateName())))
             .andReturn();
         verify(notificationService).sendEmail(eq(State.GRANT_ISSUED), any(CaseDetails.class));
+        verify(notificationService).sendSealedAndCertifiedEmail(any(CaseDetails.class));
         verify(documentGeneratorService)
             .getDocument(any(CallbackRequest.class), eq(DocumentStatus.FINAL), eq(DocumentIssueType.GRANT));
     }
@@ -352,6 +356,7 @@ void generateDigitalGrantIntestacy() throws Exception {
             .andExpect(status().isOk())
             .andReturn();
         verify(notificationService).sendEmail(eq(State.GRANT_ISSUED_INTESTACY), any(CaseDetails.class));
+        verify(notificationService).sendSealedAndCertifiedEmail(any(CaseDetails.class));
         verify(documentGeneratorService)
             .getDocument(any(CallbackRequest.class), eq(DocumentStatus.FINAL), eq(DocumentIssueType.GRANT));
     }

src/integrationTest/java/uk/gov/hmcts/probate/service/NotificationServiceIT.java

@@ -2028,6 +2028,31 @@ void sendApplicationReceivedEmailCreatedByCaseWorkerPPIsExecToSolicitor()
         verify(pdfManagementService).generateAndUpload(any(SentEmail.class), eq(SENT_EMAIL));
     }
 
+    @Test
+    void verifysendsendSealedAndCertifiedEmail()
+            throws NotificationClientException, BadRequestException {
+
+        CaseDetails caseDetails = new CaseDetails(CaseData.builder()
+                .applicationType(SOLICITOR)
+                .deceasedForenames("Deceased")
+                .deceasedSurname("DeceasedL")
+                .build(), LAST_MODIFIED, ID);
+        notificationService.sendSealedAndCertifiedEmail(caseDetails);
+
+        HashMap<String, String> personalisation = new HashMap<>();
+
+        personalisation.put(PERSONALISATION_CCD_REFERENCE, caseDetails.getId().toString());
+        personalisation.put(PERSONALISATION_DECEASED_NAME, caseDetails.getData().getDeceasedFullName());
+
+        verify(notificationClient).sendEmail(
+                eq("sealed-and-certified"),
+                eq("[email protected]"),
+                eq(personalisation),
+                eq("1"));
+
+        verify(pdfManagementService).generateAndUpload(any(SentEmail.class), eq(SENT_EMAIL));
+    }
+
     @Test
     void verifySendNocEmail()
             throws NotificationClientException, BadRequestException {

src/integrationTest/resources/application.yml

@@ -163,6 +163,7 @@ notifications:
           redeclarationSot: "pa-redeclaration-sot"
           grantDelayed: "pa-grantDelayed"
           grantAwaitingDocumentation: "pa-grantAwaitingDoc"
+          sealedAndCertified: "sealed-and-certified"
         solicitor:
           applicationReceived: "sol-application-received"
           applicationReceivedNoDocs: "sol-application-received-no-docs"
@@ -184,6 +185,7 @@ notifications:
           grantDelayed: "sols-grantDelayed"
           grantAwaitingDocumentation: "sols-grantAwaitingDoc"
           noticeOfChangeReceived: "sols-noc"
+          sealedAndCertified: "sealed-and-certified"
       welsh:
         personal:
           applicationReceived: "pa-application-received-welsh"
@@ -206,6 +208,7 @@ notifications:
           redeclarationSot: "pa-redeclaration-sot-welsh"
           grantDelayed: "pa-grantDelayed-welsh"
           grantAwaitingDocumentation: "pa-grantAwaitingDoc-welsh"
+          sealedAndCertified: "sealed-and-certified"
         solicitor:
           applicationReceived: "sol-application-received-welsh"
           applicationReceivedNoDocs: "sol-application-received-no-docs-welsh"
@@ -226,6 +229,7 @@ notifications:
           grantDelayed: "sols-grantDelayed-welsh"
           grantAwaitingDocumentation: "sols-grantAwaitingDoc-welsh"
           noticeOfChangeReceived: "sols-noc"
+          sealedAndCertified: "sealed-and-certified"
 
 documents:
   templates:
@@ -408,6 +412,7 @@ idam-s2s-auth:
 excelaEmail: [email protected]
 smeeAndFordEmail: [email protected]
 hmrcEmail: ${HMRC_EMAIL:[email protected]}
+sealedAndCertifiedEmail: [email protected]
 
 data-extract:
   pagination:

src/main/java/uk/gov/hmcts/probate/config/notifications/EmailAddresses.java

@@ -14,4 +14,6 @@ public class EmailAddresses {
     private String smeeAndFordEmail;
 
     private String hmrcEmail;
+
+    private String sealedAndCertifiedEmail;
 }

src/main/java/uk/gov/hmcts/probate/config/notifications/EmailTemplates.java

@@ -30,4 +30,5 @@ public class EmailTemplates {
     private String grantAwaitingDocumentation;
     private String hmrcExtract;
     private String noticeOfChangeReceived;
+    private String sealedAndCertified;
 }

src/main/java/uk/gov/hmcts/probate/controller/DocumentController.java

@@ -198,6 +198,9 @@ public ResponseEntity<CallbackResponse> generateGrant(
         documents.add(digitalGrantDocument);
         documents.add(coverSheet);
         Optional<UserInfo> caseworkerInfo = userInfoService.getCaseworkerInfo();
+        if (caseData.getOutsideUKGrantCopies() != null && caseData.getOutsideUKGrantCopies() > 0) {
+            documents.add(notificationService.sendSealedAndCertifiedEmail(caseDetails));
+        }
         if (caseData.isGrantIssuedEmailNotificationRequested()) {
             callbackResponse =
                 eventValidationService.validateEmailRequest(callbackRequest, emailAddressNotifyValidationRules);
@@ -213,7 +216,6 @@ public ResponseEntity<CallbackResponse> generateGrant(
             callbackResponse = callbackResponseTransformer.addDocuments(callbackRequest, documents, letterId, pdfSize,
                     caseworkerInfo);
         }
-
         return ResponseEntity.ok(callbackResponse);
     }
 
@@ -307,11 +309,13 @@ public ResponseEntity<CallbackResponse> generateGrantReissue(
                 grantDocument, true);
         }
 
-        String pdfSize = getPdfSize(caseData);
-
+        if (caseData.getOutsideUKGrantCopies() != null && caseData.getOutsideUKGrantCopies() > 0) {
+            documents.add(notificationService.sendSealedAndCertifiedEmail(caseDetails));
+        }
         if (caseData.isGrantReissuedEmailNotificationRequested()) {
             documents.add(notificationService.generateGrantReissue(callbackRequest));
         }
+        String pdfSize = getPdfSize(caseData);
         log.info("{} documents generated: {}", documents.size(), documents);
         Optional<UserInfo> caseworkerInfo = userInfoService.getCaseworkerInfo();
         return ResponseEntity.ok(callbackResponseTransformer.addDocuments(callbackRequest,

src/main/java/uk/gov/hmcts/probate/service/NotificationService.java

@@ -171,6 +171,27 @@ public Document emailPreview(CaseDetails caseDetails) throws NotificationClientE
         return getGeneratedDocument(previewResponse, getEmail(caseData), SENT_EMAIL);
     }
 
+    public Document sendSealedAndCertifiedEmail(CaseDetails caseDetails) throws NotificationClientException {
+        CaseData caseData = caseDetails.getData();
+        String reference = caseDetails.getId().toString();
+        String deceasedName = caseData.getDeceasedFullName();
+
+        String templateId = notificationTemplates.getEmail().get(LanguagePreference.ENGLISH)
+                .get(caseData.getApplicationType()).getSealedAndCertified();
+        Map<String, Object> personalisation =
+                grantOfRepresentationPersonalisationService.getSealedAndCertifiedPersonalisation(caseDetails.getId(),
+                         deceasedName);
+        doCommonNotificationServiceHandling(personalisation, caseDetails.getId());
+
+        log.info("Sealed And Certified Personlisation complete now get the email response");
+
+        SendEmailResponse response = notificationClientService.sendEmail(templateId,
+                emailAddresses.getSealedAndCertifiedEmail(), personalisation, reference);
+
+        log.info("Send Sealed And Certified completed.");
+        return getGeneratedSentEmailDocument(response, emailAddresses.getSealedAndCertifiedEmail(), SENT_EMAIL);
+    }
+
     public Document sendNocEmail(State state, CaseDetails caseDetails) throws NotificationClientException {
         CaseData caseData = caseDetails.getData();
         Registry registry = registriesProperties.getRegistries().get(caseData.getRegistryLocation().toLowerCase());

src/main/java/uk/gov/hmcts/probate/service/notification/GrantOfRepresentationPersonalisationService.java

@@ -70,6 +70,14 @@ public Map<String, String> getExelaPersonalisation(List<ReturnedCaseDetails> cas
         return personalisation;
     }
 
+    public Map<String, Object> getSealedAndCertifiedPersonalisation(Long caseId, String deceasedName) {
+        HashMap<String, Object> personalisation = new HashMap<>();
+        personalisation.put(PERSONALISATION_CCD_REFERENCE, caseId.toString());
+        personalisation.put(PERSONALISATION_DECEASED_NAME, deceasedName);
+
+        return personalisation;
+    }
+
     public Map<String, Object> getNocPersonalisation(Long caseId, String solicitorName, String deceasedName) {
         HashMap<String, Object> personalisation = new HashMap<>();
 

src/main/resources/application.yml

@@ -264,6 +264,7 @@ notifications:
           caveatWithdrawn: "99b9ba1a-a2a1-4b85-ae83-e1652e9d342b"
           grantDelayed: "7045b381-a087-44fe-8bb5-e5a591cb8473"
           grantAwaitingDocumentation: "cc4aa69b-10fb-4a9c-9e0e-1851dfaa69e9"
+          sealedAndCertified: "16c9a4ce-162f-4ed1-8d70-be79616685ac"
         solicitor:
           applicationReceived: "27939b7f-3028-4c90-87bb-694adb0b6a51"
           applicationReceivedNoDocs: "b374863f-3f65-4aed-a5ab-fb2648222f75"
@@ -288,6 +289,7 @@ notifications:
           grantDelayed: "7045b381-a087-44fe-8bb5-e5a591cb8473"
           grantAwaitingDocumentation: "638395bf-805f-48a7-97b1-d26ea9e9334e"
           noticeOfChangeReceived: "6af59aa3-b379-406f-9be4-331b8411c6d9"
+          sealedAndCertified: "16c9a4ce-162f-4ed1-8d70-be79616685ac"
       welsh:
         personal:
           applicationReceived: "7f39b671-86ce-49cb-b6b1-2019101aa8b1"
@@ -312,6 +314,7 @@ notifications:
           caveatWithdrawn: "c63bc430-9868-4f10-924b-408c7ac3cbd8"
           grantDelayed: "7045b381-a087-44fe-8bb5-e5a591cb8473"
           grantAwaitingDocumentation: "cc4aa69b-10fb-4a9c-9e0e-1851dfaa69e9"
+          sealedAndCertified: "16c9a4ce-162f-4ed1-8d70-be79616685ac"
         solicitor:
           applicationReceived: "2f282002-6799-47d0-92dd-726960b91c98"
           applicationReceivedNoDocs: "60eab724-adec-4d5d-a0a1-aef73ed7da4d"
@@ -336,6 +339,7 @@ notifications:
           grantDelayed: "7045b381-a087-44fe-8bb5-e5a591cb8473"
           grantAwaitingDocumentation: "638395bf-805f-48a7-97b1-d26ea9e9334e"
           noticeOfChangeReceived: "6af59aa3-b379-406f-9be4-331b8411c6d9"
+          sealedAndCertified: "16c9a4ce-162f-4ed1-8d70-be79616685ac"
 
 documents:
   templates:
@@ -513,6 +517,8 @@ smeeAndFordEmail: ${SMEE_AND_FORD_EMAIL:[email protected]}
 
 hmrcEmail: ${HMRC_EMAIL:[email protected]}
 
+sealedAndCertifiedEmail: ${SEALED_AND_CERTIFIED_EMAIL:[email protected]}
+
 welsh:
   months:
     1: "Ionawr"

src/test/java/uk/gov/hmcts/probate/controller/NotificationControllerUnitTest.java

@@ -371,6 +371,31 @@ void shouldNotStartAwaitingDocumentationNotificationPeriodNullEvidenceHandled()
         assertThat(stringResponseEntity.getStatusCode(), is(HttpStatus.OK));
     }
 
+    @Test
+    void shouldSealedAndCertifiedEmail() throws NotificationClientException {
+        CaseDetails caseDetails = new CaseDetails(CaseData.builder()
+                .applicationType(SOLICITOR)
+                .deceasedForenames("Deceased")
+                .deceasedSurname("DeceasedL")
+                .build(), LAST_MODIFIED, ID);
+        callbackRequest = new CallbackRequest(caseDetails);
+        document = Document.builder()
+                .documentDateAdded(LocalDate.now())
+                .documentFileName("fileName")
+                .documentGeneratedBy("generatedBy")
+                .documentLink(
+                        DocumentLink.builder().documentUrl("url").documentFilename("file")
+                                .documentBinaryUrl("binary").build())
+                .documentType(DocumentType.SENT_EMAIL)
+                .build();
+        callbackResponse = CallbackResponse.builder().errors(Collections.EMPTY_LIST).build();
+        when(eventValidationService.validateNocEmail(any(), any())).thenReturn(callbackResponse);
+        when(notificationService.sendSealedAndCertifiedEmail(any())).thenReturn(document);
+        ResponseEntity<CallbackResponse> stringResponseEntity =
+                notificationController.sendNOCEmailNotification(callbackRequest);
+        assertThat(stringResponseEntity.getStatusCode(), is(HttpStatus.OK));
+    }
+
     @Test
     void shouldSendNocEmail() throws NotificationClientException {
         setUpMocks(NOC);

src/test/resources/payloadWithBulkPrint.json

@@ -90,6 +90,7 @@
         "document_binary_url": "http://localhost:8080/documents/e1f4f972-1514-4247-bdb1-964998ef3710/binary"
       },
       "extraCopiesOfGrant": null,
+      "outsideUKGrantCopies": 1,
       "solsPaymentMethods": "fee account",
       "solsSolicitorFirmPostcode": "KT10 0LA",
       "deceasedForenames": "Deceased First Name",

src/test/resources/payloadWithLocalPrint.json

@@ -90,6 +90,7 @@
         "document_binary_url": "http://localhost:8080/documents/e1f4f972-1514-4247-bdb1-964998ef3710/binary"
       },
       "extraCopiesOfGrant": null,
+      "outsideUKGrantCopies": 1,
       "solsPaymentMethods": "fee account",
       "solsSolicitorFirmPostcode": "KT10 0LA",
       "deceasedForenames": "Deceased First Name",

src/test/resources/personalPayloadNotificationsGrantIntestacy.json

@@ -69,6 +69,7 @@
         "document_binary_url": "http://localhost:8080/documents/e1f4f972-1514-4247-bdb1-964998ef3710/binary"
       },
       "extraCopiesOfGrant": null,
+      "outsideUKGrantCopies": 1,
       "solsPaymentMethods": "fee account",
       "deceasedForenames": "Deceased First Name",
       "primaryApplicantIsApplying": "Yes",