feat: enhance compliance control evaluation with search functionality

Author: elmilan06

backend/src/main/java/com/park/utmstack/config/Constants.java

@@ -164,7 +164,7 @@ public final class Constants {
     public static final List<String> API_ENDPOINT_IGNORE = Collections.emptyList();
 
     // Application version file
-    public static final String APP_VERSION_FILE = "/updates/version.json";
+    public static final String APP_VERSION_FILE = "/Users/elena/Documents/Work/UTM Stack/version.json"; //TODO: ELENA
 
     public static final String ADMIN_EMAIL = "admin@localhost";
 

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

@@ -3,6 +3,7 @@
 import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -33,12 +34,13 @@ public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmC
     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);
+    static Specification<UtmComplianceControlConfig> bySection(Long sectionId) {
+        return (root, query, cb) ->
+                cb.equal(root.get("standardSectionId"), sectionId);
+    }
+
+    static Specification<UtmComplianceControlConfig> nameContains(String search) {
+        return (root, query, cb) ->
+                cb.like(cb.lower(root.get("controlName")), "%" + search.toLowerCase() + "%");
+    }
 }

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

@@ -11,6 +11,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -118,22 +119,25 @@ private void validateControlConfig(UtmComplianceControlConfigDto dto) {
         }
     }
 
-    public Page<UtmComplianceControlConfig> findBySection(Long sectionId, Pageable pageable) {
+    public Page<UtmComplianceControlConfig> findBySection(Long sectionId, String search, Pageable pageable) {
 
-        Page<Long> pageIds = repository.findIdsBySectionId(sectionId, pageable);
+        Specification<UtmComplianceControlConfig> spec = Specification.where(UtmComplianceControlConfigRepository.bySection(sectionId));
 
-        if (pageIds.isEmpty()) {
+        if (search != null && !search.isBlank()) {
+            spec = spec.and(UtmComplianceControlConfigRepository.nameContains(search));
+        }
+
+        Page<UtmComplianceControlConfig> page = repository.findAll(spec, pageable);
+
+        List<Long> ids = page.map(UtmComplianceControlConfig::getId).getContent();
+
+        if (ids.isEmpty()) {
             return Page.empty(pageable);
         }
 
-        List<UtmComplianceControlConfig> content =
-                repository.findWithQueriesByIdIn(pageIds.getContent());
+        List<UtmComplianceControlConfig> content = repository.findWithQueriesByIdIn(ids);
 
-        return new PageImpl<>(
-                content,
-                pageable,
-                pageIds.getTotalElements()
-        );
+        return new PageImpl<>(content, pageable, page.getTotalElements());
     }
 
 }

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

@@ -26,9 +26,9 @@ public UtmComplianceControlEvaluationLatestService(UtmComplianceControlConfigSer
     }
 
     public Page<UtmComplianceControlLatestEvaluationDto> getControlsWithLastEvaluation(
-            Long sectionId, Pageable pageable) {
+            Long sectionId, String search, Pageable pageable) {
 
-        Page<UtmComplianceControlConfig> controls = configService.findBySection(sectionId, pageable);
+        Page<UtmComplianceControlConfig> controls = configService.findBySection(sectionId, search, pageable);
 
         return controls.map(control -> {
             UtmComplianceControlConfigDto controlDto = controlMapper.toDto(control);

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

@@ -23,9 +23,10 @@ public UtmComplianceControlLatestEvaluationResource(UtmComplianceControlEvaluati
     @GetMapping("/get-by-section")
     public ResponseEntity<List<UtmComplianceControlLatestEvaluationDto>> getControlsLatestEvaluationBySection(
             @RequestParam Long sectionId,
+            @RequestParam(required = false) String search,
             Pageable pageable) {
 
-        var controls = latestEvaluationService.getControlsWithLastEvaluation(sectionId, pageable);
+        var controls = latestEvaluationService.getControlsWithLastEvaluation(sectionId, search, pageable);
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(controls, "/control-config/get-by-section");
         return ResponseEntity.ok().headers(headers).body(controls.getContent());
     }