From f71394f6555e7ea4ec8727afed7437ec97d69fac Mon Sep 17 00:00:00 2001
From: Tom Saunders <tom.saunders@justice.gov.uk>
Date: Thu, 9 Jan 2025 16:09:01 +0000
Subject: [PATCH] Propagate Notify errors back to request for information.

---
 .../gov/hmcts/probate/controller/NotificationController.java | 3 ++-
 .../service/InformationRequestCorrespondenceService.java     | 2 +-
 .../gov/hmcts/probate/service/InformationRequestService.java | 5 +++--
 .../hmcts/probate/service/InformationRequestServiceTest.java | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/uk/gov/hmcts/probate/controller/NotificationController.java b/src/main/java/uk/gov/hmcts/probate/controller/NotificationController.java
index fc0e184c98..2a38392251 100644
--- a/src/main/java/uk/gov/hmcts/probate/controller/NotificationController.java
+++ b/src/main/java/uk/gov/hmcts/probate/controller/NotificationController.java
@@ -199,7 +199,8 @@ public ResponseEntity<CallbackResponse> sendDocumentReceivedNotification(
     }
 
     @PostMapping(path = "/stopped-information-request")
-    public ResponseEntity<CallbackResponse> informationRequest(@RequestBody CallbackRequest callbackRequest) {
+    public ResponseEntity<CallbackResponse> informationRequest(
+            @RequestBody final CallbackRequest callbackRequest) throws NotificationClientException {
         Optional<UserInfo> caseworkerInfo = userInfoService.getCaseworkerInfo();
         return ResponseEntity.ok(informationRequestService.handleInformationRequest(callbackRequest, caseworkerInfo));
     }
diff --git a/src/main/java/uk/gov/hmcts/probate/service/InformationRequestCorrespondenceService.java b/src/main/java/uk/gov/hmcts/probate/service/InformationRequestCorrespondenceService.java
index d05ba5a803..65c3cb73d0 100644
--- a/src/main/java/uk/gov/hmcts/probate/service/InformationRequestCorrespondenceService.java
+++ b/src/main/java/uk/gov/hmcts/probate/service/InformationRequestCorrespondenceService.java
@@ -18,7 +18,7 @@ public class InformationRequestCorrespondenceService {
 
     private final NotificationService notificationService;
 
-    public List<Document> emailInformationRequest(CaseDetails caseDetails) {
+    public List<Document> emailInformationRequest(CaseDetails caseDetails) throws NotificationClientException {
         try {
             final Document notification = notificationService.sendEmail(CASE_STOPPED_REQUEST_INFORMATION, caseDetails);
             log.info("Successful response for request for information email for case id {} ", caseDetails.getId());
diff --git a/src/main/java/uk/gov/hmcts/probate/service/InformationRequestService.java b/src/main/java/uk/gov/hmcts/probate/service/InformationRequestService.java
index 1e18ba3dac..05f3a4caea 100644
--- a/src/main/java/uk/gov/hmcts/probate/service/InformationRequestService.java
+++ b/src/main/java/uk/gov/hmcts/probate/service/InformationRequestService.java
@@ -26,8 +26,9 @@ public class InformationRequestService {
     private final CallbackResponseTransformer callbackResponseTransformer;
     private final EmailAddressNotifyApplicantValidationRule emailAddressNotifyApplicantValidationRule;
 
-    public CallbackResponse handleInformationRequest(CallbackRequest callbackRequest,
-                                                     Optional<UserInfo> caseworkerInfo) {
+    public CallbackResponse handleInformationRequest(
+            final CallbackRequest callbackRequest,
+            final Optional<UserInfo> caseworkerInfo) throws NotificationClientException {
         CaseData caseData = callbackRequest.getCaseDetails().getData();
         CCDData dataForEmailAddress = CCDData.builder()
                 .applicationType(caseData.getApplicationType().name())
diff --git a/src/test/java/uk/gov/hmcts/probate/service/InformationRequestServiceTest.java b/src/test/java/uk/gov/hmcts/probate/service/InformationRequestServiceTest.java
index 4d7706ef49..d5200c17d8 100644
--- a/src/test/java/uk/gov/hmcts/probate/service/InformationRequestServiceTest.java
+++ b/src/test/java/uk/gov/hmcts/probate/service/InformationRequestServiceTest.java
@@ -73,7 +73,7 @@ public void setup() {
     }
 
     @Test
-    void testEmailRequestReturnsSentEmailDocumentSuccessfully() {
+    void testEmailRequestReturnsSentEmailDocumentSuccessfully() throws NotificationClientException {
         CollectionMember<Document> documentCollectionMember =
             new CollectionMember<>(Document.builder().documentType(DocumentType.SENT_EMAIL).build());
         documentList = new ArrayList<>();
@@ -102,7 +102,7 @@ void testEmailRequestReturnsSentEmailDocumentSuccessfully() {
     }
 
     @Test
-    void testEmailRequestReturnsErrorWhenNoEmailProvided() {
+    void testEmailRequestReturnsErrorWhenNoEmailProvided() throws NotificationClientException {
         caseData = CaseData.builder()
                 .applicationType(ApplicationType.PERSONAL)
                 .build();