diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/ReportData.java b/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/ReportData.java index cc859972..deed7683 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/ReportData.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/ReportData.java @@ -5,6 +5,7 @@ import ca.bc.gov.educ.grad.report.api.client.utils.NonGradReasonListDeserializer; import ca.bc.gov.educ.grad.report.api.client.utils.OptionalProgramListDeserializer; import ca.bc.gov.educ.grad.report.api.util.ReportApiConstants; +import ca.bc.gov.educ.grad.report.dto.impl.DistrictImpl; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -23,6 +24,7 @@ @XmlSeeAlso({ Student.class, School.class, + DistrictImpl.class, Transcript.class, GradProgram.class, NonGradReason.class, @@ -31,6 +33,7 @@ @JsonSubTypes({ @JsonSubTypes.Type(value = Student.class), @JsonSubTypes.Type(value = School.class), + @JsonSubTypes.Type(value = DistrictImpl.class), @JsonSubTypes.Type(value = Transcript.class), @JsonSubTypes.Type(value = GradProgram.class), @JsonSubTypes.Type(value = NonGradReason.class), @@ -48,6 +51,8 @@ public class ReportData implements Serializable { private Student student = new Student(); @JsonDeserialize(as = School.class) private School school = new School(); + @JsonDeserialize(as = DistrictImpl.class) + private DistrictImpl district = new DistrictImpl(); @JsonDeserialize(as = Transcript.class) private Transcript transcript = new Transcript(); @JsonDeserialize(as = Assessment.class) @@ -108,6 +113,14 @@ public void setSchool(School school) { this.school = school; } + public DistrictImpl getDistrict() { + return district; + } + + public void setDistrict(DistrictImpl district) { + this.district = district; + } + public List getSchools() { return schools; } diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java index 8f4ca9b7..6666b9b7 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java @@ -73,7 +73,7 @@ GraduationReport getGraduationReport(String methodName, List excludeProg "Confirmed the district data exists and continue."); // validate incoming data for reporting - final District district = getSchool(reportData); + final District district = reportData.getDistrict(); if (district != null) { parameters.put("district", district);