From fd63824edc8c73e0031b9372916f2a4208452b15 Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 23 Feb 2026 14:30:29 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=98=EC=9D=B4=ED=8D=BC=20=ED=8C=8C?= =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EC=A0=9C=EA=B1=B0,=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=9A=9F=EC=88=98=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hyperparam/dto/HyperParamDto.java | 5 +---- .../postgres/core/HyperParamCoreService.java | 2 +- .../core/ModelTrainMngCoreService.java | 2 +- .../entity/ModelHyperParamEntity.java | 9 -------- .../HyperParamRepositoryCustom.java | 21 +++++++++++++++++- .../hyperparam/HyperParamRepositoryImpl.java | 22 +++++-------------- 6 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/hyperparam/dto/HyperParamDto.java b/src/main/java/com/kamco/cd/training/hyperparam/dto/HyperParamDto.java index 1a46cf1..4b8fe4f 100644 --- a/src/main/java/com/kamco/cd/training/hyperparam/dto/HyperParamDto.java +++ b/src/main/java/com/kamco/cd/training/hyperparam/dto/HyperParamDto.java @@ -115,10 +115,7 @@ public class HyperParamDto { @JsonFormatDttm private ZonedDateTime createDttm; @JsonFormatDttm private ZonedDateTime lastUsedDttm; private String memo; - private Long m1UseCnt; - private Long m2UseCnt; - private Long m3UseCnt; - private Long totalCnt; + private Long totalUseCnt; } @Getter diff --git a/src/main/java/com/kamco/cd/training/postgres/core/HyperParamCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/HyperParamCoreService.java index e2cf5b1..cffd16e 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/HyperParamCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/HyperParamCoreService.java @@ -104,7 +104,7 @@ public class HyperParamCoreService { */ public HyperParamDto.Basic getInitHyperParam(ModelType model) { ModelHyperParamEntity entity = - hyperParamRepository.getHyperparamByType(model).stream() + hyperParamRepository.getHyperParamByType(model).stream() .filter(e -> e.getIsDefault() == Boolean.TRUE) .findFirst() .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND)); diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java index b901d4c..bb56dbd 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java @@ -90,7 +90,7 @@ public class ModelTrainMngCoreService { if (HyperParamSelectType.OPTIMIZED.getId().equals(addReq.getHyperParamType())) { ModelType modelType = ModelType.getValueData(addReq.getModelNo()); hyperParamEntity = - hyperParamRepository.getHyperparamByType(modelType).stream() + hyperParamRepository.getHyperParamByType(modelType).stream() .filter(e -> e.getIsDefault() == Boolean.TRUE) .findFirst() .orElse(null); diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/ModelHyperParamEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/ModelHyperParamEntity.java index 7f0f215..d0cd472 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/ModelHyperParamEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/ModelHyperParamEntity.java @@ -303,15 +303,6 @@ public class ModelHyperParamEntity { @Column(name = "last_used_dttm") private ZonedDateTime lastUsedDttm; - @Column(name = "m1_use_cnt") - private Long m1UseCnt = 0L; - - @Column(name = "m2_use_cnt") - private Long m2UseCnt = 0L; - - @Column(name = "m3_use_cnt") - private Long m3UseCnt = 0L; - @Column(name = "model_type") @Enumerated(EnumType.STRING) private ModelType modelType; diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java index 9b00aaf..f77205c 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java @@ -29,9 +29,28 @@ public interface HyperParamRepositoryCustom { Optional findHyperParamByHyperVer(String hyperVer); + /** + * 하이퍼 파라미터 상세조회 + * + * @param uuid + * @return + */ Optional findHyperParamByUuid(UUID uuid); + /** + * 하이퍼 파라미터 목록 조회 + * + * @param model + * @param req + * @return + */ Page findByHyperVerList(ModelType model, SearchReq req); - List getHyperparamByType(ModelType modelType); + /** + * 하이퍼 파라미터 모델타입으로 조회 + * + * @param modelType + * @return + */ + List getHyperParamByType(ModelType modelType); } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java index bc0c199..50303cc 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java @@ -9,7 +9,6 @@ import com.kamco.cd.training.hyperparam.dto.HyperParamDto.SearchReq; import com.kamco.cd.training.postgres.entity.ModelHyperParamEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Projections; -import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; import java.time.ZoneId; @@ -91,10 +90,12 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { Pageable pageable = req.toPageable(); BooleanBuilder builder = new BooleanBuilder(); + + builder.and(modelHyperParamEntity.delYn.isFalse()); + if (model != null) { builder.and(modelHyperParamEntity.modelType.eq(model)); } - builder.and(modelHyperParamEntity.delYn.isFalse()); if (req.getHyperVer() != null && !req.getHyperVer().isEmpty()) { // 버전 @@ -118,13 +119,6 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { } } - NumberExpression totalUseCnt = - modelHyperParamEntity - .m1UseCnt - .coalesce(0L) - .add(modelHyperParamEntity.m2UseCnt.coalesce(0L)) - .add(modelHyperParamEntity.m3UseCnt.coalesce(0L)); - JPAQuery query = queryFactory .select( @@ -135,11 +129,7 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { modelHyperParamEntity.hyperVer, modelHyperParamEntity.createdDttm, modelHyperParamEntity.lastUsedDttm, - modelHyperParamEntity.memo, - modelHyperParamEntity.m1UseCnt, - modelHyperParamEntity.m2UseCnt, - modelHyperParamEntity.m3UseCnt, - totalUseCnt.as("totalUseCnt"))) + modelHyperParamEntity.memo)) .from(modelHyperParamEntity) .where(builder); @@ -165,8 +155,6 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { ? modelHyperParamEntity.lastUsedDttm.asc() : modelHyperParamEntity.lastUsedDttm.desc()); - case "totalUseCnt" -> query.orderBy(asc ? totalUseCnt.asc() : totalUseCnt.desc()); - default -> query.orderBy(modelHyperParamEntity.createdDttm.desc()); } } @@ -187,7 +175,7 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { } @Override - public List getHyperparamByType(ModelType modelType) { + public List getHyperParamByType(ModelType modelType) { return queryFactory .select(modelHyperParamEntity) .from(modelHyperParamEntity)