dataset 테이블 수정, 모델학습 설정 dto 추가

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

@@ -9,6 +9,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.UUID;
@@ -29,16 +30,16 @@ public class DatasetEntity {
   @Column(name = "dataset_uid", nullable = false)
   private Long id;
 
-  @Column(name = "uuid", nullable = false)
-  private UUID uuid;
-
   @Size(max = 200)
-  @Column(name = "group_title", length = 200)
+  @NotNull
+  @Column(name = "group_title", nullable = false, length = 200)
   private String groupTitle;
 
-  @Size(max = 10)
-  @Column(name = "data_year", length = 10)
-  private String dataYear;
+  @Column(name = "compare_yyyy", nullable = false)
+  private Integer compareYyyy;
+
+  @Column(name = "target_yyyy", nullable = false)
+  private Integer targetYyyy;
 
   @Size(max = 50)
   @ColumnDefault("'CREATE'")
@@ -65,6 +66,25 @@ public class DatasetEntity {
   @Column(name = "status", length = 20)
   private String status;
 
+  @Size(max = 50)
+  @Column(name = "reg_user_id", length = 50)
+  private String regUserId;
+
+  @ColumnDefault("now()")
+  @Column(name = "reg_dttm")
+  private Instant regDttm;
+
+  @Column(name = "mod_dttm")
+  private Instant modDttm;
+
+  @NotNull
+  @Column(name = "id", nullable = false)
+  private Long id1;
+
+  @Size(max = 50)
+  @Column(name = "created_by", length = 50)
+  private String createdBy;
+
   @NotNull
   @ColumnDefault("now()")
   @Column(name = "created_dttm", nullable = false)
@@ -82,13 +102,34 @@ public class DatasetEntity {
   @Column(name = "total_items")
   private Long totalItems;
 
+  @Size(max = 50)
+  @Column(name = "updated_by", length = 50)
+  private String updatedBy;
+
   @Column(name = "updated_dttm")
   private ZonedDateTime updatedDttm;
 
-  @Column(name = "class_counts", columnDefinition = "jsonb")
+  @NotNull
+  @ColumnDefault("uuid_generate_v4()")
+  @Column(name = "uuid", nullable = false)
+  private UUID uuid;
+
+  @ColumnDefault("0")
+  @Column(name = "total_object_count")
+  private Long totalObjectCount;
+
+  @Size(max = 1000)
+  @Column(name = "dataset_path", length = 1000)
+  private String datasetPath;
+
+  @Column(name = "class_counts")
   @JdbcTypeCode(SqlTypes.JSON)
   private Map<String, Integer> classCounts;
 
+  @Size(max = 255)
+  @Column(name = "uid")
+  private String uid;
+
   public DatasetDto.Basic toDto() {
     return new DatasetDto.Basic(
         this.id,

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

@@ -1,6 +1,6 @@
 package com.kamco.cd.training.postgres.entity;
 
-import com.kamco.cd.training.model.dto.ModelMngDto;
+import com.kamco.cd.training.model.dto.ModelTrainDto;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -90,8 +90,8 @@ public class ModelMasterEntity {
   @Column(name = "train_type")
   private String trainType;
 
-  public ModelMngDto.Basic toDto() {
-    return new ModelMngDto.Basic(
+  public ModelTrainDto.Basic toDto() {
+    return new ModelTrainDto.Basic(
         this.id,
         this.uuid,
         this.modelVer,