diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml index 0a24f2df..43eb21c8 100644 --- a/.github/workflows/on.pr.yml +++ b/.github/workflows/on.pr.yml @@ -25,7 +25,7 @@ jobs: with: distribution: 'corretto' java-version: 18 - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-5Jun-${{ hashFiles('**/pom.xml') }} @@ -47,7 +47,7 @@ jobs: with: sarif_file: 'trivy-results.sarif' - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/DistributionResponse.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/DistributionResponse.java index eb8c5d31..72142516 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/DistributionResponse.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/DistributionResponse.java @@ -1,5 +1,6 @@ package ca.bc.gov.educ.api.batchgraduation.model; +import ca.bc.gov.educ.api.batchgraduation.model.institute.District; import lombok.Data; import java.util.ArrayList; @@ -19,7 +20,7 @@ public class DistributionResponse { private String localDownload; private String activityCode; private List schools = new ArrayList<>(); - private List districts = new ArrayList<>(); + private List districts = new ArrayList<>(); private StudentSearchRequest studentSearchRequest; private List districtSchools = new ArrayList<>(); diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java index 7999328d..5217b934 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java @@ -135,6 +135,7 @@ private StudentCredentialDistribution populateStudentCredentialDistribution(Repo //<-- dist.setSchoolAtGradId(data.getSchoolAtGradId()); dist.setSchoolOfRecordOriginId(data.getSchoolOfRecordId()); + dist.setDistrictId(data.getDistrictId()); dist.setDocumentStatusCode("COMPL"); dist.setPen(data.getPen()); dist.setLegalFirstName(data.getFirstName());