Merge branch 'feat/dev_251201' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetMngEntity.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetMngHstEntity.java

@@ -3,11 +3,10 @@ package com.kamco.cd.kamcoback.postgres.entity;
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
 import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import jakarta.persistence.*;
+import java.time.ZonedDateTime;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.ZonedDateTime;
-
 @Getter
 @Setter
 @Entity

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java

@@ -0,0 +1,60 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_member_archived")
+public class MemberArchivedEntity {
+
+  @Id
+  @Column(name = "uuid", nullable = false)
+  private UUID id;
+
+  @NotNull
+  @Column(name = "id", nullable = false)
+  private Long id1;
+
+  @Size(max = 50)
+  @Column(name = "employee_no", length = 50)
+  private String employeeNo;
+
+  @Size(max = 100)
+  @NotNull
+  @Column(name = "name", nullable = false, length = 100)
+  private String name;
+
+  @Size(max = 255)
+  @NotNull
+  @Column(name = "password", nullable = false)
+  private String password;
+
+  @Size(max = 100)
+  @NotNull
+  @Column(name = "email", nullable = false, length = 100)
+  private String email;
+
+  @Size(max = 20)
+  @Column(name = "status", length = 20)
+  private String status;
+
+  @NotNull
+  @Column(name = "created_dttm", nullable = false)
+  private OffsetDateTime createdDttm;
+
+  @NotNull
+  @ColumnDefault("now()")
+  @Column(name = "archived_dttm", nullable = false)
+  private OffsetDateTime archivedDttm;
+}

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java

@@ -0,0 +1,65 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_member")
+public class MemberEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id", nullable = false)
+  private Long id;
+
+  @Column(name = "uuid", nullable = false, insertable = false)
+  private UUID uuid;
+
+  @Size(max = 50)
+  @Column(name = "employee_no", length = 50)
+  private String employeeNo;
+
+  @Size(max = 100)
+  @NotNull
+  @Column(name = "name", nullable = false, length = 100)
+  private String name;
+
+  @Size(max = 255)
+  @NotNull
+  @Column(name = "password", nullable = false)
+  private String password;
+
+  @Size(max = 100)
+  @Column(name = "email", length = 100)
+  private String email;
+
+  @Size(max = 20)
+  @ColumnDefault("'ACTIVE'")
+  @Column(name = "status", length = 20)
+  private String status = "ACTIVE";
+
+  @Column(name = "created_dttm", nullable = false, insertable = false)
+  private ZonedDateTime createdDttm;
+
+  @Column(name = "updated_dttm", nullable = false, insertable = false)
+  private ZonedDateTime updatedDttm;
+
+  @OneToMany(mappedBy = "memberUuid")
+  private Set<MemberRoleEntity> tbMemberRoles = new LinkedHashSet<>();
+}

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberRoleEntity.java

@@ -0,0 +1,37 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.time.ZonedDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_member_role")
+public class MemberRoleEntity {
+
+  @EmbeddedId private MemberRoleEntityId id;
+
+  @ManyToOne(fetch = FetchType.LAZY, optional = false)
+  @OnDelete(action = OnDeleteAction.CASCADE)
+  @JoinColumn(
+      name = "member_uuid",
+      referencedColumnName = "uuid",
+      insertable = false,
+      updatable = false)
+  private MemberEntity memberUuid;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm;
+}

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberRoleEntityId.java

@@ -0,0 +1,47 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.Hibernate;
+
+@Getter
+@Setter
+@Embeddable
+public class MemberRoleEntityId implements Serializable {
+
+  private static final long serialVersionUID = 9130416001060414347L;
+
+  @NotNull
+  @Column(name = "member_uuid", nullable = false)
+  private UUID memberUuid;
+
+  @Size(max = 50)
+  @NotNull
+  @Column(name = "role_name", nullable = false, length = 50)
+  private String roleName;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
+      return false;
+    }
+    MemberRoleEntityId entity = (MemberRoleEntityId) o;
+    return Objects.equals(this.memberUuid, entity.memberUuid)
+        && Objects.equals(this.roleName, entity.roleName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(memberUuid, roleName);
+  }
+}