모델관리 목록, 삭제 API 수정된 버전 커밋

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

@@ -16,41 +16,70 @@ import org.springframework.data.domain.Sort;
 
 public class ModelMngDto {
 
+  @CodeExpose
+  @Getter
+  @AllArgsConstructor
+  public enum ModelType implements EnumType {
+    M1("모델 M1"),
+    M2("모델 M2"),
+    M3("모델 M3");
+
+    private final String desc;
+
+    @Override
+    public String getId() {
+      return name();
+    }
+
+    @Override
+    public String getText() {
+      return desc;
+    }
+  }
+
   @Schema(name = "ModelMgmtDto Basic", description = "모델관리 엔티티 기본 정보")
   @Getter
   @NoArgsConstructor
   public static class Basic {
 
+    private Long modelUid;
     private String modelVer;
-    private String hyperVer;
-    private String epochVer;
-    private String dockerFileNm;
 
-    @JsonFormatDttm private ZonedDateTime createCompleteDttm;
-    @JsonFormatDttm private ZonedDateTime recentUseDttm;
+    @JsonFormatDttm
+    private ZonedDateTime createCompleteDttm;
+    @JsonFormatDttm
+    private ZonedDateTime recentUseDttm;
     private Boolean deleted;
-    @JsonFormatDttm private ZonedDateTime createdDttm;
+    @JsonFormatDttm
+    private ZonedDateTime createdDttm;
     private Long createdUid;
 
-    @JsonFormatDttm private ZonedDateTime updatedDttm;
+    @JsonFormatDttm
+    private ZonedDateTime updatedDttm;
     private Long updatedUid;
 
+    private String modelType;
+    private String filePath;
+    private String fileName;
+    private String memo;
+
     public Basic(
-        String modelVer,
-        String hyperVer,
-        String epochVer,
-        String dockerFileNm,
-        ZonedDateTime createCompleteDttm,
-        ZonedDateTime recentUseDttm,
-        Boolean deleted,
-        ZonedDateTime createdDttm,
-        Long createdUid,
-        ZonedDateTime updatedDttm,
-        Long updatedUid) {
+      Long modelUid,
+      String modelVer,
+      ZonedDateTime createCompleteDttm,
+      ZonedDateTime recentUseDttm,
+      Boolean deleted,
+      ZonedDateTime createdDttm,
+      Long createdUid,
+      ZonedDateTime updatedDttm,
+      Long updatedUid,
+      String modelType,
+      String filePath,
+      String fileName,
+      String memo
+    ) {
+      this.modelUid = modelUid;
       this.modelVer = modelVer;
-      this.hyperVer = hyperVer;
-      this.epochVer = epochVer;
-      this.dockerFileNm = dockerFileNm;
       this.createCompleteDttm = createCompleteDttm;
       this.recentUseDttm = recentUseDttm;
       this.deleted = deleted;
@@ -58,6 +87,10 @@ public class ModelMngDto {
       this.createdUid = createdUid;
       this.updatedDttm = updatedDttm;
       this.updatedUid = updatedUid;
+      this.modelType = modelType;
+      this.filePath = filePath;
+      this.fileName = fileName;
+      this.memo = memo;
     }
   }
 
@@ -67,17 +100,18 @@ public class ModelMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class ModelList {
+
     private Integer rowNum;
     private String modelVer;
     private String fileName;
     private String modelType;
     private String createCompleteDttm;
-    private String recentUseDttm;
     private BigDecimal f1Score;
     private BigDecimal precision;
     private BigDecimal recall;
     private BigDecimal accuracy;
     private BigDecimal iou;
+    private String memo;
     private Boolean deleted;
   }
 
@@ -112,31 +146,10 @@ public class ModelMngDto {
         String[] sortParams = sort.split(",");
         String property = sortParams[0];
         Sort.Direction direction =
-            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
+          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);
     }
   }
-
-  @CodeExpose
-  @Getter
-  @AllArgsConstructor
-  public enum ModelType implements EnumType {
-    M1("모델 M1"),
-    M2("모델 M2"),
-    M3("모델 M3");
-
-    private final String desc;
-
-    @Override
-    public String getId() {
-      return name();
-    }
-
-    @Override
-    public String getText() {
-      return desc;
-    }
-  }
 }