데이터셋 등록 추가

src/main/java/com/kamco/cd/training/model/service/ModelMngService.java

@@ -1,54 +0,0 @@
-package com.kamco.cd.training.model.service;
-
-import com.kamco.cd.training.model.dto.ModelMngDto;
-import com.kamco.cd.training.model.dto.ModelTrainDto;
-import com.kamco.cd.training.model.dto.ModelTrainDto.SearchReq;
-import com.kamco.cd.training.postgres.core.ModelMngCoreService;
-import java.util.UUID;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Slf4j
-public class ModelMngService {
-
-  private final ModelMngCoreService modelMngCoreService;
-
-  /**
-   * 모델 목록 조회
-   *
-   * @param searchReq 검색 조건
-   * @return 페이징 처리된 모델 목록
-   */
-  public Page<ModelTrainDto.Basic> getModelList(SearchReq searchReq) {
-    return modelMngCoreService.findByModelList(searchReq);
-  }
-
-  /**
-   * 학습모델 삭제
-   *
-   * @param uuid
-   */
-  public void deleteModelTrain(UUID uuid) {
-    modelMngCoreService.deleteModel(uuid);
-  }
-
-  public String createModelTrain(ModelMngDto modelMngDto) {
-    return null;
-  }
-
-  /**
-   * 모델 상세 조회
-   *
-   * @param modelUid 모델 UID
-   * @return 모델 상세 정보
-   */
-  public ModelMngDto.Detail getModelDetail(Long modelUid) {
-    return modelMngCoreService.getModelDetail(modelUid);
-  }
-}

src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java

@@ -0,0 +1,87 @@
+package com.kamco.cd.training.model.service;
+
+import com.kamco.cd.training.common.dto.HyperParam;
+import com.kamco.cd.training.common.enums.HyperParamSelectType;
+import com.kamco.cd.training.hyperparam.dto.HyperParamDto;
+import com.kamco.cd.training.model.dto.ModelMngDto;
+import com.kamco.cd.training.model.dto.ModelTrainMngDto;
+import com.kamco.cd.training.model.dto.ModelTrainMngDto.SearchReq;
+import com.kamco.cd.training.postgres.core.HyperParamCoreService;
+import com.kamco.cd.training.postgres.core.ModelTrainMngCoreService;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Slf4j
+public class ModelTrainMngService {
+
+  private final ModelTrainMngCoreService modelTrainMngCoreService;
+  private final HyperParamCoreService hyperParamCoreService;
+
+  /**
+   * 모델학습 조회
+   *
+   * @param searchReq 검색 조건
+   * @return 페이징 처리된 모델 목록
+   */
+  public Page<ModelTrainMngDto.Basic> getModelList(SearchReq searchReq) {
+    return modelTrainMngCoreService.findByModelList(searchReq);
+  }
+
+  /**
+   * 모델학습 삭제
+   *
+   * @param uuid
+   */
+  public void deleteModelTrain(UUID uuid) {
+    modelTrainMngCoreService.deleteModel(uuid);
+  }
+
+  /**
+   * 모델학습 등록
+   *
+   * @param req
+   * @return
+   */
+  @Transactional
+  public void createModelTrain(ModelTrainMngDto.AddReq req) {
+    HyperParam hyperParam = req.getHyperParam();
+    HyperParamDto.Basic hyper = new HyperParamDto.Basic();
+
+    /** OPTIMIZED(최적화 파라미터), EXISTING(기존 파라미터), NEW(신규 파라미터) * */
+    if (HyperParamSelectType.NEW.getId().equals(req.getHyperParamType())) {
+      // 하이퍼파라미터 등록
+      hyper = hyperParamCoreService.createHyperParam(hyperParam);
+      req.setHyperUuid(hyper.getUuid());
+    }
+
+    // 모델학습 테이블 저장
+    Long modelId = modelTrainMngCoreService.saveModel(req);
+
+    // 모델학습 데이터셋 저장
+    modelTrainMngCoreService.saveModelDataset(modelId, req);
+
+    // 모델 데이터셋 mapping 저장
+    modelTrainMngCoreService.saveModelDatasetMap(
+        modelId, req.getTrainingDataset().getDatasetList());
+
+    // 모델 config 저장
+    modelTrainMngCoreService.saveModelConfig(modelId, req.getModelConfig());
+  }
+
+  /**
+   * 모델학습 상세 조회
+   *
+   * @param modelUid 모델 UID
+   * @return 모델 상세 정보
+   */
+  public ModelMngDto.Detail getModelDetail(Long modelUid) {
+    return modelTrainMngCoreService.getModelDetail(modelUid);
+  }
+}

src/main/java/com/kamco/cd/training/model/service/ModelTrainService.java

@@ -4,7 +4,7 @@ import com.kamco.cd.training.common.exception.BadRequestException;
 import com.kamco.cd.training.common.exception.NotFoundException;
 import com.kamco.cd.training.model.dto.ModelMngDto;
 import com.kamco.cd.training.postgres.core.DatasetCoreService;
-import com.kamco.cd.training.postgres.core.ModelMngCoreService;
+import com.kamco.cd.training.postgres.core.ModelTrainMngCoreService;
 import com.kamco.cd.training.postgres.core.SystemMetricsCoreService;
 import com.kamco.cd.training.postgres.entity.ModelMasterEntity;
 import java.util.List;
@@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 public class ModelTrainService {
 
-  private final ModelMngCoreService modelMngCoreService;
+  private final ModelTrainMngCoreService modelMngCoreService;
   private final DatasetCoreService datasetCoreService;
   private final SystemMetricsCoreService systemMetricsCoreService;