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(

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);
   }

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();
   }
 }