From ad421e3c74c4b47dcde104b594bad02b49d0d191 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 20 Feb 2026 11:36:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20security=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kamco/cd/training/auth/JwtAuthenticationFilter.java | 3 ++- .../java/com/kamco/cd/training/config/SecurityConfig.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/auth/JwtAuthenticationFilter.java b/src/main/java/com/kamco/cd/training/auth/JwtAuthenticationFilter.java index 57c0df6..a997eb9 100644 --- a/src/main/java/com/kamco/cd/training/auth/JwtAuthenticationFilter.java +++ b/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 diff --git a/src/main/java/com/kamco/cd/training/config/SecurityConfig.java b/src/main/java/com/kamco/cd/training/config/SecurityConfig.java index 0f4068f..dd5ba6d 100644 --- a/src/main/java/com/kamco/cd/training/config/SecurityConfig.java +++ b/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()) From 68c0e634c522d1533c0e6c48a2ffd3c0bbc02c8b Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 20 Feb 2026 12:05:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?ing-cnt=20=EB=A1=9C=EC=A7=81=EC=97=90=20ste?= =?UTF-8?q?p2=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(); } } From 62c9d73b94de276dc5811bd16f8e9ce07b02eeba Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 20 Feb 2026 12:20:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?test=20json=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/train/ModelTestMetricsJobRepositoryImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java index 065d0a6..9037656 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java +++ b/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(); }