Merge branch 'master' into DFPL-2864

Author: Braimah101

service/src/main/java/uk/gov/hmcts/reform/fpl/controllers/support/MigrateCaseController.java

@@ -32,7 +32,8 @@ public class MigrateCaseController extends CallbackController {
         "DFPL-log", this::runLog,
         "DFPL-3080", this::run3080,
         "DFPL-3048", this::run3048,
-        "DFPL-3047", this::run3047
+        "DFPL-3047", this::run3047,
+        "DFPL-3085", this::run3085
     );
 
     @PostMapping("/about-to-submit")
@@ -92,4 +93,15 @@ private void run3047(CaseDetails caseDetails) {
         caseDetails.getData().putAll(migrateCaseService
             .updateRespondentPolicy(getCaseData(caseDetails), orgId, null, 0));
     }
+
+    private void run3085(CaseDetails caseDetails) {
+        final String migrationId = "DFPL-3085";
+        final long expectedCaseId = 1767953928694083L;
+
+        Long caseId = caseDetails.getId();
+        migrateCaseService.doCaseIdCheck(caseId, expectedCaseId, migrationId);
+
+        caseDetails.getData().putAll(migrateCaseService.removeStatementOfService(migrationId, getCaseData(caseDetails),
+            "483e196a-6206-4d09-8172-7f56dc72d32d"));
+    }
 }

service/src/main/java/uk/gov/hmcts/reform/fpl/service/MigrateCaseService.java

@@ -30,6 +30,7 @@
 import uk.gov.hmcts.reform.fpl.model.PositionStatementChild;
 import uk.gov.hmcts.reform.fpl.model.PositionStatementRespondent;
 import uk.gov.hmcts.reform.fpl.model.Proceeding;
+import uk.gov.hmcts.reform.fpl.model.Recipients;
 import uk.gov.hmcts.reform.fpl.model.Respondent;
 import uk.gov.hmcts.reform.fpl.model.SentDocuments;
 import uk.gov.hmcts.reform.fpl.model.SkeletonArgument;
@@ -1422,4 +1423,26 @@ public List<Element<HearingBooking>> replaceHearingJudgeEmailAddress(String migr
 
         return hearings;
     }
+
+    public Map<String, Object> removeStatementOfService(String migrationId, CaseData caseData,
+                                                        String statementIdToBeRemoved) {
+
+        List<Element<Recipients>> statementOfService = caseData.getStatementOfService();
+        if (isEmpty(statementOfService)) {
+            throw new AssertionError(format("Migration {id = %s, case reference = %s}, statement of service not found",
+                migrationId, caseData.getId()));
+        }
+
+        List<Element<Recipients>> statementOfServiceAfter = ElementUtils.removeElementWithUUID(statementOfService,
+            UUID.fromString(statementIdToBeRemoved));
+
+        if (statementOfServiceAfter.size() == statementOfService.size()) {
+            throw new AssertionError(format(
+                "Migration {id = %s, case reference = %s}, statement of service element not found",
+                migrationId, caseData.getId()));
+        }
+
+        return Map.of("statementOfService", statementOfServiceAfter);
+
+    }
 }

service/src/test/java/uk/gov/hmcts/reform/fpl/service/MigrateCaseServiceTest.java

@@ -52,6 +52,7 @@
 import uk.gov.hmcts.reform.fpl.model.PositionStatementChild;
 import uk.gov.hmcts.reform.fpl.model.PositionStatementRespondent;
 import uk.gov.hmcts.reform.fpl.model.Proceeding;
+import uk.gov.hmcts.reform.fpl.model.Recipients;
 import uk.gov.hmcts.reform.fpl.model.Respondent;
 import uk.gov.hmcts.reform.fpl.model.RespondentParty;
 import uk.gov.hmcts.reform.fpl.model.RespondentPolicyData;
@@ -3797,4 +3798,43 @@ void shouldFixJudgeEmailOnSpecifiedHearingBooking() {
             assertThat(fixedHearingBookings.contains(element(hearingId, expectedHearingBooking))).isTrue();
         }
     }
+
+    @Nested
+    class RemoveStatementOfService {
+        @Test
+        void shouldRemoveStatementOfService() {
+            Element<Recipients> statementOfService =
+                element(Recipients.builder().email("recipient@test.com").name("Recipient").build());
+            Element<Recipients> statementOfServiceToBeRemoved =
+                element(Recipients.builder().email("removed@test.com").name("Removed").build());
+
+            CaseData caseData = CaseData.builder()
+                .statementOfService(List.of(statementOfService, statementOfServiceToBeRemoved))
+                .build();
+
+            Map<String, Object> result = underTest.removeStatementOfService(MIGRATION_ID, caseData,
+                statementOfServiceToBeRemoved.getId().toString());
+
+            assertThat(result).containsExactlyEntriesOf(Map.of("statementOfService", List.of(statementOfService)));
+        }
+
+        @Test
+        void shouldThrowExceptionIfNoStatementOfService() {
+            CaseData caseData = CaseData.builder()
+                .build();
+
+            assertThrows(AssertionError.class, () ->
+                underTest.removeStatementOfService(MIGRATION_ID, caseData, UUID.randomUUID().toString()));
+        }
+
+        @Test
+        void shouldThrowExceptionIfNoStatementOfServiceRemoved() {
+            CaseData caseData = CaseData.builder()
+                .statementOfService(wrapElementsWithUUIDs(Recipients.builder().build()))
+                .build();
+
+            assertThrows(AssertionError.class, () ->
+                underTest.removeStatementOfService(MIGRATION_ID, caseData, UUID.randomUUID().toString()));
+        }
+    }
 }