Merge branch 'main' into develop

Author: rmohammed-goaco

src/main/java/gov/cabinetoffice/gap/adminbackend/config/SubmissionAnonymisationConfigProperties.java

@@ -13,4 +13,6 @@ public class SubmissionAnonymisationConfigProperties {
 
     private int daysBeforeExpiry = 90;
 
+    private int batchSize = 500;
+
 }

src/main/java/gov/cabinetoffice/gap/adminbackend/repositories/SubmissionRepository.java

@@ -10,6 +10,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
+import org.springframework.data.domain.Pageable;
+
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -37,7 +39,16 @@ void updateLastRequiredChecksExportByGrantApplicationIdAndStatus(Instant lastReq
     void updateLastRequiredChecksExportBySchemeIdAndStatus(Instant lastRequiredChecksExport, Integer id,
             SubmissionStatus status);
 
-    List<Submission> findByStatusAndLastUpdatedBefore(SubmissionStatus status, LocalDateTime cutoff);
+    @Query(value = """
+            SELECT gs.* FROM grant_submission gs
+            JOIN grant_advert ga ON ga.scheme_id = gs.scheme_id
+            WHERE gs.status = :status
+              AND gs.last_updated < :cutoff
+              AND ga.closing_date < NOW()
+            LIMIT :#{#pageable.pageSize}
+            """, nativeQuery = true)
+    List<Submission> findByStatusAndLastUpdatedBeforeAndAdvertClosed(@Param("status") String status,
+            @Param("cutoff") LocalDateTime cutoff, Pageable pageable);
 
     @Transactional
     @Modifying

src/main/java/gov/cabinetoffice/gap/adminbackend/schedulers/SubmissionAnonymisationScheduler.java

@@ -9,6 +9,7 @@
 import lombok.extern.log4j.Log4j2;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -38,7 +39,8 @@ public void anonymiseInactiveSubmissions() {
                 cutoff);
 
         final List<Submission> dueForAnonymisation = submissionRepository
-                .findByStatusAndLastUpdatedBefore(SubmissionStatus.IN_PROGRESS, cutoff);
+                .findByStatusAndLastUpdatedBeforeAndAdvertClosed(SubmissionStatus.IN_PROGRESS.name(), cutoff,
+                        PageRequest.of(0, config.getBatchSize()));
 
         log.info("Found {} submission(s) to anonymise", dueForAnonymisation.size());
 

src/main/resources/application.properties

@@ -50,6 +50,7 @@ completion-statistics-scheduler.lock.atLeastFor=5m
 submission-anonymisation-scheduler.enabled=false
 submission-anonymisation-scheduler.cronExpression=0 0 3 * * ?
 submission-anonymisation-scheduler.daysBeforeExpiry=90
+submission-anonymisation-scheduler.batchSize=500
 submission-anonymisation-scheduler.lock.atMostFor=30m
 submission-anonymisation-scheduler.lock.atLeastFor=5m