GRAD2-2817

TVR Delete Process - Backend Changes Endpoints
bcgov · Aug 21, 2024 · 7f8269f · 7f8269f
1 parent 8f362e5
commit 7f8269f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java
@@ -486,15 +486,18 @@ public ResponseEntity<String> launchRegenerateSchoolReports(@RequestBody Student
     @PreAuthorize(PermissionsConstants.RUN_GRAD_ALGORITHM)
     @Operation(summary = "Re-Generate Student Reports for the given batchJobId", description = "Re-Generate Student Reports for the given batchJobId", tags = { "RE-RUN" })
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),@ApiResponse(responseCode = "500", description = "Internal Server Error")})
-    public ResponseEntity<String> launchRegenerateStudentReports(@RequestBody StudentSearchRequest searchRequest, @RequestParam String reportType) {
+    public ResponseEntity<BatchJobResponse> launchRegenerateStudentReports(@RequestBody StudentSearchRequest searchRequest, @RequestParam String reportType) {
         logger.info(" Re-Generating Student Reports by request for {} --------------------------------------------------------", reportType);
+        BatchJobResponse response = new BatchJobResponse();
         try {
             List<UUID> finalUUIDs = gradSchoolOfRecordFilter.filterStudents(searchRequest);
             logger.info(" Number of Students [{}] ---------------------------------------------------------", finalUUIDs.size());
             int numberOfReports = restUtils.processStudentReports(finalUUIDs, reportType);
-            return ResponseEntity.ok(numberOfReports + " student " + reportType + " reports successfully");
+            response.setMessage(numberOfReports + " student " + reportType + " reports successfully");
+            return ResponseEntity.ok(response);
         } catch (Exception e) {
-            return ResponseEntity.status(500).body(e.getLocalizedMessage());
+            response.setException(e.getLocalizedMessage());
+            return ResponseEntity.status(500).body(response);
         }
     }
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/BatchJobResponse.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/BatchJobResponse.java
@@ -18,4 +18,5 @@ public class BatchJobResponse {
     private String localDownload;
 
     private String exception;
+    private String message;
 }