From 68c0e634c522d1533c0e6c48a2ffd3c0bbc02c8b Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 20 Feb 2026 12:05:20 +0900 Subject: [PATCH] =?UTF-8?q?ing-cnt=20=EB=A1=9C=EC=A7=81=EC=97=90=20step2?= =?UTF-8?q?=EB=8F=84=20=EC=B6=94=EA=B0=80,=20transactional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamco/cd/training/model/ModelTrainMngApiController.java | 4 +++- .../postgres/core/ModelTestMetricsJobCoreService.java | 2 ++ .../postgres/repository/model/ModelMngRepositoryImpl.java | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/model/ModelTrainMngApiController.java b/src/main/java/com/kamco/cd/training/model/ModelTrainMngApiController.java index 2a081cf..c6f0043 100644 --- a/src/main/java/com/kamco/cd/training/model/ModelTrainMngApiController.java +++ b/src/main/java/com/kamco/cd/training/model/ModelTrainMngApiController.java @@ -155,7 +155,9 @@ public class ModelTrainMngApiController { return ApiResponseDto.ok(modelTrainMngService.getDatasetSelectList(req)); } - @Operation(summary = "모델학습 1단계 실행중인 것이 있는지 count", description = "모델학습 1단계 실행중인 것이 있는지 count") + @Operation( + summary = "모델학습 1단계/2단계 실행중인 것이 있는지 count", + description = "모델학습 1단계/2단계 실행중인 것이 있는지 count") @ApiResponses( value = { @ApiResponse( diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java index e47cb84..a8d7b2c 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java @@ -38,10 +38,12 @@ public class ModelTestMetricsJobCoreService { return modelTestMetricsJobRepository.findModelTestFileNames(modelId); } + @Transactional public void updatePackingStart(Long modelId, ZonedDateTime now) { modelTestMetricsJobRepository.updatePackingStart(modelId, now); } + @Transactional public void updatePackingEnd(Long modelId, ZonedDateTime now, String failSuccState) { modelTestMetricsJobRepository.updatePackingEnd(modelId, now, failSuccState); } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java index 9ef7c57..197320e 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java @@ -191,7 +191,11 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom { return queryFactory .select(modelMasterEntity.id.count()) .from(modelMasterEntity) - .where(modelMasterEntity.step1State.eq(TrainStatusType.IN_PROGRESS.getId())) + .where( + modelMasterEntity + .step1State + .eq(TrainStatusType.IN_PROGRESS.getId()) + .or(modelMasterEntity.step2State.eq(TrainStatusType.IN_PROGRESS.getId()))) .fetchOne(); } }