From b91c0dde095804ed64cda7f9a6e4aec7e864c224 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Wed, 24 Dec 2025 11:17:53 +0900 Subject: [PATCH] spotless --- .../model/ModelMngApiController.java | 50 ++++---- .../cd/kamcoback/model/dto/ModelMngDto.java | 41 +++---- .../model/service/ModelMngService.java | 13 +- .../postgres/entity/ModelMngEntity.java | 2 +- .../model/ModelMngRepositoryCustom.java | 11 +- .../model/ModelMngRepositoryImpl.java | 116 +++++++++--------- 6 files changed, 113 insertions(+), 120 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java index a09e897b..802a24e1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java @@ -32,42 +32,42 @@ public class ModelMngApiController { @Operation(summary = "모델관리 목록") @GetMapping public ApiResponseDto> findModelMgmtList( - @RequestParam(required = false) LocalDate startDate, - @RequestParam(required = false) LocalDate endDate, - @RequestParam(required = false, defaultValue = "createCompleteDttm") String sortColumn, - @RequestParam(required = false) String modelType, - @RequestParam(required = false) String searchVal, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "20") int size) { + @RequestParam(required = false) LocalDate startDate, + @RequestParam(required = false) LocalDate endDate, + @RequestParam(required = false, defaultValue = "createCompleteDttm") String sortColumn, + @RequestParam(required = false) String modelType, + @RequestParam(required = false) String searchVal, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { ModelMngDto.searchReq searchReq = new ModelMngDto.searchReq(page, size, sortColumn + ",desc"); Page result = - modelMngService.findModelMgmtList(searchReq, startDate, endDate, modelType, searchVal); + modelMngService.findModelMgmtList(searchReq, startDate, endDate, modelType, searchVal); return ApiResponseDto.ok(result); } @Operation(summary = "삭제", description = "모델을 삭제 합니다.") @ApiResponses( - value = { - @ApiResponse( - responseCode = "204", - description = "모델 삭제 성공", - content = - @Content( - mediaType = "application/json", - schema = @Schema(implementation = Long.class))), - @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content), - @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), - @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) - }) + value = { + @ApiResponse( + responseCode = "204", + description = "모델 삭제 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = Long.class))), + @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content), + @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) @DeleteMapping("/{modelVer}") public ApiResponseDto removeModel( - @io.swagger.v3.oas.annotations.parameters.RequestBody( - description = "모델 삭제 요청 정보", - required = true) - @PathVariable - String modelVer) { + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "모델 삭제 요청 정보", + required = true) + @PathVariable + String modelVer) { return ApiResponseDto.okObject(modelMngService.removeModel(modelVer)); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java index 5fb01c3b..ea9da363 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java @@ -45,17 +45,13 @@ public class ModelMngDto { private Long modelUid; private String modelVer; - @JsonFormatDttm - private ZonedDateTime createCompleteDttm; - @JsonFormatDttm - private ZonedDateTime recentUseDttm; + @JsonFormatDttm private ZonedDateTime createCompleteDttm; + @JsonFormatDttm private ZonedDateTime recentUseDttm; private Boolean deleted; - @JsonFormatDttm - private ZonedDateTime createdDttm; + @JsonFormatDttm private ZonedDateTime createdDttm; private Long createdUid; - @JsonFormatDttm - private ZonedDateTime updatedDttm; + @JsonFormatDttm private ZonedDateTime updatedDttm; private Long updatedUid; private String modelType; @@ -64,20 +60,19 @@ public class ModelMngDto { private String memo; public Basic( - Long modelUid, - String modelVer, - ZonedDateTime createCompleteDttm, - ZonedDateTime recentUseDttm, - Boolean deleted, - ZonedDateTime createdDttm, - Long createdUid, - ZonedDateTime updatedDttm, - Long updatedUid, - String modelType, - String filePath, - String fileName, - String memo - ) { + Long modelUid, + String modelVer, + ZonedDateTime createCompleteDttm, + ZonedDateTime recentUseDttm, + Boolean deleted, + ZonedDateTime createdDttm, + Long createdUid, + ZonedDateTime updatedDttm, + Long updatedUid, + String modelType, + String filePath, + String fileName, + String memo) { this.modelUid = modelUid; this.modelVer = modelVer; this.createCompleteDttm = createCompleteDttm; @@ -146,7 +141,7 @@ public class ModelMngDto { String[] sortParams = sort.split(","); String property = sortParams[0]; Sort.Direction direction = - sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC; + sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC; return PageRequest.of(page, size, Sort.by(direction, property)); } return PageRequest.of(page, size); diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index 02d8d6ca..02c7e518 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -15,17 +15,16 @@ public class ModelMngService { private final ModelMngCoreService modelMngCoreService; public Page findModelMgmtList( - ModelMngDto.searchReq searchReq, - LocalDate startDate, - LocalDate endDate, - String modelType, - String searchVal) { + ModelMngDto.searchReq searchReq, + LocalDate startDate, + LocalDate endDate, + String modelType, + String searchVal) { return modelMngCoreService.findModelMgmtList( - searchReq, startDate, endDate, modelType, searchVal); + searchReq, startDate, endDate, modelType, searchVal); } public ApiResponseDto.ResponseObj removeModel(String modelVer) { return modelMngCoreService.removeModel(modelVer); } - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java index 2e423cee..9c06015f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java @@ -27,7 +27,7 @@ public class ModelMngEntity extends CommonDateEntity { @Column(name = "create_complete_dttm") private ZonedDateTime createCompleteDttm; - + @Column(name = "recent_use_dttm") private ZonedDateTime recentUseDttm; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java index 4f89d0b8..5d34fdee 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java @@ -9,12 +9,11 @@ import org.springframework.data.domain.Page; public interface ModelMngRepositoryCustom { Page findModelMgmtList( - ModelMngDto.searchReq searchReq, - LocalDate startDate, - LocalDate endDate, - String modelType, - String searchVal); + ModelMngDto.searchReq searchReq, + LocalDate startDate, + LocalDate endDate, + String modelType, + String searchVal); Optional findByModelUid(String modelVer); - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java index 0ab11cf3..18290f45 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java @@ -29,7 +29,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport; public class ModelMngRepositoryImpl extends QuerydslRepositorySupport - implements ModelMngRepositoryCustom { + implements ModelMngRepositoryCustom { private final JPAQueryFactory queryFactory; private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)"); @@ -41,19 +41,19 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport @Override public Page findModelMgmtList( - ModelMngDto.searchReq searchReq, - LocalDate startDate, - LocalDate endDate, - String modelType, - String searchVal) { + ModelMngDto.searchReq searchReq, + LocalDate startDate, + LocalDate endDate, + String modelType, + String searchVal) { Pageable pageable = searchReq.toPageable(); Sort sort = pageable.getSort(); String property = "createCompleteDttm"; // 기본으로 생성완료일 기준 Map> sortColumnMap = - Map.of( - "createCompleteDttm", modelMngEntity.createCompleteDttm, - "recentUseDttm", modelMngEntity.recentUseDttm); + Map.of( + "createCompleteDttm", modelMngEntity.createCompleteDttm, + "recentUseDttm", modelMngEntity.recentUseDttm); if (sort.isSorted()) { Sort.Order order = sort.iterator().next(); @@ -63,46 +63,46 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport Expression sortColumn = sortColumnMap.get(property); List foundContent = - queryFactory - .select( - Projections.constructor( - ModelMngDto.ModelList.class, - Expressions.numberTemplate( - Integer.class, "row_number() over(order by {0} desc)", sortColumn), - modelMngEntity.modelVer, - modelMngEntity.fileName, - modelMngEntity.modelType, - Expressions.stringTemplate( - "to_char({0}, 'YYYY-MM-DD')", modelMngEntity.createCompleteDttm), - roundNumericToPercent(modelResultMetricEntity.f1Score), - roundNumericToPercent(modelResultMetricEntity.precision), - roundNumericToPercent(modelResultMetricEntity.recall), - roundNumericToPercent(modelResultMetricEntity.loss), - roundNumericToPercent(modelResultMetricEntity.iou), - modelMngEntity.memo, - modelMngEntity.deleted)) - .from(modelMngEntity) - .innerJoin(modelResultMetricEntity) - .on(modelMngEntity.modelUid.eq(modelResultMetricEntity.modelUid)) - .where( - eventEndedAtBetween(startDate, endDate, property), - searchModelVersion(modelType, searchVal), - modelMngEntity.deleted.isFalse().or(modelMngEntity.deleted.isNull())) - .offset(pageable.getOffset()) - .limit(pageable.getPageSize()) - .orderBy( - QuerydslOrderUtil.getOrderSpecifiers( - pageable, ModelMngEntity.class, "modelMngEntity")) - .fetch(); + queryFactory + .select( + Projections.constructor( + ModelMngDto.ModelList.class, + Expressions.numberTemplate( + Integer.class, "row_number() over(order by {0} desc)", sortColumn), + modelMngEntity.modelVer, + modelMngEntity.fileName, + modelMngEntity.modelType, + Expressions.stringTemplate( + "to_char({0}, 'YYYY-MM-DD')", modelMngEntity.createCompleteDttm), + roundNumericToPercent(modelResultMetricEntity.f1Score), + roundNumericToPercent(modelResultMetricEntity.precision), + roundNumericToPercent(modelResultMetricEntity.recall), + roundNumericToPercent(modelResultMetricEntity.loss), + roundNumericToPercent(modelResultMetricEntity.iou), + modelMngEntity.memo, + modelMngEntity.deleted)) + .from(modelMngEntity) + .innerJoin(modelResultMetricEntity) + .on(modelMngEntity.modelUid.eq(modelResultMetricEntity.modelUid)) + .where( + eventEndedAtBetween(startDate, endDate, property), + searchModelVersion(modelType, searchVal), + modelMngEntity.deleted.isFalse().or(modelMngEntity.deleted.isNull())) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .orderBy( + QuerydslOrderUtil.getOrderSpecifiers( + pageable, ModelMngEntity.class, "modelMngEntity")) + .fetch(); Long countQuery = - queryFactory - .select(modelMngEntity.modelUid.count()) - .from(modelMngEntity) - .where( - eventEndedAtBetween(startDate, endDate, property), - searchModelVersion(modelType, searchVal)) - .fetchOne(); + queryFactory + .select(modelMngEntity.modelUid.count()) + .from(modelMngEntity) + .where( + eventEndedAtBetween(startDate, endDate, property), + searchModelVersion(modelType, searchVal)) + .fetchOne(); return new PageImpl<>(foundContent, pageable, countQuery); } @@ -110,14 +110,14 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport @Override public Optional findByModelUid(String modelVer) { return Optional.ofNullable( - queryFactory - .selectFrom(modelMngEntity) - .where(modelMngEntity.modelVer.eq(modelVer)) - .fetchOne()); + queryFactory + .selectFrom(modelMngEntity) + .where(modelMngEntity.modelVer.eq(modelVer)) + .fetchOne()); } private BooleanExpression eventEndedAtBetween( - LocalDate startDate, LocalDate endDate, String sortColumn) { + LocalDate startDate, LocalDate endDate, String sortColumn) { if (Objects.isNull(startDate) || Objects.isNull(endDate)) { return null; } @@ -127,14 +127,14 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport if (sortColumn.equals("createCompleteDttm")) { return modelMngEntity - .createCompleteDttm - .goe(startDateTime.atZone(zone)) - .and(modelMngEntity.createCompleteDttm.lt(endDateTime.atZone(zone))); + .createCompleteDttm + .goe(startDateTime.atZone(zone)) + .and(modelMngEntity.createCompleteDttm.lt(endDateTime.atZone(zone))); } else { return modelMngEntity - .recentUseDttm - .goe(startDateTime.atZone(zone)) - .and(modelMngEntity.recentUseDttm.lt(endDateTime.atZone(zone))); + .recentUseDttm + .goe(startDateTime.atZone(zone)) + .and(modelMngEntity.recentUseDttm.lt(endDateTime.atZone(zone))); } }