Merge pull request #117 from bcgov/develop/alex-GRAD2-2249-2

Develop/alex grad2 2249 2
bcgov · Nov 18, 2023 · 4bec591 · 4bec591
2 parents 8f2e052 + 4691f8d
commit 4bec591
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradbusiness/controller/GradBusinessController.java b/api/src/main/java/ca/bc/gov/educ/api/gradbusiness/controller/GradBusinessController.java
@@ -140,8 +140,8 @@ public ResponseEntity<byte[]> studentCredentialByType(@PathVariable String pen,
     @PreAuthorize("hasAuthority('SCOPE_GET_GRADUATION_DATA')")
     @Operation(summary = "Get Transcript Report pdf by PEN and optional xml type parameter", description = "Get Transcript Report pdf by PEN and optional xml type parameter", tags = { "Graduation Data" })
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
-    public ResponseEntity<byte[]> studentTranscriptByType(@PathVariable String pen, @RequestParam(required = false) String type, @RequestHeader(name="Authorization") String accessToken) {
-        return gradBusinessService.getStudentTranscriptPDFByType(pen, type, accessToken.replace(BEARER, ""));
+    public ResponseEntity<byte[]> studentTranscriptByType(@PathVariable String pen, @RequestParam(required = false) String type, @RequestParam(required = false) String interim, @RequestHeader(name="Authorization") String accessToken) {
+        return gradBusinessService.getStudentTranscriptPDFByType(pen, type, interim, accessToken.replace(BEARER, ""));
     }
 
     @GetMapping(EducGraduationApiConstants.AMALGAMATED_SCHOOL_REPORT_PDF)

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradbusiness/service/GradBusinessService.java b/api/src/main/java/ca/bc/gov/educ/api/gradbusiness/service/GradBusinessService.java
@@ -6,7 +6,7 @@
 import ca.bc.gov.educ.api.gradbusiness.util.EducGraduationApiConstants;
 import io.github.resilience4j.retry.annotation.Retry;
 import jakarta.transaction.Transactional;
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -286,13 +286,16 @@ public ResponseEntity<byte[]> getStudentCredentialPDFByType(String pen, String t
 
 
     @Transactional
-    public ResponseEntity<byte[]> getStudentTranscriptPDFByType(String pen, String type, String accessToken) {
+    public ResponseEntity<byte[]> getStudentTranscriptPDFByType(String pen, String type, String interim, String accessToken) {
         try {
             byte[] reportData = prepareReportDataByPen(pen, type, accessToken).getBody();
+            boolean isPreview = (StringUtils.isNotBlank(type) && StringUtils.equalsAnyIgnoreCase(type, "xml", "interim") ||
+                    StringUtils.isNotBlank(interim) && StringUtils.equalsAnyIgnoreCase(interim, "xml", "interim"));
             StringBuilder reportRequest = new StringBuilder();
             String reportOptions = "\"options\": {\n" +
                     "        \"cacheReport\": false,\n" +
                     "        \"convertTo\": \"pdf\",\n" +
+                    "        \"preview\": \""+ (isPreview ? "true" : "false") +"\",\n" +
                     "        \"overwrite\": false,\n" +
                     "        \"reportName\": \"transcript\",\n" +
                     "        \"reportFile\": \""+pen+" Transcript Report.pdf\"\n" +

diff --git a/api/src/test/java/ca/bc/gov/educ/api/gradbusiness/EducGradBusinessApiApplicationTests.java b/api/src/test/java/ca/bc/gov/educ/api/gradbusiness/EducGradBusinessApiApplicationTests.java
@@ -460,7 +460,7 @@ void testStudentTranscriptPDFByTypeByPen() throws Exception {
 		when(this.requestHeadersMock.retrieve()).thenReturn(this.responseMock);
 		when(this.responseMock.bodyToMono(byte[].class)).thenReturn(Mono.just(transcriptPdfSample));
 
-		ResponseEntity<byte[]> transcriptPdf = gradBusinessService.getStudentTranscriptPDFByType(pen, "xml", "accessToken");
+		ResponseEntity<byte[]> transcriptPdf = gradBusinessService.getStudentTranscriptPDFByType(pen, "xml", null,"accessToken");
 		assertNotNull(transcriptPdf.getBody());
 		assertEquals(transcriptPdfSample,transcriptPdf.getBody());
 	}

diff --git a/api/src/test/java/ca/bc/gov/educ/api/gradbusiness/EducGradBusinessApiControllerTests.java b/api/src/test/java/ca/bc/gov/educ/api/gradbusiness/EducGradBusinessApiControllerTests.java
@@ -234,9 +234,9 @@ void testStudentTranscriptPDFByType() throws Exception {
 				.contentType(MediaType.APPLICATION_XML)
 				.body(greBPack);
 
-		Mockito.when(gradBusinessService.getStudentTranscriptPDFByType("12312321","xml", "accessToken")).thenReturn(response);
-		gradBusinessController.studentTranscriptByType("12312321", "xml","accessToken");
-		Mockito.verify(gradBusinessService).getStudentTranscriptPDFByType("12312321","xml", "accessToken");
+		Mockito.when(gradBusinessService.getStudentTranscriptPDFByType("12312321","xml", null,"accessToken")).thenReturn(response);
+		gradBusinessController.studentTranscriptByType("12312321", "xml", null, "accessToken");
+		Mockito.verify(gradBusinessService).getStudentTranscriptPDFByType("12312321","xml",  null,"accessToken");
 
 	}