데이터셋 API 커밋

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

@@ -9,7 +9,6 @@ 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;
@@ -66,24 +65,6 @@ 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;
-
-  @Column(name = "id")
-  private Long id1;
-
-  @Size(max = 50)
-  @Column(name = "created_by", length = 50)
-  private String createdBy;
-
   @NotNull
   @ColumnDefault("now()")
   @Column(name = "created_dttm", nullable = false)
@@ -101,17 +82,9 @@ 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;
 
-  @Size(max = 4)
-  @Column(name = "year", length = 4)
-  private String year;
-
   @Column(name = "class_counts", columnDefinition = "jsonb")
   @JdbcTypeCode(SqlTypes.JSON)
   private Map<String, Integer> classCounts;

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

@@ -0,0 +1,100 @@
+package com.kamco.cd.training.postgres.entity;
+
+import com.kamco.cd.training.dataset.dto.DatasetObjDto;
+import com.kamco.cd.training.dataset.dto.DatasetObjDto.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_dataset_obj")
+public class DatasetObjEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "obj_id", nullable = false)
+  private Long objId;
+
+  @NotNull
+  @Column(name = "dataset_uid", nullable = false)
+  private Long datasetUid;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Size(max = 255)
+  @Column(name = "target_class_cd")
+  private String targetClassCd;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Size(max = 255)
+  @Column(name = "compare_class_cd")
+  private String compareClassCd;
+
+  @Size(max = 255)
+  @Column(name = "target_path")
+  private String targetPath;
+
+  @Size(max = 255)
+  @Column(name = "compare_path")
+  private String comparePath;
+
+  @Size(max = 255)
+  @Column(name = "label_path")
+  private String labelPath;
+
+  @Size(max = 255)
+  @Column(name = "geojson_path")
+  private String geojsonPath;
+
+  @Size(max = 255)
+  @Column(name = "map_sheet_num")
+  private String mapSheetNum;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm;
+
+  @Column(name = "created_uid")
+  private Long createdUid;
+
+  @ColumnDefault("false")
+  @Column(name = "deleted")
+  private Boolean deleted;
+
+  @Column(name = "uuid")
+  private UUID uuid;
+
+  public Basic toDto() {
+    return new DatasetObjDto.Basic(
+        this.objId,
+        this.datasetUid,
+        this.targetYyyy,
+        this.targetClassCd,
+        this.compareYyyy,
+        this.compareClassCd,
+        this.targetPath,
+        this.comparePath,
+        this.labelPath,
+        this.geojsonPath,
+        this.mapSheetNum,
+        this.createdDttm,
+        this.createdUid,
+        this.deleted,
+        this.uuid);
+  }
+}