Merge pull request #493 from bcgov/develop/alex-GRAD2-2339-2

GRAD2-2339-2
bcgov · Nov 7, 2023 · ed4934a · ed4934a
2 parents 4f6ddc8 + bb79ed5
commit ed4934a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/graduation/model/report/GraduationStatus.java b/api/src/main/java/ca/bc/gov/educ/api/graduation/model/report/GraduationStatus.java
@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
@@ -94,7 +95,9 @@ public String getCertificates() {
     }
 
     public void setCertificates(String certificates) {
-        this.certificates = certificates;
+        String nextSeparator = StringUtils.isNotBlank(this.certificates) ? "," : "";
+        String nextCertificate = StringUtils.isNotBlank(certificates) ? nextSeparator + certificates : "";
+        this.certificates = StringUtils.defaultIfBlank(this.certificates, "") + nextCertificate;
     }
 
     public String getGraduationMessage() {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/graduation/service/SchoolReportsService.java b/api/src/main/java/ca/bc/gov/educ/api/graduation/service/SchoolReportsService.java
@@ -572,6 +572,7 @@ private Student populateStudentObjectByReportGradStudentData(ReportGradStudentDa
         gradStatus.setProgramCompletionDate(reportGradStudentData.getProgramCompletionDate());
         gradStatus.setSchoolAtGrad(reportGradStudentData.getMincode());
         gradStatus.setProgramName(reportGradStudentData.getProgramCode());
+        gradStatus.setCertificates(reportGradStudentData.getCertificateTypeCode());
         student.setGraduationStatus(gradStatus);
 
         ca.bc.gov.educ.api.graduation.model.report.GraduationData gradData = new ca.bc.gov.educ.api.graduation.model.report.GraduationData();