From 9fc0c6c6ca3f1853dd5756375536eac9c23d8111 Mon Sep 17 00:00:00 2001 From: arybakov Date: Fri, 1 Mar 2024 12:48:25 -0700 Subject: [PATCH] GRAD2-2513 (GRAD) - Incident: XML Preview needs to show Last Updated Date instead of an Issue Date --- .../grad/report/service/impl/GradReportServiceImpl.java | 9 ++++----- .../service/impl/StudentTranscriptServiceImpl.java | 9 +-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java index 64904d86..a2b9dc13 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.Serializable; import java.net.URL; import java.text.SimpleDateFormat; import java.util.*; @@ -47,7 +46,7 @@ import static java.lang.Integer.parseInt; import static java.util.Locale.CANADA; -public abstract class GradReportServiceImpl implements Serializable { +public abstract class GradReportServiceImpl { private static final long serialVersionUID = 5L; @@ -67,9 +66,9 @@ public abstract class GradReportServiceImpl implements Serializable { @Autowired JsonTransformer jsonTransformer; @Autowired - transient WebClient webClient; + WebClient webClient; @Autowired - transient EducGradReportApiConstants constants; + EducGradReportApiConstants constants; @RolesAllowed({FULFILLMENT_SERVICES_USER}) public Parameters createParameters() { @@ -143,7 +142,7 @@ Certificate getCertificate(ReportData reportData) { InputStream openImageResource(final String resource) throws IOException { - //final URL url = getReportResource(resource); + /** final URL url = getReportResource(resource); **/ URL url = this.getClass().getResource(DIR_IMAGE_BASE + resource); assert url != null; return url.openStream(); diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java index 8add0ebf..0a5cd325 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java @@ -18,7 +18,6 @@ package ca.bc.gov.educ.grad.report.service.impl; import ca.bc.gov.educ.grad.report.api.client.ReportData; -import ca.bc.gov.educ.grad.report.dao.GradDataConvertionBean; import ca.bc.gov.educ.grad.report.dao.ProgramCertificateTranscriptRepository; import ca.bc.gov.educ.grad.report.dao.StudentTranscriptRepository; import ca.bc.gov.educ.grad.report.dto.impl.*; @@ -109,18 +108,12 @@ public class StudentTranscriptServiceImpl extends GradReportServiceImpl implemen */ private static final String SORT_ASSESSMENT = "100"; - private final ReportService reportService; - - private final GradDataConvertionBean gradDataConvertionBean; - private final ProgramCertificateTranscriptRepository programCertificateTranscriptRepository; private final StudentTranscriptRepository studentTranscriptRepository; @Autowired - public StudentTranscriptServiceImpl(ReportService reportService, GradDataConvertionBean gradDataConvertionBean, ProgramCertificateTranscriptRepository programCertificateTranscriptRepository, StudentTranscriptRepository studentTranscriptRepository) { - this.reportService = reportService; - this.gradDataConvertionBean = gradDataConvertionBean; + public StudentTranscriptServiceImpl(ProgramCertificateTranscriptRepository programCertificateTranscriptRepository, StudentTranscriptRepository studentTranscriptRepository) { this.programCertificateTranscriptRepository = programCertificateTranscriptRepository; this.studentTranscriptRepository = studentTranscriptRepository; }