모델관리 테이블 변경 : mgmt 미사용 -> mng 재사용

src/main/java/com/kamco/cd/kamcoback/model/ModelMgmtApiController.java

@@ -1,43 +0,0 @@
-package com.kamco.cd.kamcoback.model;
-
-import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
-import com.kamco.cd.kamcoback.model.dto.ModelMgmtDto;
-import com.kamco.cd.kamcoback.model.service.ModelMgmtService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.transaction.Transactional;
-import java.time.LocalDate;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@Tag(name = "모델 관리", description = "모델 관리 API")
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/model")
-@Transactional
-public class ModelMgmtApiController {
-
-  private final ModelMgmtService modelMgmtService;
-
-  @Operation(summary = "모델관리 목록")
-  @GetMapping
-  public ApiResponseDto<Page<ModelMgmtDto.ModelList>> findModelMgmtList(
-      @RequestParam(required = false) LocalDate startDate,
-      @RequestParam(required = false) LocalDate endDate,
-      @RequestParam(required = false, defaultValue = "createCompleteDttm") String sortColumn,
-      @RequestParam(required = false) String modelType,
-      @RequestParam(required = false) String searchVal,
-      @RequestParam(defaultValue = "0") int page,
-      @RequestParam(defaultValue = "20") int size) {
-    ModelMgmtDto.searchReq searchReq = new ModelMgmtDto.searchReq(page, size, sortColumn + ",desc");
-
-    Page<ModelMgmtDto.ModelList> result =
-        modelMgmtService.findModelMgmtList(searchReq, startDate, endDate, modelType, searchVal);
-
-    return ApiResponseDto.ok(result);
-  }
-}

src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java

@@ -1,104 +1,42 @@
 package com.kamco.cd.kamcoback.model;
 
-import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
 import com.kamco.cd.kamcoback.model.service.ModelMngService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.transaction.Transactional;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "모델 관리", description = "모델 관리 API")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/model/deprecated")
+@RequestMapping("/api/model")
 @Transactional
-@Deprecated
 public class ModelMngApiController {
 
   private final ModelMngService modelMngService;
 
-  @Operation(summary = "목록 조회", description = "모든 모델 조회")
-  @ApiResponses(
-      value = {
-        @ApiResponse(
-            responseCode = "200",
-            description = "조회 성공",
-            content =
-                @Content(
-                    mediaType = "application/json",
-                    schema = @Schema(implementation = CommonCodeDto.Basic.class))),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-      })
+  @Operation(summary = "모델관리 목록")
   @GetMapping
-  public ApiResponseDto<List<ModelMngDto.Basic>> getFindAll() {
-    return ApiResponseDto.ok(modelMngService.findModelMngAll());
-  }
-
-  /**
-   * 최종 등록 모델 정보
-   *
-   * @return ModelMngDto.FinalModelDto
-   */
-  @Operation(summary = "최종 등록 모델 조회", description = "최종 등록 모델 조회")
-  @GetMapping("/final-model-info")
-  public ApiResponseDto<Optional<ModelMngDto.FinalModelDto>> getFinalModelInfo() {
-    return ApiResponseDto.ok(modelMngService.getFinalModelInfo());
-  }
-
-  /**
-   * 모델 등록 => 모델, 버전 동시 등록 (UI 상 따로 등록하는 곳 없음)
-   *
-   * @param addReq 모델 입력 값
-   * @return ModelVerDto.Basic
-   */
-  @Operation(summary = "모델 등록", description = "모델 등록")
-  @PostMapping
-  public ApiResponseDto<ModelVerDto.Basic> save(@RequestBody ModelMngDto.AddReq addReq) {
-    return ApiResponseDto.createOK(modelMngService.save(addReq));
-  }
-
-  @Operation(summary = "모델 수정", description = "모델 수정")
-  @PutMapping("/{id}")
-  public ApiResponseDto<Long> update(
-      @PathVariable Long id, @RequestBody ModelMngDto.AddReq addReq) {
-    return ApiResponseDto.ok(modelMngService.update(id, addReq));
-  }
-
-  @Operation(summary = "모델 삭제", description = "모델 삭제")
-  @DeleteMapping("/{id}")
-  public ApiResponseDto<Long> delete(@PathVariable Long id) {
-    return ApiResponseDto.deleteOk(modelMngService.delete(id));
-  }
-
-  @Operation(summary = "모델 등록 이력", description = "모델 등록 이력")
-  @GetMapping("/reg-history")
-  public ApiResponseDto<Page<ModelMngDto.ModelRegHistory>> getRegHistoryList(
+  public ApiResponseDto<Page<ModelMngDto.ModelList>> findModelMgmtList(
       @RequestParam(required = false) LocalDate startDate,
       @RequestParam(required = false) LocalDate endDate,
-      @RequestParam int page,
-      @RequestParam(defaultValue = "20") int size,
+      @RequestParam(required = false, defaultValue = "createCompleteDttm") String sortColumn,
+      @RequestParam(required = false) String modelType,
       @RequestParam(required = false) String searchVal,
-      @RequestParam(required = false) String searchColumn) {
-    ModelMngDto.searchReq searchReq =
-        new ModelMngDto.searchReq(
-            page, size, Optional.ofNullable(searchColumn).orElse("createdDate") + ",desc");
-    // searchColumn:: Entity 컬럼명칭으로 -> 기본값 = 등록일 createdDate, (선택) 배포일 deployDttm
+      @RequestParam(defaultValue = "0") int page,
+      @RequestParam(defaultValue = "20") int size) {
+    ModelMngDto.searchReq searchReq = new ModelMngDto.searchReq(page, size, sortColumn + ",desc");
 
-    Page<ModelMngDto.ModelRegHistory> result =
-        modelMngService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
+    Page<ModelMngDto.ModelList> result =
+        modelMngService.findModelMgmtList(searchReq, startDate, endDate, modelType, searchVal);
 
     return ApiResponseDto.ok(result);
   }

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMgmtDto.java

@@ -1,119 +0,0 @@
-package com.kamco.cd.kamcoback.model.dto;
-
-import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.math.BigDecimal;
-import java.time.ZonedDateTime;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-public class ModelMgmtDto {
-
-  @Schema(name = "ModelMgmtDto Basic", description = "모델관리 엔티티 기본 정보")
-  @Getter
-  @NoArgsConstructor
-  public static class Basic {
-
-    private String modelVer;
-    private String hyperVer;
-    private String epochVer;
-    private String dockerFileNm;
-
-    @JsonFormatDttm private ZonedDateTime createCompleteDttm;
-    @JsonFormatDttm private ZonedDateTime recentUseDttm;
-    private Boolean deleted;
-    @JsonFormatDttm private ZonedDateTime createdDttm;
-    private Long createdUid;
-
-    @JsonFormatDttm private ZonedDateTime updatedDttm;
-    private Long updatedUid;
-
-    public Basic(
-        String modelVer,
-        String hyperVer,
-        String epochVer,
-        String dockerFileNm,
-        ZonedDateTime createCompleteDttm,
-        ZonedDateTime recentUseDttm,
-        Boolean deleted,
-        ZonedDateTime createdDttm,
-        Long createdUid,
-        ZonedDateTime updatedDttm,
-        Long updatedUid) {
-      this.modelVer = modelVer;
-      this.hyperVer = hyperVer;
-      this.epochVer = epochVer;
-      this.dockerFileNm = dockerFileNm;
-      this.createCompleteDttm = createCompleteDttm;
-      this.recentUseDttm = recentUseDttm;
-      this.deleted = deleted;
-      this.createdDttm = createdDttm;
-      this.createdUid = createdUid;
-      this.updatedDttm = updatedDttm;
-      this.updatedUid = updatedUid;
-    }
-  }
-
-  @Schema(name = "ModelList", description = "모델관리 목록")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ModelList {
-    private Integer rowNum;
-    private String modelVer;
-    private String dockerFileNm;
-    private String modelType;
-    private String createCompleteDttm;
-    private String recentUseDttm; // TODO: 추론관리 테이블 나오면 분석진행중일 때 사용중으로 리턴하기
-    private BigDecimal f1Score;
-    private BigDecimal precision;
-    private BigDecimal recall;
-    private BigDecimal accuracy;
-    private BigDecimal iou;
-    private Boolean deleted;
-  }
-
-  @Schema(name = "ModelAddReq", description = "모델 등록 req")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class AddReq {
-
-    private String modelType;
-    private String dockerFileNm;
-    private String modelVer;
-    private String hyperVer;
-    private String epochVer;
-  }
-
-  @Schema(name = "searchReq", description = "검색 요청")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class searchReq {
-
-    // 페이징 파라미터
-    private int page = 0;
-    private int size = 20;
-    private String sort;
-
-    public Pageable toPageable() {
-      if (sort != null && !sort.isEmpty()) {
-        String[] sortParams = sort.split(",");
-        String property = sortParams[0];
-        Sort.Direction direction =
-            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
-        return PageRequest.of(page, size, Sort.by(direction, property));
-      }
-      return PageRequest.of(page, size);
-    }
-  }
-}

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngBakDto.java

@@ -0,0 +1,21 @@
+package com.kamco.cd.kamcoback.model.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+public class ModelMngBakDto {
+
+  @Schema(name = "AddReq", description = "등록 req")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class AddReq{
+    private String modelCate;
+    private String modelVer;
+    private String modelPath;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java

@@ -2,7 +2,7 @@ package com.kamco.cd.kamcoback.model.dto;
 
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
 import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -14,98 +14,86 @@ import org.springframework.data.domain.Sort;
 
 public class ModelMngDto {
 
-  @Schema(name = "ModelMng Basic", description = "모델관리 엔티티 기본 정보")
+  @Schema(name = "ModelMgmtDto Basic", description = "모델관리 엔티티 기본 정보")
   @Getter
+  @NoArgsConstructor
   public static class Basic {
 
-    private final Long id;
-    private final String modelNm;
-    private final String modelCate;
-    private final String modelPath;
+    private String modelVer;
+    private String hyperVer;
+    private String epochVer;
+    private String dockerFileNm;
 
-    @JsonFormatDttm private final ZonedDateTime createdDttm;
-    private final Long createdUid;
+    @JsonFormatDttm private ZonedDateTime createCompleteDttm;
+    @JsonFormatDttm private ZonedDateTime recentUseDttm;
+    private Boolean deleted;
+    @JsonFormatDttm private ZonedDateTime createdDttm;
+    private Long createdUid;
 
-    @JsonFormatDttm private final ZonedDateTime updatedDttm;
-    private final Long updatedUid;
-    private final String modelCntnt;
+    @JsonFormatDttm private ZonedDateTime updatedDttm;
+    private Long updatedUid;
 
     public Basic(
-        Long id,
-        String modelNm,
-        String modelCate,
-        String modelPath,
+        String modelVer,
+        String hyperVer,
+        String epochVer,
+        String dockerFileNm,
+        ZonedDateTime createCompleteDttm,
+        ZonedDateTime recentUseDttm,
+        Boolean deleted,
         ZonedDateTime createdDttm,
         Long createdUid,
         ZonedDateTime updatedDttm,
-        Long updatedUid,
-        String modelCntnt) {
-      this.id = id;
-      this.modelNm = modelNm;
-      this.modelCate = modelCate;
-      this.modelPath = modelPath;
+        Long updatedUid) {
+      this.modelVer = modelVer;
+      this.hyperVer = hyperVer;
+      this.epochVer = epochVer;
+      this.dockerFileNm = dockerFileNm;
+      this.createCompleteDttm = createCompleteDttm;
+      this.recentUseDttm = recentUseDttm;
+      this.deleted = deleted;
       this.createdDttm = createdDttm;
       this.createdUid = createdUid;
       this.updatedDttm = updatedDttm;
       this.updatedUid = updatedUid;
-      this.modelCntnt = modelCntnt;
     }
   }
 
-  @Schema(name = "FinalModelDto", description = "최종 등록 모델")
+  @Schema(name = "ModelList", description = "모델관리 목록")
   @Getter
-  public static class FinalModelDto {
-    private final Long modelUid;
-    private final String modelNm;
-    private final String modelCate;
-    private final Long modelVerUid;
-    private final String modelVer;
-    private final String usedState;
-    private final String modelState;
-    private final Double qualityProb;
-    private final String deployState;
-    private final String modelPath;
-
-    public FinalModelDto(
-        Long modelUid,
-        String modelNm,
-        String modelCate,
-        Long modelVerUid,
-        String modelVer,
-        String usedState,
-        String modelState,
-        Double qualityProb,
-        String deployState,
-        String modelPath) {
-      this.modelUid = modelUid;
-      this.modelNm = modelNm;
-      this.modelCate = modelCate;
-      this.modelVerUid = modelVerUid;
-      this.modelVer = modelVer;
-      this.usedState = usedState;
-      this.deployState = deployState;
-      this.modelState = modelState;
-      this.qualityProb = qualityProb;
-      this.modelPath = modelPath;
-    }
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ModelList {
+    private Integer rowNum;
+    private String modelVer;
+    private String dockerFileNm;
+    private String modelType;
+    private String createCompleteDttm;
+    private String recentUseDttm; // TODO: 추론관리 테이블 나오면 분석진행중일 때 사용중으로 리턴하기
+    private BigDecimal f1Score;
+    private BigDecimal precision;
+    private BigDecimal recall;
+    private BigDecimal accuracy;
+    private BigDecimal iou;
+    private Boolean deleted;
   }
 
-  @Schema(name = "ModelAddReq", description = "모델 버전 등록 req")
+  @Schema(name = "ModelAddReq", description = "모델 등록 req")
   @Getter
   @Setter
   @NoArgsConstructor
   @AllArgsConstructor
   public static class AddReq {
 
-    private String modelNm;
-    private String modelCate;
-    private String modelPath;
-
-    @NotEmpty private String modelVer;
-    private String modelCntnt;
+    private String modelType;
+    private String dockerFileNm;
+    private String modelVer;
+    private String hyperVer;
+    private String epochVer;
   }
 
-  @Schema(name = "searchReq", description = "등록이력보기 검색 요청")
+  @Schema(name = "searchReq", description = "검색 요청")
   @Getter
   @Setter
   @NoArgsConstructor
@@ -128,29 +116,4 @@ public class ModelMngDto {
       return PageRequest.of(page, size);
     }
   }
-
-  @Schema(name = "ModelRegHistory", description = "모델 등록 이력")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ModelRegHistory {
-    private String modelNm;
-    private String modelCate;
-    private String modelVer;
-    private String strCreatedDttm;
-    private String usedState;
-    private String deployState;
-    private String strDeployDttm;
-  }
-
-  @Schema(name = "ModelDmlReturn", description = "모델 등록/수정/삭제 리턴")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ModelDmlReturn {
-    private String execStatus;
-    private String message;
-  }
 }

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMgmtService.java

@@ -1,25 +0,0 @@
-package com.kamco.cd.kamcoback.model.service;
-
-import com.kamco.cd.kamcoback.model.dto.ModelMgmtDto;
-import com.kamco.cd.kamcoback.postgres.core.ModelMgmtCoreService;
-import java.time.LocalDate;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class ModelMgmtService {
-
-  private final ModelMgmtCoreService modelMgmtCoreService;
-
-  public Page<ModelMgmtDto.ModelList> findModelMgmtList(
-      ModelMgmtDto.searchReq searchReq,
-      LocalDate startDate,
-      LocalDate endDate,
-      String modelType,
-      String searchVal) {
-    return modelMgmtCoreService.findModelMgmtList(
-        searchReq, startDate, endDate, modelType, searchVal);
-  }
-}

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

@@ -1,45 +1,25 @@
 package com.kamco.cd.kamcoback.model.service;
 
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
 import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class ModelMngService {
 
   private final ModelMngCoreService modelMngCoreService;
 
-  public List<ModelMngDto.Basic> findModelMngAll() {
-    return modelMngCoreService.findModelMngAll();
-  }
-
-  public Optional<ModelMngDto.FinalModelDto> getFinalModelInfo() {
-    return modelMngCoreService.getFinalModelInfo();
-  }
-
-  public ModelVerDto.Basic save(ModelMngDto.AddReq addReq) {
-    return modelMngCoreService.save(addReq);
-  }
-
-  public Long update(Long id, ModelMngDto.AddReq addReq) {
-    return modelMngCoreService.update(id, addReq);
-  }
-
-  public Long delete(Long id) {
-    return modelMngCoreService.delete(id);
-  }
-
-  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(
-      ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
-    return modelMngCoreService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
+  public Page<ModelMngDto.ModelList> findModelMgmtList(
+      ModelMngDto.searchReq searchReq,
+      LocalDate startDate,
+      LocalDate endDate,
+      String modelType,
+      String searchVal) {
+    return modelMngCoreService.findModelMgmtList(
+        searchReq, startDate, endDate, modelType, searchVal);
   }
 }