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

Jump to bottom

Develop/alex grad2 2580 #261

Merged
merged 4 commits into from
May 3, 2024
Merged

Develop/alex grad2 2580 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c92a43
GRAD2-2580
arybakov-cgi May 1, 2024
cb0caf3
GRAD2-2580
arybakov-cgi May 1, 2024
37bb9f0
GRAD2-2580
arybakov-cgi May 1, 2024
917c185
GRAD2-2580
arybakov-cgi May 2, 2024
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
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/grad/report/model/dto/StudentSearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ public class StudentSearchRequest implements Serializable {
LocalDate gradDateTo;

Boolean validateInput;
String activityCode;

}
7 changes: 5 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@ public boolean updateStudentCredentialPosting(UUID studentID, String credentialT

public List<StudentCredentialDistribution> getStudentCredentialsForUserRequestDisRun(String credentialType, StudentSearchRequest studentSearchRequest, boolean onlyWithNullDistributionDate, String accessToken) {
List<StudentCredentialDistribution> scdList = new ArrayList<>();
if(StringUtils.isBlank(studentSearchRequest.getActivityCode())) {
studentSearchRequest.setActivityCode("USERDIST");
}
List<UUID> studentIDs = studentSearchRequest.getStudentIDs();
if(studentIDs == null || studentIDs.isEmpty()) {
studentIDs = getStudentsForSpecialGradRun(studentSearchRequest, accessToken);
Expand Down Expand Up @@ -535,8 +538,8 @@ private void processCertificate(List<List<UUID>> partitions, StudentSearchReques
gradStudentCertificatesRepository.findRecordsForUserRequestByStudentIdOnly(subList);
} else {
scdSubList = onlyWithNullDistributionDate?
gradStudentTranscriptsRepository.findRecordsWithNullDistributionDateForUserRequest(subList)
: gradStudentTranscriptsRepository.findRecordsForUserRequest(subList);
gradStudentCertificatesRepository.findRecordsWithNullDistributionDateForUserRequest(subList)
infstar marked this conversation as resolved.
Show resolved Hide resolved
: gradStudentCertificatesRepository.findRecordsForUserRequest(subList);
}
if (!scdSubList.isEmpty()) {
scdList.addAll(scdSubList);
Expand Down
2 changes: 2 additions & 0 deletions api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,8 @@ public void testGetStudentCredentialsForUserRequestDisRun_OC_SearchRequest() {
List<StudentCredentialDistribution> result = commonService.getStudentCredentialsForUserRequestDisRun("OC",searchRequest,true,"accessToken");
assertThat(result).isNotEmpty();

searchRequest.setActivityCode("USERDIST");

result = commonService.getStudentCredentialsForUserRequestDisRun("OT",searchRequest,false,"accessToken");
assertThat(result).isNotEmpty();

Expand Down
Loading