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

Merging changes from hotfix 1.23.3 #687

Merged
merged 8 commits into from
Sep 23, 2024
Merged

Merging changes from hotfix 1.23.3 #687

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbc46b5
Merge pull request #667 from bcgov/grad-release
githubmamatha Jul 9, 2024
0a9c0cd
Update update-configmap.sh
cditcher Aug 23, 2024
1839042
Merge pull request #682 from bcgov/grad-release
githubmamatha Sep 12, 2024
56503b0
Update pom.xml
githubmamatha Sep 16, 2024
11cb5c4
Merge pull request #684 from bcgov/grad-release
githubmamatha Sep 16, 2024
26474b4
GRAD2-2971
arybakov-cgi Sep 20, 2024
55593d4
Merge pull request #685 from bcgov/hotfix/alex-GRAD2-2971
infstar Sep 20, 2024
464776c
Merge pull request #686 from bcgov/grad-release
githubmamatha Sep 23, 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
23 changes: 15 additions & 8 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/HistoryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.reactive.function.client.WebClient;

import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.*;

@Service
public class HistoryService {
Expand Down Expand Up @@ -164,11 +161,21 @@ public Page<GraduationStudentRecordHistoryEntity> getStudentHistoryByBatchID(Lon

@Transactional
public Integer updateStudentRecordHistoryDistributionRun(Long batchId, String updateUser, String activityCode, List<UUID> studentGuids) {
Integer historyRecordsCreated;
Integer historyRecordsCreated = 0;
if(studentGuids != null && !studentGuids.isEmpty()) {
Integer studentRecordsCreated = graduationStatusRepository.updateGraduationStudentRecordEntitiesBatchIdWhereStudentIDsIn(batchId, studentGuids);
historyRecordsCreated = graduationStudentRecordHistoryRepository.insertGraduationStudentRecordHistoryByBatchIdAndStudentIDs(batchId, studentGuids, activityCode, updateUser);
assert Objects.equals(studentRecordsCreated, historyRecordsCreated);
int partitionSize = 999;
List<List<UUID>> partitions = new LinkedList<>();
for (int i = 0; i < studentGuids.size(); i += partitionSize) {
partitions.add(studentGuids.subList(i, Math.min(i + partitionSize, studentGuids.size())));
}
logger.debug("Update Student Record History partitions length {}", partitions.size());
for (int i = 0; i < partitions.size(); i++) {
List<UUID> subList = partitions.get(i);
Integer studentRecordsCreatedPartition = graduationStatusRepository.updateGraduationStudentRecordEntitiesBatchIdWhereStudentIDsIn(batchId, subList);
Integer historyRecordsCreatedPartition = graduationStudentRecordHistoryRepository.insertGraduationStudentRecordHistoryByBatchIdAndStudentIDs(batchId, subList, activityCode, updateUser);
assert Objects.equals(studentRecordsCreatedPartition, historyRecordsCreatedPartition);
historyRecordsCreated += historyRecordsCreatedPartition;
}
} else if(StringUtils.equalsIgnoreCase(activityCode, "USERSTUDARC")) {
historyRecordsCreated = graduationStudentRecordHistoryRepository.insertGraduationStudentRecordHistoryByBatchId(batchId, activityCode, updateUser);
} else if(StringUtils.isBlank(activityCode) || StringUtils.equalsIgnoreCase(activityCode, "null")) {
Expand Down
Loading