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

src/main/java/com/kamco/cd/training/auth/JwtAuthenticationFilter.java

@@ -23,7 +23,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
   private final UserDetailsService userDetailsService;
   private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
   private static final String[] EXCLUDE_PATHS = {
-    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout", "/api/members/*/password"
+    //    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout", "/api/members/*/password"
+    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout"
   };
 
   @Override

src/main/java/com/kamco/cd/training/config/SecurityConfig.java

@@ -76,13 +76,13 @@ public class SecurityConfig {
                         "/api/auth/logout",
                         "/swagger-ui/**",
                         "/v3/api-docs/**",
-                        "/api/members/*/password",
                         "/api/upload/chunk-upload-dataset",
                         "/api/upload/chunk-upload-complete",
                         "/download_progress_test.html",
                         "/api/models/download/**")
                     .permitAll()
-
+                    .requestMatchers("/api/members/*/password")
+                    .authenticated()
                     // default
                     .anyRequest()
                     .authenticated())

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

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