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

DMP-4737: Improve automated task - ApplyRetentionCaseAssociatedObjects #2645

Merged
merged 4 commits into from
Feb 28, 2025
Merged

DMP-4737: Improve automated task - ApplyRetentionCaseAssociatedObjects #2645

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
f687c7a
Updated ApplyRetentionCaseAssociatedObjects to only fetch objects whe…
Ben-Edwards-cgi Feb 26, 2025
f83c243
Fixed styles
Ben-Edwards-cgi Feb 26, 2025
54db0cc
Merge branch 'master' into DMP-4737
Ben-Edwards-cgi Feb 27, 2025
87f407b
Merge branch 'master' into DMP-4737
Ben-Edwards-cgi Feb 28, 2025
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
4 changes: 2 additions & 2 deletions src/integrationTest/java/uk/gov/hmcts/darts/cases/repository/CaseRepositoryIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ void findByIsRetentionUpdatedTrueAndRetentionRetriesLessThan_ReturnsResults() {


// when
var result = caseRepository.findByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(3, Limit.of(1000));
var result = caseRepository.findIdsByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(3, Limit.of(1000));

// then
assertThat(result).hasSize(1);
assertThat(result.getFirst().getId()).isEqualTo(matchingCase.getId());
assertThat(result.getFirst()).isEqualTo(matchingCase.getId());
}


Expand Down
9 changes: 8 additions & 1 deletion src/main/java/uk/gov/hmcts/darts/common/repository/CaseRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ AND NOT EXISTS (select 1 from CaseRetentionEntity cre
""")
List<Integer> findOpenCasesToClose(OffsetDateTime cutoffDate, Limit limit);

List<CourtCaseEntity> findByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(int maxRetentionRetries, Limit limit);
@Query("""
SELECT cc.id
FROM CourtCaseEntity cc
WHERE cc.isRetentionUpdated = true
AND cc.retentionRetries < :maxRetentionRetries
ORDER BY cc.id ASC
""")
List<Integer> findIdsByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(int maxRetentionRetries, Limit limit);

@Query("""
SELECT courtCase.id
Expand Down
15 changes: 11 additions & 4 deletions .../hmcts/darts/retention/service/impl/ApplyRetentionCaseAssociatedObjectsProcessorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import uk.gov.hmcts.darts.retention.service.ApplyRetentionCaseAssociatedObjectsProcessor;

import java.util.List;
import java.util.Optional;

@Service
@RequiredArgsConstructor
Expand All @@ -27,9 +28,15 @@ public class ApplyRetentionCaseAssociatedObjectsProcessorImpl implements ApplyRe
@Override
public void processApplyRetentionToCaseAssociatedObjects(Integer batchSize) {

var cases = findCasesNeedingRetentionAppliedToAssociatedObjects(batchSize);
var casesIds = findCasesNeedingRetentionAppliedToAssociatedObjects(batchSize);

for (var courtCase : cases) {
for (var courtCaseId : casesIds) {
Optional<CourtCaseEntity> courtCaseOpt = caseRepository.findById(courtCaseId);
if (courtCaseOpt.isEmpty()) {
log.error("Case with id '{}' not found", courtCaseId);
continue;
}
CourtCaseEntity courtCase = courtCaseOpt.get();
courtCase.setRetentionUpdated(false);
courtCase.setLastModifiedBy(userIdentity.getUserAccount());
caseRepository.save(courtCase);
Expand All @@ -45,8 +52,8 @@ public void processApplyRetentionToCaseAssociatedObjects(Integer batchSize) {
}
}

private List<CourtCaseEntity> findCasesNeedingRetentionAppliedToAssociatedObjects(Integer batchSize) {
return caseRepository.findByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(maxRetentionRetries, Limit.of(batchSize));
private List<Integer> findCasesNeedingRetentionAppliedToAssociatedObjects(Integer batchSize) {
return caseRepository.findIdsByIsRetentionUpdatedTrueAndRetentionRetriesLessThan(maxRetentionRetries, Limit.of(batchSize));
}

}
Expand Down