Skip to content

Commit 16ab4b4

Browse files
committed
feat: refactor compliance evaluation classes and update related mappings
1 parent 004eaac commit 16ab4b4

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import javax.transaction.Transactional;
1414
import java.util.List;
1515
import java.util.Map;
16+
import java.util.NoSuchElementException;
1617
import java.util.stream.Collectors;
1718

1819
@Service
@@ -54,7 +55,7 @@ public UtmComplianceControlConfigDto update(Long id, UtmComplianceControlConfigD
5455
validateControlConfig(dto);
5556

5657
UtmComplianceControlConfig entity = repository.findByIdWithQueries(id)
57-
.orElseThrow(() -> new RuntimeException("Control not found"));
58+
.orElseThrow(() -> new NoSuchElementException("Control not found"));
5859

5960
mapper.updateEntity(entity, dto);
6061

@@ -80,12 +81,16 @@ public UtmComplianceControlConfigDto update(Long id, UtmComplianceControlConfigD
8081
}
8182

8283
public void delete(Long id) {
84+
if (!repository.existsById(id)) {
85+
throw new NoSuchElementException("Control not found");
86+
}
8387
repository.deleteById(id);
8488
}
8589

90+
8691
public UtmComplianceControlConfigDto findById(Long id) {
8792
var entity = repository.findByIdWithQueries(id)
88-
.orElseThrow(() -> new RuntimeException("Control not found"));
93+
.orElseThrow(() -> new NoSuchElementException("Control not found"));
8994

9095
return mapper.toDto(entity);
9196
}

backend/src/main/java/com/park/utmstack/service/elasticsearch/ElasticsearchService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.park.utmstack.service.application_events.ApplicationEventService;
1313
import com.park.utmstack.service.dto.compliance.UtmComplianceControlEvaluationHistoryDto;
1414
import com.park.utmstack.service.mapper.compliance.UtmComplianceControlLatestEvaluationMapper;
15-
import com.park.utmstack.service.mapper.compliance.UtmComplianceControlEvaluationsMapper;
15+
import com.park.utmstack.service.mapper.compliance.UtmComplianceControlEvaluationHistoryMapper;
1616
import com.park.utmstack.util.chart_builder.IndexPropertyType;
1717
import com.park.utmstack.util.exceptions.OpenSearchIndexNotFoundException;
1818
import com.park.utmstack.util.exceptions.UtmElasticsearchException;
@@ -429,7 +429,7 @@ public List<UtmComplianceControlEvaluationHistoryDto> getControlEvaluations(Long
429429
SearchResponse<Map> response = search(request, Map.class);
430430

431431
var evaluations = response.hits().hits().stream()
432-
.map(hit -> UtmComplianceControlEvaluationsMapper.mapToEvaluationDto(hit.source()))
432+
.map(hit -> UtmComplianceControlEvaluationHistoryMapper.mapToEvaluationDto(hit.source()))
433433
.toList();
434434

435435
return evaluations;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.List;
88
import java.util.Map;
99

10-
public class UtmComplianceControlEvaluationsMapper {
10+
public class UtmComplianceControlEvaluationHistoryMapper {
1111

12-
private UtmComplianceControlEvaluationsMapper() {
12+
private UtmComplianceControlEvaluationHistoryMapper() {
1313

1414
}
1515

@@ -23,7 +23,7 @@ public static UtmComplianceControlEvaluationHistoryDto mapToEvaluationDto(Map<St
2323

2424
List<Map<String, Object>> q = (List<Map<String, Object>>) src.get("query_evaluations");
2525
if (q != null) {
26-
dto.setQueryEvaluations(q.stream().map(UtmComplianceControlEvaluationsMapper::mapQueryEval).toList());
26+
dto.setQueryEvaluations(q.stream().map(UtmComplianceControlEvaluationHistoryMapper::mapQueryEval).toList());
2727
}
2828

2929
return dto;

0 commit comments

Comments
 (0)