DFR-3812 Make “generatedLetter” deletable (#2589)

* typo

* Enable generatedLetter to be deleted.

---------

Co-authored-by: Ashley Wong <[email protected]>

Author: so99y

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/GeneralLetterService.java

@@ -25,7 +25,7 @@
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.IntervenerTwo;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.intevener.IntervenerWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.document.BulkPrintDocument;
-import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.CreateGeneralLetterDocumentCategoriser;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcategory.CreateGeneralLetterDocumentCategoriser;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/documentcatergory/CreateGeneralLetterDocumentCategoriser.java renamed to src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/documentcategory/CreateGeneralLetterDocumentCategoriser.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory;
+package uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcategory;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,7 +8,9 @@
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.GeneralLetterCollection;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.GeneralLetterWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.service.FeatureToggleService;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.DocumentCategoriser;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.APPLICANT;
@@ -63,6 +65,7 @@ private void categoriseGeneralLetters(GeneralLetterWrapper wrapper) {
             .ifPresent(generalLetters -> generalLetters.stream()
                 .map(GeneralLetterCollection::getValue)
                 .map(GeneralLetter::getGeneratedLetter)
+                .filter(Objects::nonNull)
                 .filter(generatedLetter -> generatedLetter.getCategoryId() == null)
                 .forEach(generatedLetter -> generatedLetter.setCategoryId(
                     getGeneratedLetterCategoryId(getSelectedRoleCode(wrapper)))));

src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/documentcategory/CreateGeneralLetterDocumentCategoriserTest.java

@@ -0,0 +1,64 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcategory;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.GeneralLetter;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.GeneralLetterCollection;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.GeneralLetterWrapper;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.FeatureToggleService;
+
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class CreateGeneralLetterDocumentCategoriserTest {
+
+    @Mock
+    private FeatureToggleService featureToggleService;
+
+    @InjectMocks
+    private CreateGeneralLetterDocumentCategoriser underTest;
+
+    @BeforeEach
+    void setUp() {
+        when(featureToggleService.isCaseFileViewEnabled()).thenReturn(true);
+    }
+
+    @Test
+    void givenFeatureToggleIsOn_whenGeneratedLetterDeleted_thenCategoriseWithoutException() {
+        underTest.categorise(FinremCaseData.builder()
+            .generalLetterWrapper(GeneralLetterWrapper.builder()
+                .generalLetterCollection(List.of(
+                    GeneralLetterCollection.builder()
+                        .value(GeneralLetter.builder().generatedLetter(null).build())
+                        .build()
+                ))
+                .build())
+            .build());
+    }
+
+    @Test
+    void givenFeatureToggleIsOn_whenGeneratedLetterExists_thenCategoryIdAssigned() {
+        CaseDocument mockedCaseDocument = mock(CaseDocument.class);
+        underTest.categorise(FinremCaseData.builder()
+            .generalLetterWrapper(GeneralLetterWrapper.builder()
+                .generalLetterCollection(List.of(
+                    GeneralLetterCollection.builder()
+                        .value(GeneralLetter.builder().generatedLetter(mockedCaseDocument).build())
+                        .build()
+                ))
+                .build())
+            .build());
+        verify(mockedCaseDocument).setCategoryId(anyString());
+    }
+}