Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GRAD2-2525: expiryDate is added in GradProgram DTO to determine it is… #513

Merged
merged 1 commit into from
Mar 8, 2024
Merged

GRAD2-2525: expiryDate is added in GradProgram DTO to determine it is… #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/graduation/model/report/GradProgram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,22 @@ public class GradProgram implements Serializable {

private Code code;

private String expiryDate = "";

public Code getCode() {
return code;
}

public void setCode(Code value) {
this.code = value;
}

public String getExpiryDate() {
return expiryDate;
}

public void setExpiryDate(String value) {
this.expiryDate = value;
}

}
5 changes: 3 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,14 +723,15 @@ private GradProgram getGradProgram(ca.bc.gov.educ.api.graduation.model.dto.Gradu
GradProgram gPgm = new GradProgram();
Code code = new Code();
if (graduationDataStatus.getGradStatus().getProgram() != null) {
ca.bc.gov.educ.api.graduation.model.dto.GradProgram gradProgram = webClient.get().uri(String.format(educGraduationApiConstants.getProgramNameEndpoint(), graduationDataStatus.getGradStatus().getProgram()))
GraduationProgramCode gradProgram = webClient.get().uri(String.format(educGraduationApiConstants.getProgramNameEndpoint(), graduationDataStatus.getGradStatus().getProgram()))
.headers(h -> {
h.setBearerAuth(accessToken);
h.set(EducGraduationApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID());
}).retrieve().bodyToMono(ca.bc.gov.educ.api.graduation.model.dto.GradProgram.class).block();
}).retrieve().bodyToMono(GraduationProgramCode.class).block();
if (gradProgram != null) {
code.setDescription(gradProgram.getProgramName());
code.setName(gradProgram.getProgramName());
gPgm.setExpiryDate(EducGraduationApiUtils.formatDate(gradProgram.getExpiryDate()));
}
}
code.setCode(graduationDataStatus.getGradStatus().getProgram());
Expand Down
Loading
Loading