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

Author: elmilan06

backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceControlConfig.java

@@ -6,6 +6,7 @@
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +25,9 @@ public class UtmComplianceControlConfig implements Serializable {
     @GeneratedValue(generator = "CustomIdentityGenerator")
     private Long id;
 
-    @Column(name = "standard_section_id")
+    @Column(name = "standard_section_id",
+            nullable = false
+    )
     private Long standardSectionId;
 
     @ManyToOne
@@ -35,18 +38,25 @@ public class UtmComplianceControlConfig implements Serializable {
     private UtmComplianceStandardSection section;
 
     @Column(name = "control_name",
-            length = 50
+            nullable = false
     )
+    @Size(min = 10, max = 200)
     private String controlName;
 
-    @Column(name = "control_solution")
+    @Column(name = "control_solution",
+            length = 2000
+    )
     private String controlSolution;
 
-    @Column(name = "control_remediation")
+    @Column(name = "control_remediation",
+            length = 2000
+    )
     private String controlRemediation;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "control_strategy")
+    @Column(name = "control_strategy",
+            nullable = false
+    )
     private ComplianceStrategy controlStrategy;
 
     @OneToMany(

backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceQueryConfig.java

@@ -7,6 +7,7 @@
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 @Getter
@@ -26,25 +27,37 @@ public class UtmComplianceQueryConfig implements Serializable {
     private Long id;
 
     @Column(name = "query_name",
+            nullable = false,
             columnDefinition = "TEXT"
     )
+    @Size(min = 10, max = 200)
     private String queryName;
 
     @Column(name = "query_description",
+            length = 2000,
+            nullable = false,
             columnDefinition = "TEXT"
     )
     private String queryDescription;
 
     @Column(name = "sql_query",
+            length = 2000,
+            nullable = false,
             columnDefinition = "TEXT"
     )
     private String sqlQuery;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "evaluation_rule")
+    @Column(name = "evaluation_rule",
+            nullable = false
+    )
     private EvaluationRule evaluationRule;
 
-    @Column(name = "index_pattern_id")
+    private Integer ruleValue;
+
+    @Column(name = "index_pattern_id",
+            nullable = false
+    )
     private Long indexPatternId;
 
     @ManyToOne

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

@@ -2,10 +2,12 @@
 
 import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
 import com.park.utmstack.domain.compliance.UtmComplianceQueryConfig;
+import com.park.utmstack.domain.compliance.enums.EvaluationRule;
 import com.park.utmstack.repository.compliance.UtmComplianceControlConfigRepository;
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlConfigDto;
 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.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -30,6 +32,9 @@ public UtmComplianceControlConfigService(UtmComplianceControlConfigRepository re
 
     @Transactional
     public UtmComplianceControlConfigDto create(UtmComplianceControlConfigDto dto) {
+
+        validateControlConfig(dto);
+
         UtmComplianceControlConfig entity = mapper.toEntity(dto);
 
         for (var qdto : dto.getQueriesConfigs()) {
@@ -46,6 +51,8 @@ public UtmComplianceControlConfigDto create(UtmComplianceControlConfigDto dto) {
     @Transactional
     public UtmComplianceControlConfigDto update(Long id, UtmComplianceControlConfigDto dto) {
 
+        validateControlConfig(dto);
+
         UtmComplianceControlConfig entity = repository.findByIdWithQueries(id)
                 .orElseThrow(() -> new RuntimeException("Control not found"));
 
@@ -83,8 +90,23 @@ public UtmComplianceControlConfigDto findById(Long id) {
         return mapper.toDto(entity);
     }
 
-    //TODO: ELENA ????
-    public List<UtmComplianceControlConfig> findAll() {
-        return repository.findAll();
+    private void validateControlConfig(UtmComplianceControlConfigDto dto) {
+        if (dto.getQueriesConfigs() == null || dto.getQueriesConfigs().isEmpty()) {
+            throw new BadRequestAlertException(
+                    "At least one query configuration is required",
+                    "utmComplianceControlConfig",
+                    "queriesConfigsEmpty"
+            );
+        }
+
+        for (var q : dto.getQueriesConfigs()) {
+            if (q.getEvaluationRule() != EvaluationRule.NO_HITS_ALLOWED && q.getRuleValue() == null) {
+                throw new BadRequestAlertException(
+                        "ruleValue is required when evaluationRule is not NO_HITS_ALLOWED",
+                        "utmComplianceQueryConfig",
+                        "ruleValueMissing"
+                );
+            }
+        }
     }
 }

backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceControlConfigDto.java

@@ -3,15 +3,30 @@
 import com.park.utmstack.domain.compliance.enums.ComplianceStrategy;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 @Data
 public class UtmComplianceControlConfigDto {
+
     private Long id;
+
+    @NotNull
     private Long standardSectionId;
+
+    @NotNull
+    @Size(min = 10, max = 200)
     private String controlName;
+
+    @Size(max = 2000)
     private String controlSolution;
+
+    @Size(max = 2000)
     private String controlRemediation;
+
+    @NotNull
     private ComplianceStrategy controlStrategy;
+
     private List<UtmComplianceQueryConfigDto> queriesConfigs;
-}
+}

backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceQueryConfigDto.java

@@ -3,13 +3,34 @@
 import com.park.utmstack.domain.compliance.enums.EvaluationRule;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 @Data
 public class UtmComplianceQueryConfigDto {
+
     private Long id;
+
+    @NotNull
+    @Size(min = 10, max = 200)
     private String queryName;
+
+    @NotNull
+    @Size(max = 2000)
     private String queryDescription;
+
+    @NotNull
+    @Size(max = 2000)
     private String sqlQuery;
+
+    @NotNull
     private EvaluationRule evaluationRule;
+
+    private Integer ruleValue;
+
+    @NotNull
     private Long indexPatternId;
+
+    @NotNull
     private Long controlConfigId;
 }

backend/src/main/resources/config/liquibase/changelog/20260112001_create_table_compliance_control_config.xml

@@ -12,11 +12,11 @@
             </column>
 
             <column name="standard_section_id" type="BIGINT">
-                <constraints nullable="true"/>
+                <constraints nullable="false"/>
             </column>
 
-            <column name="control_name" type="VARCHAR(50)">
-                <constraints nullable="true"/>
+            <column name="control_name" type="VARCHAR(200)">
+                <constraints nullable="false"/>
             </column>
 
             <column name="control_solution" type="TEXT">
@@ -28,7 +28,7 @@
             </column>
 
             <column name="control_strategy" type="VARCHAR(50)">
-                <constraints nullable="true"/>
+                <constraints nullable="false"/>
             </column>
         </createTable>
 

backend/src/main/resources/config/liquibase/changelog/20260112002_create_table_compliance_query_config.xml

@@ -10,23 +10,27 @@
             <column name="id" type="BIGSERIAL">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="query_name" type="TEXT">
-                <constraints nullable="true"/>
+            <column name="query_name" type="VARCHAR(200)">
+                <constraints nullable="false"/>
             </column>
             <column name="query_description" type="TEXT">
-                <constraints nullable="true"/>
+                <constraints nullable="false"/>
             </column>
 
             <column name="sql_query" type="TEXT">
-                <constraints nullable="true"/>
+                <constraints nullable="false"/>
             </column>
 
             <column name="evaluation_rule" type="VARCHAR(100)">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="rule_value" type="INTEGER">
                 <constraints nullable="true"/>
             </column>
 
             <column name="index_pattern_id" type="BIGINT">
-                <constraints nullable="true"/>
+                <constraints nullable="false"/>
             </column>
 
             <column name="control_config_id" type="BIGINT">