Merge pull request #1325 from ORCID/handleUnexpectedErrorForProcessingCsvReports

tweaked error handling to catch any exception processing csv reports

Author: DanielPalafox

assertion-service/src/main/java/org/orcid/memberportal/service/assertion/services/CsvReportService.java

@@ -50,13 +50,13 @@ public class CsvReportService {
 
     @Autowired
     private StoredFileService storedFileService;
-    
+
     @Autowired
     private MailService mailService;
-    
+
     @Autowired
     private MessageSource messageSource;
-    
+
     public void storeCsvReportRequest(String userId, String filename, String type) {
         Instant now = Instant.now();
         CsvReport csvReport = new CsvReport();
@@ -67,14 +67,14 @@ public void storeCsvReportRequest(String userId, String filename, String type) {
         csvReport.setOriginalFilename(filename);
         csvReportRepository.save(csvReport);
     }
-    
+
     public void processCsvReports() {
         LOG.info("Processing pending CSV reports");
         List<CsvReport> reports = csvReportRepository.findAllUnprocessed();
         reports.forEach(r -> {
             try {
                 processCsvReportRequest(r);
-            } catch (IOException e) {
+            } catch (Exception e) {
                 LOG.warn("Failed to generate CSV report of type {} for user {}", r.getReportType(), r.getOwnerId(), e);
                 StringWriter sw = new StringWriter();
                 PrintWriter pw = new PrintWriter(sw);
@@ -91,7 +91,7 @@ private void processCsvReportRequest(CsvReport csvReport) throws IOException {
         AssertionServiceUser user = userService.getUserById(csvReport.getOwnerId());
         String salesforceId = user.getSalesforceId();
         Locale locale = LocaleUtils.getLocale(user.getLangKey());
-        
+
         String subject = null;
         String content = null;
         String report = null;
@@ -120,7 +120,7 @@ private void processCsvReportRequest(CsvReport csvReport) throws IOException {
         File reportFile = new File(storedFile.getFileLocation());
         mailService.sendCsvReportMail(reportFile, user, subject, content);
         LOG.info("Report sent to {}", user.getEmail());
-        
+
         storedFileService.markAsProcessed(storedFile);
     }
 

assertion-service/src/test/java/org/orcid/memberportal/service/assertion/services/CsvReportServiceTest.java

@@ -48,7 +48,7 @@ class CsvReportServiceTest {
 
     @Mock
     private MailService mailService;
-    
+
     @Mock
     private MessageSource messageSource;
 
@@ -91,7 +91,7 @@ void testProcessCsvReports() throws IOException {
         Mockito.verify(mailService).sendCsvReportMail(Mockito.any(File.class), Mockito.any(AssertionServiceUser.class), Mockito.eq("report subject"), Mockito.eq("report content"));
         Mockito.verify(storedFileService, Mockito.times(3)).markAsProcessed(Mockito.any(StoredFile.class));
     }
-    
+
     @Test
     void testProcessCsvReportsWithError() throws IOException {
         Mockito.when(csvReportRepository.findAllUnprocessed()).thenReturn(Arrays.asList(getCsvReport(CsvReport.PERMISSION_LINKS_TYPE)));
@@ -104,13 +104,32 @@ void testProcessCsvReportsWithError() throws IOException {
         Mockito.verify(mailService, Mockito.never()).sendCsvReportMail(Mockito.any(File.class), Mockito.any(AssertionServiceUser.class), Mockito.eq("links subject"), Mockito.eq("links content"));
         Mockito.verify(storedFileService, Mockito.never()).markAsProcessed(Mockito.any(StoredFile.class));
         Mockito.verify(csvReportRepository).save(csvReportCaptor.capture());
-        
+
         CsvReport updated = csvReportCaptor.getValue();
         assertThat(updated.getError()).isNotNull();
         assertThat(updated.getError()).contains("IOException");
         assertThat(updated.getError()).contains("some error");
     }
 
+    @Test
+    void testProcessCsvReportsWithUnexpectedError() throws IOException {
+        Mockito.when(csvReportRepository.findAllUnprocessed()).thenReturn(Arrays.asList(getCsvReport(CsvReport.PERMISSION_LINKS_TYPE)));
+        Mockito.when(userService.getUserById(Mockito.eq("user"))).thenReturn(getDummyUser());
+        Mockito.when(permissionLinksCsvWriter.writeCsv(Mockito.eq("salesforce"))).thenThrow(new IllegalArgumentException("some error"));
+
+        csvReportService.processCsvReports();
+
+        Mockito.verify(permissionLinksCsvWriter).writeCsv(Mockito.eq("salesforce"));
+        Mockito.verify(mailService, Mockito.never()).sendCsvReportMail(Mockito.any(File.class), Mockito.any(AssertionServiceUser.class), Mockito.eq("links subject"), Mockito.eq("links content"));
+        Mockito.verify(storedFileService, Mockito.never()).markAsProcessed(Mockito.any(StoredFile.class));
+        Mockito.verify(csvReportRepository).save(csvReportCaptor.capture());
+
+        CsvReport updated = csvReportCaptor.getValue();
+        assertThat(updated.getError()).isNotNull();
+        assertThat(updated.getError()).contains("IllegalArgumentException");
+        assertThat(updated.getError()).contains("some error");
+    }
+
     @Test
     void testStoreCsvReportRequest() {
         Mockito.when(csvReportRepository.save(Mockito.any(CsvReport.class))).thenReturn(new CsvReport());