feat: enhance compliance control evaluation with pagination support

Author: elmilan06

backend/src/main/java/com/park/utmstack/repository/compliance/UtmComplianceControlConfigRepository.java

@@ -1,6 +1,8 @@
 package com.park.utmstack.repository.compliance;
 
 import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -22,11 +24,21 @@ public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmC
     Optional<UtmComplianceControlConfig> findByIdWithQueries(@Param("id") Long id);
 
     @Query("""
-    SELECT DISTINCT c FROM UtmComplianceControlConfig c
+    SELECT DISTINCT c
+    FROM UtmComplianceControlConfig c
     LEFT JOIN FETCH c.section s
     LEFT JOIN FETCH c.queriesConfigs q
-    WHERE c.standardSectionId = :sectionId
+    WHERE c.id IN :ids
     """)
-    List<UtmComplianceControlConfig> findBySectionIdWithQueries(@Param("sectionId") Long sectionId);
+    List<UtmComplianceControlConfig> findWithQueriesByIdIn(
+            @Param("ids") List<Long> ids);
 
+    @Query("""
+    SELECT c.id
+    FROM UtmComplianceControlConfig c
+    WHERE c.standardSectionId = :sectionId
+    """)
+    Page<Long> findIdsBySectionId(
+            @Param("sectionId") Long sectionId,
+            Pageable pageable);
 }

backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlConfigService.java

@@ -8,6 +8,9 @@
 import com.park.utmstack.service.mapper.compliance.UtmComplianceControlConfigMapper;
 import com.park.utmstack.service.mapper.compliance.UtmComplianceQueryConfigMapper;
 import com.park.utmstack.web.rest.errors.BadRequestAlertException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -115,11 +118,22 @@ private void validateControlConfig(UtmComplianceControlConfigDto dto) {
         }
     }
 
-    public List<UtmComplianceControlConfigDto> getControlsBySection(Long sectionId) {
-        var entities = repository.findBySectionIdWithQueries(sectionId);
-        return entities.stream()
-                .map(mapper::toDto)
-                .collect(Collectors.toList());
+    public Page<UtmComplianceControlConfig> findBySection(Long sectionId, Pageable pageable) {
+
+        Page<Long> pageIds = repository.findIdsBySectionId(sectionId, pageable);
+
+        if (pageIds.isEmpty()) {
+            return Page.empty(pageable);
+        }
+
+        List<UtmComplianceControlConfig> content =
+                repository.findWithQueriesByIdIn(pageIds.getContent());
+
+        return new PageImpl<>(
+                content,
+                pageable,
+                pageIds.getTotalElements()
+        );
     }
 
 }

backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlEvaluationLatestService.java

@@ -1,35 +1,40 @@
 package com.park.utmstack.service.compliance.config;
 
+import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigDto;
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlLatestEvaluationDto;
 import com.park.utmstack.service.elasticsearch.ElasticsearchService;
+import com.park.utmstack.service.mapper.compliance.UtmComplianceControlConfigMapper;
 import com.park.utmstack.service.mapper.compliance.UtmComplianceControlLatestEvaluationMapper;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class UtmComplianceControlEvaluationLatestService {
 
     private final UtmComplianceControlConfigService configService;
     private final ElasticsearchService elasticsearchService;
+    private final UtmComplianceControlConfigMapper controlMapper;
 
     public UtmComplianceControlEvaluationLatestService(UtmComplianceControlConfigService configService,
-                                                       ElasticsearchService elasticsearchService) {
+                                                       ElasticsearchService elasticsearchService,
+                                                       UtmComplianceControlConfigMapper controlMapper) {
         this.configService = configService;
         this.elasticsearchService = elasticsearchService;
+        this.controlMapper = controlMapper;
     }
 
-     public List<UtmComplianceControlLatestEvaluationDto> getControlsWithLastEvaluation(Long sectionId) {
+    public Page<UtmComplianceControlLatestEvaluationDto> getControlsWithLastEvaluation(
+            Long sectionId, Pageable pageable) {
 
-            List<UtmComplianceControlConfigDto> controls = configService.getControlsBySection(sectionId);
+        Page<UtmComplianceControlConfig> controls = configService.findBySection(sectionId, pageable);
 
-            return controls.stream()
-                    .map(control -> {
-                        var lastEval = this.elasticsearchService.getLatestControlEvaluation(control.getId());
-                        return UtmComplianceControlLatestEvaluationMapper.toDto(control, lastEval);
-                    })
-                    .toList();
+        return controls.map(control -> {
+            UtmComplianceControlConfigDto controlDto = controlMapper.toDto(control);
+            var lastEval = elasticsearchService.getLatestControlEvaluation(control.getId());
+            return UtmComplianceControlLatestEvaluationMapper.toDto(controlDto, lastEval);
+        });
     }
 }
 

backend/src/main/java/com/park/utmstack/web/rest/compliance/config/UtmComplianceControlLatestEvaluationResource.java

@@ -2,6 +2,9 @@
 
 import com.park.utmstack.service.compliance.config.UtmComplianceControlEvaluationLatestService;
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlLatestEvaluationDto;
+import com.park.utmstack.web.rest.util.PaginationUtil;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,10 +22,12 @@ public UtmComplianceControlLatestEvaluationResource(UtmComplianceControlEvaluati
 
     @GetMapping("/get-by-section")
     public ResponseEntity<List<UtmComplianceControlLatestEvaluationDto>> getControlsLatestEvaluationBySection(
-            @RequestParam Long sectionId) {
+            @RequestParam Long sectionId,
+            Pageable pageable) {
 
-        var controls = latestEvaluationService.getControlsWithLastEvaluation(sectionId);
-        return ResponseEntity.ok(controls);
+        var controls = latestEvaluationService.getControlsWithLastEvaluation(sectionId, pageable);
+        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(controls, "/control-config/get-by-section");
+        return ResponseEntity.ok().headers(headers).body(controls.getContent());
     }
 }