feat: enhance compliance evaluation mappers to load full Standard object

Author: elmilan06

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

@@ -28,6 +28,7 @@ public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmC
     SELECT DISTINCT c
     FROM UtmComplianceControlConfig c
     LEFT JOIN FETCH c.section s
+         JOIN FETCH s.standard st
     LEFT JOIN FETCH c.queriesConfigs q
     WHERE c.id IN :ids
     """)

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

@@ -0,0 +1,10 @@
+package com.park.utmstack.service.dto.compliance;
+
+import lombok.Data;
+
+@Data
+public class UtmComplianceStandardDto {
+    private Long id;
+    private String standardName;
+    private String standardDescription;
+}

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

@@ -7,5 +7,5 @@ public class UtmComplianceStandardSectionDto {
     private Long id;
     private String standardSectionName;
     private String standardSectionDescription;
-    private Long standardId;
+    private UtmComplianceStandardDto standard;
 }

backend/src/main/java/com/park/utmstack/service/mapper/compliance/UtmComplianceControlConfigMapper.java

@@ -6,7 +6,10 @@
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
 
-@Mapper(componentModel = "spring", uses = UtmComplianceQueryConfigMapper.class)
+@Mapper(componentModel = "spring", uses = {
+        UtmComplianceQueryConfigMapper.class,
+        UtmComplianceStandardSectionMapper.class,
+        UtmComplianceStandardMapper.class})
 public interface UtmComplianceControlConfigMapper {
 
     @Mapping(target = "queriesConfigs", ignore = true)

backend/src/main/java/com/park/utmstack/service/mapper/compliance/UtmComplianceControlEvaluationHistoryMapper.java

@@ -1,12 +1,14 @@
 package com.park.utmstack.service.mapper.compliance;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import com.park.utmstack.service.dto.compliance.UtmComplianceControlEvaluationHistoryDto;
 import com.park.utmstack.service.dto.compliance.UtmComplianceQueryEvaluationDto;
 
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-
 public class UtmComplianceControlEvaluationHistoryMapper {
 
     private UtmComplianceControlEvaluationHistoryMapper() {
@@ -21,7 +23,9 @@ public static UtmComplianceControlEvaluationHistoryDto mapToEvaluationDto(Map<St
         dto.setStatus((String) src.get("status"));
         dto.setTimestamp(Instant.parse((String) src.get("timestamp")));
 
-        List<Map<String, Object>> q = (List<Map<String, Object>>) src.get("query_evaluations");
+
+        ObjectMapper mapper = new ObjectMapper();
+        List<Map<String, Object>> q = mapper.convertValue(src.get("query_evaluations"), new TypeReference<>() {});
         if (q != null) {
             dto.setQueryEvaluations(q.stream().map(UtmComplianceControlEvaluationHistoryMapper::mapQueryEval).toList());
         }
@@ -41,7 +45,10 @@ private static UtmComplianceQueryEvaluationDto mapQueryEval(Map<String, Object>
 
         dto.setHits(((Number) src.get("hits")).intValue());
         dto.setStatus((String) src.get("status"));
-        dto.setEvidence((List<Map<String, Object>>) src.get("evidence"));
+
+        ObjectMapper mapper = new ObjectMapper();
+        List<Map<String, Object>> evidence = mapper.convertValue(src.get("evidence"), new TypeReference<>() {});
+        dto.setEvidence(evidence);
 
         return dto;
     }

backend/src/main/java/com/park/utmstack/service/mapper/compliance/UtmComplianceStandardMapper.java

@@ -0,0 +1,10 @@
+package com.park.utmstack.service.mapper.compliance;
+
+import com.park.utmstack.domain.compliance.UtmComplianceStandard;
+import com.park.utmstack.service.dto.compliance.UtmComplianceStandardDto;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface UtmComplianceStandardMapper {
+    UtmComplianceStandardDto toDto(UtmComplianceStandard entity);
+}

backend/src/main/java/com/park/utmstack/service/mapper/compliance/UtmComplianceStandardSectionMapper.java

@@ -0,0 +1,10 @@
+package com.park.utmstack.service.mapper.compliance;
+
+import com.park.utmstack.domain.compliance.UtmComplianceStandardSection;
+import com.park.utmstack.service.dto.compliance.UtmComplianceStandardSectionDto;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = {UtmComplianceStandardMapper.class})
+public interface UtmComplianceStandardSectionMapper {
+    UtmComplianceStandardSectionDto toDto(UtmComplianceStandardSection entity);
+}