Merge pull request '모델학습 설정 dto 수정' (#13) from feat/training_260202 into develop

Reviewed-on: #13

src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java

@@ -45,6 +45,7 @@ public class DatasetDto {
     private String status;
     private String statusCd;
     private Boolean deleted;
+    private String dataType;
 
     public Basic(
         Long id,
@@ -52,23 +53,29 @@ public class DatasetDto {
         String groupTitle,
         String title,
         Long roundNo,
+        Integer compareYyyy,
+        Integer targetYyyy,
         Long totalSize,
         String memo,
         ZonedDateTime createdDttm,
         String status,
-        Boolean deleted) {
+        Boolean deleted,
+        String dataType) {
       this.id = id;
       this.uuid = uuid;
       this.groupTitle = getGroupTitle(groupTitle);
       this.groupTitleCd = groupTitle;
       this.title = title;
       this.roundNo = roundNo;
+      this.compareYyyy = compareYyyy;
+      this.targetYyyy = targetYyyy;
       this.totalSize = getTotalSize(totalSize);
       this.memo = memo;
       this.createdDttm = createdDttm;
       this.status = getStatus(status);
       this.statusCd = status;
       this.deleted = deleted;
+      this.dataType = dataType;
     }
 
     public String getTotalSize(Long totalSize) {
@@ -86,6 +93,15 @@ public class DatasetDto {
       LearnDataRegister type = Enums.fromId(LearnDataRegister.class, status);
       return type == null ? null : type.getText();
     }
+
+    public String getYear() {
+      return this.compareYyyy + "-" + this.targetYyyy;
+    }
+
+    public String getDataTypeName() {
+      LearnDataType type = Enums.fromId(LearnDataType.class, this.dataType);
+      return type == null ? null : type.getText();
+    }
   }
 
   @Schema(name = "Dataset Detail", description = "데이터셋 상세 정보")

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

@@ -26,13 +26,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-@Tag(name = "모델관리", description = "어드민 홈 > 모델학습관리 > 모델관리 > 목록")
+@Tag(name = "모델학습 관리", description = "어드민 홈 > 모델학습관리 > 모델관리 > 목록")
 @RequestMapping("/api/models")
 public class ModelMngApiController {
   private final ModelMngService modelMngService;
   private final ModelTrainService modelTrainService;
 
-  @Operation(summary = "모델관리 목록 조회", description = "모델관리 목록 조회 API")
+  @Operation(summary = "모델학습 목록 조회", description = "모델학습 목록 조회 API")
   @ApiResponses(
       value = {
         @ApiResponse(

src/main/java/com/kamco/cd/training/postgres/entity/DatasetEntity.java

@@ -42,7 +42,7 @@ public class DatasetEntity {
   private Integer targetYyyy;
 
   @Size(max = 50)
-  @ColumnDefault("'CREATE'")
+  @ColumnDefault("'PRODUCTION'")
   @Column(name = "data_type", length = 50)
   private String dataType;
 
@@ -137,10 +137,13 @@ public class DatasetEntity {
         this.groupTitle,
         this.title,
         this.roundNo,
+        this.compareYyyy,
+        this.targetYyyy,
         this.totalSize,
         this.memo,
         this.createdDttm,
         this.status,
-        this.deleted);
+        this.deleted,
+        this.dataType);
   }
 }