Merge remote-tracking branch 'origin/master' into access-fix

Author: paddybasi

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/document/DocumentService.java

@@ -181,6 +181,9 @@ private List<DocumentEntity> createDocumentEntities(
     }
 
     public DocumentType mapAdditionalDocumentTypeToDocumentType(AdditionalDocumentType additionalType) {
+        if (additionalType == null) {
+            return null;
+        }
         return switch (additionalType) {
             case WITNESS_STATEMENT -> DocumentType.WITNESS_STATEMENT;
             case RENT_STATEMENT -> DocumentType.RENT_STATEMENT;

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/genapp/GenAppService.java

@@ -144,7 +144,9 @@ private List<DocumentEntity> createDocumentEntities(List<ListValue<UploadedDocum
                     .fileName(updatedFilename)
                     .binaryUrl(uploadedDocument.getDocument().getBinaryUrl())
                     .categoryId(CaseFileCategory.APPLICATIONS.getId())
-                    .type(documentService.mapAdditionalDocumentTypeToDocumentType(uploadedDocument.getDocumentType()))
+                    .type(uploadedDocument.getDocumentType() != null
+                        ? documentService.mapAdditionalDocumentTypeToDocumentType(uploadedDocument.getDocumentType())
+                        : null)
                     .contentType(uploadedDocument.getContentType())
                     .size(uploadedDocument.getSizeInBytes())
                     .build();

src/main/resources/db/migration/V121__drop_claim_id_in_case_note_table.sql

@@ -0,0 +1 @@
+ALTER TABLE case_note DROP COLUMN claim_id;

src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/document/DocumentServiceTest.java

@@ -804,6 +804,15 @@ void shouldMapAdditionalDocumentTypeToDocumentType(AdditionalDocumentType additi
         assertThat(actualDocumentType).isEqualTo(expectedDocumentType);
     }
 
+    @Test
+    void shouldReturnNullWhenAdditionalDocumentTypeIsNull() {
+        // When
+        DocumentType actualDocumentType = underTest.mapAdditionalDocumentTypeToDocumentType(null);
+
+        // Then
+        assertThat(actualDocumentType).isNull();
+    }
+
     private static Stream<Arguments> additionalDocumentCategoryScenarios() {
         return Stream.of(
             Arguments.of(

src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/genapp/GenAppServiceTest.java

@@ -387,6 +387,51 @@ void shouldSaveUploadedDocuments() {
         assertThat(documentEntity.getSize()).isEqualTo(1234L);
     }
 
+    @Test
+    void shouldSaveUploadedDocumentWithNullTypeWhenNoDocumentType() {
+        // Given
+        String originalFilename = "original filename";
+        String modifiedFilename = "modified filename";
+
+        Document document = Document.builder()
+            .filename(originalFilename)
+            .url("test url")
+            .binaryUrl("test binary url")
+            .build();
+
+        UUID applicantPartyId = UUID.randomUUID();
+        when(applicantParty.getId()).thenReturn(applicantPartyId);
+        when(documentNameService.appendGenAppPostfix(eq(originalFilename), isA(GenAppEntity.class),
+                                      eq(mainClaim), eq(applicantPartyId)))
+            .thenReturn(modifiedFilename);
+
+        UploadedDocument uploadedDocument = UploadedDocument.builder()
+            .document(document)
+            .contentType("test content type")
+            .sizeInBytes(1234L)
+            .build();
+
+        CitizenGenAppRequest genAppRequest = CitizenGenAppRequest.builder()
+            .sotAccepted(VerticalYesNo.YES)
+            .hasSupportingDocuments(VerticalYesNo.YES)
+            .uploadedDocuments(List.of(ListValue.<UploadedDocument>builder().value(uploadedDocument).build()))
+            .build();
+
+        when(documentRepository.saveAll(anyList())).thenReturn(List.of(mock(DocumentEntity.class)));
+
+        // When
+        Throwable throwable = catchThrowable(
+            () -> underTest.createGenAppEntity(genAppRequest, pcsCaseEntity, applicantParty)
+        );
+
+        // Then
+        assertThat(throwable).isNull();
+
+        verify(documentRepository).saveAll(documentEntityListCaptor.capture());
+        assertThat(documentEntityListCaptor.getValue()).hasSize(1);
+        assertThat(documentEntityListCaptor.getValue().getFirst().getType()).isNull();
+    }
+
     @Test
     void shouldNotSaveUploadedDocumentsIfSupportingDocumentsFlagIsNo() {
         // Given