Enhance tests for submissionName handling in CustomGrantExportMapperImplTest and GrantExportServiceTest. Add assertions to verify mapping of submissionName and handle null cases.

Author: rmohammed-goaco

src/test/java/gov/cabinetoffice/gap/adminbackend/mappers/CustomGrantExportMapperImplTest.java

@@ -53,7 +53,8 @@ class CustomGrantExportMapperImplTest {
         .zipFileLocation("location")
         .status(GrantExportStatus.COMPLETE)
         .name("Some company name")
-            .submittedDate(FIXED_DATE_TIME)
+        .submittedDate(FIXED_DATE_TIME)
+        .submissionName("My Application Name")
         .build();
     final SubmissionQuestion ORG_NAME_SUBMISSION_QUESTION = SubmissionQuestion.builder()
         .questionId("APPLICANT_ORG_NAME")
@@ -81,7 +82,8 @@ class CustomGrantExportMapperImplTest {
         .status(SubmissionStatus.SUBMITTED)
         .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID().toString()).build())
         .definition(submissionDefinition)
-            .submittedDate(FIXED_DATE_TIME)
+        .submittedDate(FIXED_DATE_TIME)
+        .submissionName("My Application Name")
         .build();
 
     @Mock
@@ -122,6 +124,34 @@ void grantExportEntityToExportedSubmissions_hasNoSubmission() {
 
         exportedSubmissionsDto.setName(submissionId.toString());
         exportedSubmissionsDto.setSubmittedDate(null);
+        exportedSubmissionsDto.setSubmissionName(null);
         assertEquals(exportedSubmissionsDto, exportedSubmissions);
     }
+
+    @Test
+    void grantExportEntityToExportedSubmissions_mapsSubmissionName() {
+        when(submissionRepository.findById(submissionId)).thenReturn(Optional.of(submission));
+
+        final ExportedSubmissionsDto exportedSubmissions = customGrantExportMapper.grantExportEntityToExportedSubmissions(grantExport);
+
+        assertEquals("My Application Name", exportedSubmissions.getSubmissionName());
+    }
+
+    @Test
+    void grantExportEntityToExportedSubmissions_handlesNullSubmissionName() {
+        final Submission submissionWithoutName = Submission.builder()
+            .id(submissionId)
+            .scheme(scheme)
+            .status(SubmissionStatus.SUBMITTED)
+            .createdBy(GrantApplicant.builder().id(1).userId(UUID.randomUUID().toString()).build())
+            .definition(submissionDefinition)
+            .submittedDate(FIXED_DATE_TIME)
+            .submissionName(null)
+            .build();
+        when(submissionRepository.findById(submissionId)).thenReturn(Optional.of(submissionWithoutName));
+
+        final ExportedSubmissionsDto exportedSubmissions = customGrantExportMapper.grantExportEntityToExportedSubmissions(grantExport);
+
+        assertEquals(null, exportedSubmissions.getSubmissionName());
+    }
 }

src/test/java/gov/cabinetoffice/gap/adminbackend/services/GrantExportServiceTest.java

@@ -216,13 +216,15 @@ void generateExportedSubmissionsListDto() {
                 .status(GrantExportStatus.COMPLETE)
                 .name("name2")
                 .submittedDate(date)
+                .submissionName("Application Name 2")
                 .build();
             final ExportedSubmissionsDto exportedSubmissionsDto2 = ExportedSubmissionsDto.builder()
                 .submissionId(submissionId2)
                 .zipFileLocation("location2")
                 .status(GrantExportStatus.COMPLETE)
                 .name("name1")
                 .submittedDate(oldDate)
+                .submissionName("Application Name 1")
                 .build();
 
             when(exportRepository.findByCreatedByAndId_ExportBatchIdAndStatus(SEC_CONTEXT_ADMIN_ID,mockExportId, GrantExportStatus.COMPLETE, pagination))