Skip to content

Commit f36a597

Browse files
committed
feat: add compliance control and query configuration tables with related DTOs and mappers
1 parent 7f7d0ea commit f36a597

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import com.park.utmstack.domain.compliance.UtmComplianceControlConfig;
44
import org.springframework.data.jpa.repository.JpaRepository;
5+
import org.springframework.data.jpa.repository.Query;
6+
import org.springframework.data.repository.query.Param;
57
import org.springframework.stereotype.Repository;
68

79
import java.util.List;
10+
import java.util.Optional;
811

912
@Repository
1013
public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmComplianceControlConfig, Long> {
11-
14+
@Query(" SELECT c FROM UtmComplianceControlConfig c LEFT JOIN FETCH c.queriesConfigs WHERE c.id = :id")
15+
Optional<UtmComplianceControlConfig> findByIdWithQueries(@Param("id") Long id);
1216
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
@Repository
1010
public interface UtmComplianceQueryConfigRepository extends JpaRepository<UtmComplianceQueryConfig, Long> {
1111

12-
List<UtmComplianceQueryConfig> findByControlConfigId(Long controlConfigId);
13-
}
14-
12+
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,13 @@ public void delete(Long id) {
6969
repository.deleteById(id);
7070
}
7171

72-
public UtmComplianceControlConfig findById(Long id) {
73-
return repository.findById(id).orElse(null);
72+
public UtmComplianceControlConfigDto findById(Long id) {
73+
var entity = repository.findByIdWithQueries(id)
74+
.orElseThrow(() -> new RuntimeException("Control not found"));
75+
76+
return mapper.toDto(entity);
7477
}
75-
78+
7679
public List<UtmComplianceControlConfig> findAll() {
7780
return repository.findAll();
7881
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@ public void delete(Long id) {
2323
repository.deleteById(id);
2424
}
2525

26-
public List<UtmComplianceQueryConfig> findByControlConfigId(Long controlId) {
27-
return repository.findByControlConfigId((controlId));
28-
}
29-
3026
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ResponseEntity<UtmComplianceControlConfigDto> getControl(@PathVariable Lo
3535
if (entity == null) {
3636
return ResponseEntity.notFound().build();
3737
}
38-
return ResponseEntity.ok(controlMapper.toDto(entity));
38+
return ResponseEntity.ok(entity);
3939
}
4040

4141
@PutMapping("/{id}")

0 commit comments

Comments
 (0)