feat: add compliance control and query configuration tables with related DTOs and mappers

elmilan06 · elmilan06 · commit c2ca1ad173b5 · 2026-01-27T14:25:35.000-06:00
diff --git a/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceQueryConfig.java b/backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceQueryConfig.java
@@ -25,6 +25,11 @@ public class UtmComplianceQueryConfig implements Serializable {
     @GeneratedValue(generator = "CustomIdentityGenerator")
     private Long id;
 
+    @Column(name = "query_name",
+            columnDefinition = "TEXT"
+    )
+    private String queryName;
+
     @Column(name = "query_description",
             columnDefinition = "TEXT"
     )
diff --git a/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStrategy.java b/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStrategy.java
@@ -2,6 +2,5 @@
 
 public enum ComplianceStrategy {
     ALL,
-    ANY,
-    MAJORITY
+    ANY
 }
diff --git a/backend/src/main/java/com/park/utmstack/domain/compliance/enums/EvaluationRule.java b/backend/src/main/java/com/park/utmstack/domain/compliance/enums/EvaluationRule.java
@@ -1,8 +1,8 @@
 package com.park.utmstack.domain.compliance.enums;
 
 public enum EvaluationRule {
-    NO_HITS_ALLOWED,
-    MIN_HITS_REQUIRED,
-    THRESHOLD_MAX,
-    MATCH_FIELD_VALUE
+    NO_HITS_ALLOWED, // no results
+    MIN_HITS_REQUIRED, // at least N results
+    THRESHOLD_MAX, // a maximum of N results.
+    MATCH_FIELD_VALUE // a specific value in a field
 }
diff --git a/backend/src/main/java/com/park/utmstack/repository/compliance/UtmComplianceControlConfigRepository.java b/backend/src/main/java/com/park/utmstack/repository/compliance/UtmComplianceControlConfigRepository.java
@@ -2,15 +2,15 @@
 
 import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmComplianceControlConfig, Long> {
+public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmComplianceControlConfig, Long>, JpaSpecificationExecutor<UtmComplianceControlConfig> {
     @Query(" SELECT c FROM UtmComplianceControlConfig c LEFT JOIN FETCH c.queriesConfigs WHERE c.id = :id")
     Optional<UtmComplianceControlConfig> findByIdWithQueries(@Param("id") Long id);
 }
diff --git a/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlConfigQueryService.java b/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlConfigQueryService.java
@@ -0,0 +1,65 @@
+package com.park.utmstack.service.compliance.config;
+
+import com.park.utmstack.domain.compliance.*;
+import com.park.utmstack.repository.compliance.UtmComplianceControlConfigRepository;
+import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigCriteria;
+import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigDto;
+import com.park.utmstack.service.mapper.compliance.UtmComplianceControlConfigMapper;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tech.jhipster.service.QueryService;
+
+@Service
+@Transactional(readOnly = true)
+public class UtmComplianceControlConfigQueryService extends QueryService<UtmComplianceControlConfig> {
+
+    private final UtmComplianceControlConfigRepository complianceControlConfigRepository;
+    private final UtmComplianceControlConfigMapper mapper;
+
+    public UtmComplianceControlConfigQueryService(UtmComplianceControlConfigRepository complianceControlConfigRepository,
+                                                  UtmComplianceControlConfigMapper mapper) {
+        this.complianceControlConfigRepository = complianceControlConfigRepository;
+        this.mapper = mapper;
+    }
+
+    @Transactional(readOnly = true)
+    public Page<UtmComplianceControlConfigDto> findByCriteria(UtmComplianceControlConfigCriteria criteria, Pageable page) {
+        final Specification<UtmComplianceControlConfig> specification = createSpecification(criteria);
+        return complianceControlConfigRepository.findAll(specification, page).map(mapper::toDto);
+    }
+
+    private Specification<UtmComplianceControlConfig> createSpecification(UtmComplianceControlConfigCriteria criteria) {
+        Specification<UtmComplianceControlConfig> specification = Specification.where(null);
+        if (criteria != null) {
+            if (criteria.getId() != null) {
+                specification = specification.and(buildSpecification(criteria.getId(), UtmComplianceControlConfig_.id));
+            }
+            if (criteria.getStandardSectionId() != null) {
+                specification = specification.and(
+                        buildRangeSpecification(criteria.getStandardSectionId(), UtmComplianceControlConfig_.standardSectionId));
+            }
+            if (criteria.getControlName() != null) {
+                specification = specification.and(
+                        buildStringSpecification(criteria.getControlName(), UtmComplianceControlConfig_.controlName));
+            }
+            if (criteria.getControlSolution() != null ) {
+                specification = specification.and(
+                        buildStringSpecification(criteria.getControlSolution(), UtmComplianceControlConfig_.controlSolution));
+            }
+            if (criteria.getControlRemediation() != null) {
+                specification = specification.and(
+                        buildStringSpecification(criteria.getControlRemediation(), UtmComplianceControlConfig_.controlRemediation));
+            }
+            if (criteria.getControlStrategy() != null) {
+                specification = specification.and(
+                        buildSpecification(criteria.getControlStrategy(), UtmComplianceControlConfig_.controlStrategy)
+                );
+            }
+
+        }
+        return specification;
+    }
+}
diff --git a/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlConfigService.java b/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceControlConfigService.java
@@ -83,6 +83,7 @@ public UtmComplianceControlConfigDto findById(Long id) {
         return mapper.toDto(entity);
     }
 
+    //TODO: ELENA ????
     public List<UtmComplianceControlConfig> findAll() {
         return repository.findAll();
     }
diff --git a/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceQueryConfigService.java b/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceQueryConfigService.java
diff --git a/backend/src/main/java/com/park/utmstack/service/dto/compliance/ComplianceStrategyFilter.java b/backend/src/main/java/com/park/utmstack/service/dto/compliance/ComplianceStrategyFilter.java
@@ -0,0 +1,9 @@
+package com.park.utmstack.service.dto.compliance;
+
+import com.park.utmstack.domain.compliance.enums.ComplianceStrategy;
+import tech.jhipster.service.filter.Filter;
+
+public class ComplianceStrategyFilter extends Filter<ComplianceStrategy> {
+
+}
+
diff --git a/backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceControlConfigCriteria.java b/backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceControlConfigCriteria.java
@@ -0,0 +1,17 @@
+package com.park.utmstack.service.dto.compliance;
+
+import lombok.Getter;
+import lombok.Setter;
+import tech.jhipster.service.filter.LongFilter;
+import tech.jhipster.service.filter.StringFilter;
+
+@Getter
+@Setter
+public class UtmComplianceControlConfigCriteria {
+    private LongFilter id;
+    private LongFilter standardSectionId;
+    private StringFilter controlName;
+    private StringFilter controlSolution;
+    private StringFilter controlRemediation;
+    private ComplianceStrategyFilter controlStrategy;
+}
diff --git a/backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceQueryConfigDto.java b/backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceQueryConfigDto.java
@@ -6,6 +6,7 @@
 @Data
 public class UtmComplianceQueryConfigDto {
     private Long id;
+    private String queryName;
     private String queryDescription;
     private String sqlQuery;
     private EvaluationRule evaluationRule;
diff --git a/backend/src/main/java/com/park/utmstack/web/rest/compliance/config/UtmComplianceControlConfigResource.java b/backend/src/main/java/com/park/utmstack/web/rest/compliance/config/UtmComplianceControlConfigResource.java
@@ -1,24 +1,43 @@
 package com.park.utmstack.web.rest.compliance.config;
 
+import com.park.utmstack.domain.application_events.enums.ApplicationEventType;
+import com.park.utmstack.service.application_events.ApplicationEventService;
 import com.park.utmstack.service.compliance.config.UtmComplianceControlConfigService;
+import com.park.utmstack.service.compliance.config.UtmComplianceControlConfigQueryService;
+import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigCriteria;
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigDto;
-import com.park.utmstack.service.mapper.compliance.UtmComplianceControlConfigMapper;
+import com.park.utmstack.web.rest.util.HeaderUtil;
+import com.park.utmstack.web.rest.util.PaginationUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
-@RequestMapping("/api/compliance/control")
+@RequestMapping("/api/compliance/control-config")
 public class UtmComplianceControlConfigResource {
+    private final Logger log = LoggerFactory.getLogger(UtmComplianceControlConfigResource.class);
+    private static final String CLASS_NAME = "UtmComplianceControlConfigResource";
 
     private final UtmComplianceControlConfigService controlService;
-    private final UtmComplianceControlConfigMapper controlMapper;
+    private final UtmComplianceControlConfigQueryService queryService;
+    private final ApplicationEventService applicationEventService;
+
 
     public UtmComplianceControlConfigResource(
             UtmComplianceControlConfigService controlService,
-            UtmComplianceControlConfigMapper controlMapper
+            UtmComplianceControlConfigQueryService queryService,
+            ApplicationEventService applicationEventService
     ) {
         this.controlService = controlService;
-        this.controlMapper = controlMapper;
+        this.queryService = queryService;
+        this.applicationEventService = applicationEventService;
     }
 
     @PostMapping
@@ -52,4 +71,29 @@ public ResponseEntity<Void> deleteControl(@PathVariable Long id) {
         controlService.delete(id);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping
+    public ResponseEntity<List<UtmComplianceControlConfigDto>> getAllComplianceControlConfig(
+            UtmComplianceControlConfigCriteria criteria,
+            Pageable pageable) {
+
+        final String ctx = CLASS_NAME + ".getAllComplianceControlConfig";
+
+        try {
+            Page<UtmComplianceControlConfigDto> page = queryService.findByCriteria(criteria, pageable);
+            HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, "/api/compliance/control-config");
+
+            return ResponseEntity.ok().headers(headers).body(page.getContent());
+
+        } catch (Exception e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .headers(HeaderUtil.createFailureAlert("", "", msg))
+                    .body(null);
+        }
+    }
+
 }
diff --git a/backend/src/main/resources/config/liquibase/changelog/20260112002_create_table_compliance_query_config.xml b/backend/src/main/resources/config/liquibase/changelog/20260112002_create_table_compliance_query_config.xml
@@ -10,7 +10,9 @@
             <column name="id" type="BIGSERIAL">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-
+            <column name="query_name" type="TEXT">
+                <constraints nullable="true"/>
+            </column>
             <column name="query_description" type="TEXT">
                 <constraints nullable="true"/>
             </column>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`
`3`	`3`	`public enum ComplianceStrategy {`
`4`	`4`	`ALL,`
`5`		`- ANY,`
`6`		`- MAJORITY`
	`5`	`+ ANY`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public UtmComplianceControlConfigDto findById(Long id) {`
`83`	`83`	`return mapper.toDto(entity);`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ //TODO: ELENA ????`
`86`	`87`	`public List<UtmComplianceControlConfig> findAll() {`
`87`	`88`	`return repository.findAll();`
`88`	`89`	`}`