Merge remote-tracking branch 'origin/feat/training_260202' into feat/training_260202

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

src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java

@@ -99,7 +99,10 @@ public class ModelTestMetricsJobRepositoryImpl extends QuerydslRepositorySupport
         .on(
             modelMetricsTestEntity.model.eq(modelMetricsTrainEntity.model),
             modelMasterEntity.bestEpoch.eq(modelMetricsTrainEntity.epoch))
-        .where(modelMetricsTestEntity.model.id.eq(modelId))
+        .where(
+            modelMetricsTestEntity.model.id.eq(modelId),
+            modelMetricsTestEntity.model1.eq(
+                "best_changed_fscore_epoch_" + modelMasterEntity.bestEpoch))
         .fetchOne();
   }