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/core/MapSheetMngCoreService.java

@@ -7,15 +7,14 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 @RequiredArgsConstructor
 public class MapSheetMngCoreService {
 
   private final MapSheetMngRepository mapSheetMngRepository;
 
-  public Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(MapSheetMngDto.@Valid searchReq searchReq) {
+  public Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(
+      MapSheetMngDto.@Valid searchReq searchReq) {
     return mapSheetMngRepository.findMapSheetErrorList(searchReq);
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java

@@ -0,0 +1,108 @@
+package com.kamco.cd.kamcoback.postgres.core;
+
+import com.kamco.cd.kamcoback.members.dto.MembersDto;
+import com.kamco.cd.kamcoback.members.exception.MemberException;
+import com.kamco.cd.kamcoback.members.exception.MemberException.MemberNotFoundException;
+import com.kamco.cd.kamcoback.postgres.entity.MemberEntity;
+import com.kamco.cd.kamcoback.postgres.entity.MemberRoleEntity;
+import com.kamco.cd.kamcoback.postgres.entity.MemberRoleEntityId;
+import com.kamco.cd.kamcoback.postgres.repository.members.MembersRepository;
+import com.kamco.cd.kamcoback.postgres.repository.members.MembersRoleRepository;
+import java.time.ZonedDateTime;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class MembersCoreService {
+
+  private final MembersRepository membersRepository;
+  private final MembersRoleRepository memberRoleRepository;
+
+  /**
+   * 회원가입
+   *
+   * @param addReq
+   * @return
+   */
+  public Long saveMembers(MembersDto.AddReq addReq) {
+    if (membersRepository.findByEmployeeNo(addReq.getEmployeeNo())) {
+      throw new MemberException.DuplicateMemberException(
+          MemberException.DuplicateMemberException.Field.EMPLOYEE_NO, addReq.getEmployeeNo());
+    }
+
+    if (membersRepository.findByEmail(addReq.getEmail())) {
+      throw new MemberException.DuplicateMemberException(
+          MemberException.DuplicateMemberException.Field.EMAIL, addReq.getEmail());
+    }
+
+    MemberEntity memberEntity = new MemberEntity();
+    memberEntity.setEmployeeNo(addReq.getEmployeeNo());
+    memberEntity.setName(addReq.getName());
+    memberEntity.setPassword(addReq.getPassword());
+    memberEntity.setEmail(addReq.getEmail());
+
+    return membersRepository.save(memberEntity).getId();
+  }
+
+  /**
+   * 역할 추가
+   *
+   * @param rolesDto
+   */
+  public void saveRoles(MembersDto.RolesDto rolesDto) {
+
+    MemberEntity memberEntity =
+        membersRepository
+            .findByUUID(rolesDto.getUuid())
+            .orElseThrow(() -> new MemberNotFoundException());
+
+    if (memberRoleRepository.findByUuidAndRoleName(rolesDto)) {
+      throw new MemberException.DuplicateMemberException(
+          MemberException.DuplicateMemberException.Field.DEFAULT, "중복된 역할이 있습니다.");
+    }
+
+    MemberRoleEntityId memberRoleEntityId = new MemberRoleEntityId();
+    memberRoleEntityId.setMemberUuid(rolesDto.getUuid());
+    memberRoleEntityId.setRoleName(rolesDto.getRoleName());
+
+    MemberRoleEntity memberRoleEntity = new MemberRoleEntity();
+    memberRoleEntity.setId(memberRoleEntityId);
+    memberRoleEntity.setMemberUuid(memberEntity);
+    memberRoleEntity.setCreatedDttm(ZonedDateTime.now());
+    memberRoleRepository.save(memberRoleEntity);
+  }
+
+  /**
+   * 역할 삭제
+   *
+   * @param rolesDto
+   */
+  public void deleteRoles(MembersDto.RolesDto rolesDto) {
+    MemberEntity memberEntity =
+        membersRepository
+            .findByUUID(rolesDto.getUuid())
+            .orElseThrow(() -> new MemberNotFoundException());
+
+    MemberRoleEntityId memberRoleEntityId = new MemberRoleEntityId();
+    memberRoleEntityId.setMemberUuid(rolesDto.getUuid());
+    memberRoleEntityId.setRoleName(rolesDto.getRoleName());
+
+    MemberRoleEntity memberRoleEntity = new MemberRoleEntity();
+    memberRoleEntity.setId(memberRoleEntityId);
+    memberRoleEntity.setMemberUuid(memberEntity);
+
+    memberRoleRepository.delete(memberRoleEntity);
+  }
+
+  /**
+   * 회원목록 조회
+   *
+   * @param searchReq
+   * @return
+   */
+  public Page<MembersDto.Basic> findByMembers(MembersDto.SearchReq searchReq) {
+    return membersRepository.findByMembers(searchReq);
+  }
+}

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);
+  }
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepository.java

@@ -3,4 +3,5 @@ package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface MapSheetMngRepository extends JpaRepository<MapSheetMngEntity, Long>, MapSheetMngRepositoryCustom {}
+public interface MapSheetMngRepository
+    extends JpaRepository<MapSheetMngEntity, Long>, MapSheetMngRepositoryCustom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepository.java

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.postgres.entity.MemberEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MembersRepository
+    extends JpaRepository<MemberEntity, Long>, MembersRepositoryCustom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryCustom.java

@@ -0,0 +1,19 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.members.dto.MembersDto;
+import com.kamco.cd.kamcoback.members.dto.MembersDto.Basic;
+import com.kamco.cd.kamcoback.postgres.entity.MemberEntity;
+import java.util.Optional;
+import java.util.UUID;
+import org.springframework.data.domain.Page;
+
+public interface MembersRepositoryCustom {
+
+  boolean findByEmployeeNo(String employeeNo);
+
+  boolean findByEmail(String email);
+
+  Page<Basic> findByMembers(MembersDto.SearchReq searchReq);
+
+  Optional<MemberEntity> findByUUID(UUID uuid);
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java

@@ -0,0 +1,145 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.members.dto.MembersDto;
+import com.kamco.cd.kamcoback.members.dto.MembersDto.Basic;
+import com.kamco.cd.kamcoback.members.dto.RoleType;
+import com.kamco.cd.kamcoback.postgres.entity.MemberEntity;
+import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity;
+import com.kamco.cd.kamcoback.postgres.entity.QMemberRoleEntity;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class MembersRepositoryImpl implements MembersRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  private final QMemberEntity memberEntity = QMemberEntity.memberEntity;
+  private final QMemberRoleEntity memberRoleEntity = QMemberRoleEntity.memberRoleEntity;
+
+  /**
+   * 사원번호 조회
+   *
+   * @param employeeNo
+   * @return
+   */
+  @Override
+  public boolean findByEmployeeNo(String employeeNo) {
+    return queryFactory
+            .selectOne()
+            .from(memberEntity)
+            .where(memberEntity.employeeNo.eq(employeeNo))
+            .fetchFirst()
+        != null;
+  }
+
+  /**
+   * 이메일 조회
+   *
+   * @param email
+   * @return
+   */
+  @Override
+  public boolean findByEmail(String email) {
+    return queryFactory
+            .selectOne()
+            .from(memberEntity)
+            .where(memberEntity.email.eq(email))
+            .fetchFirst()
+        != null;
+  }
+
+  /**
+   * 회원정보 목록 조회
+   *
+   * @param searchReq
+   * @return
+   */
+  @Override
+  public Page<Basic> findByMembers(MembersDto.SearchReq searchReq) {
+    Pageable pageable = searchReq.toPageable();
+    BooleanBuilder builder = new BooleanBuilder();
+    BooleanBuilder leftBuilder = new BooleanBuilder();
+
+    if (searchReq.getField() != null && !searchReq.getField().isEmpty()) {
+      switch (searchReq.getField()) {
+        case "name" ->
+            builder.and(memberEntity.name.containsIgnoreCase(searchReq.getKeyword().trim()));
+        case "email" ->
+            builder.and(memberEntity.email.containsIgnoreCase(searchReq.getKeyword().trim()));
+        case "employeeNo" ->
+            builder.and(memberEntity.employeeNo.containsIgnoreCase(searchReq.getKeyword().trim()));
+      }
+    }
+
+    List<String> roles = new ArrayList<>();
+    // 라벨러
+    if (searchReq.isLabeler()) {
+      roles.add(RoleType.ROLE_LABELER.getId());
+    }
+
+    // 시스템 전체 관리자
+    if (searchReq.isAdmin()) {
+      roles.add(RoleType.ROLE_ADMIN.getId());
+    }
+
+    // 검수자
+    if (searchReq.isReviewer()) {
+      roles.add(RoleType.ROLE_REVIEWER.getId());
+    }
+
+    // 역할 in 조건 추가
+    if (!roles.isEmpty()) {
+      leftBuilder.and(memberRoleEntity.id.roleName.in(roles));
+    }
+
+    List<MembersDto.Basic> content =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    MembersDto.Basic.class,
+                    memberEntity.id,
+                    memberEntity.uuid,
+                    memberEntity.employeeNo,
+                    memberEntity.name,
+                    memberEntity.email,
+                    memberEntity.status,
+                    memberRoleEntity.id.roleName,
+                    memberEntity.createdDttm,
+                    memberEntity.updatedDttm))
+            .from(memberEntity)
+            .leftJoin(memberRoleEntity)
+            .on(memberRoleEntity.memberUuid.uuid.eq(memberEntity.uuid).and(leftBuilder))
+            .where(builder)
+            .offset(pageable.getOffset())
+            .limit(pageable.getPageSize())
+            .orderBy(memberEntity.createdDttm.desc())
+            .fetch();
+
+    long total =
+        queryFactory
+            .select(memberEntity)
+            .from(memberEntity)
+            .leftJoin(memberRoleEntity)
+            .on(memberRoleEntity.memberUuid.uuid.eq(memberEntity.uuid).and(leftBuilder))
+            .fetchCount();
+
+    return new PageImpl<>(content, pageable, total);
+  }
+
+  @Override
+  public Optional<MemberEntity> findByUUID(UUID uuid) {
+    return Optional.ofNullable(
+        queryFactory.selectFrom(memberEntity).where(memberEntity.uuid.eq(uuid)).fetchOne());
+  }
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRoleRepository.java

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.postgres.entity.MemberRoleEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MembersRoleRepository
+    extends JpaRepository<MemberRoleEntity, Long>, MembersRoleRepositoryCutom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRoleRepositoryCutom.java

@@ -0,0 +1,8 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.members.dto.MembersDto;
+
+public interface MembersRoleRepositoryCutom {
+
+  boolean findByUuidAndRoleName(MembersDto.RolesDto rolesDto);
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRoleRepositoryImpl.java

@@ -0,0 +1,30 @@
+package com.kamco.cd.kamcoback.postgres.repository.members;
+
+import com.kamco.cd.kamcoback.members.dto.MembersDto;
+import com.kamco.cd.kamcoback.postgres.entity.QMemberRoleEntity;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class MembersRoleRepositoryImpl implements MembersRoleRepositoryCutom {
+
+  private final JPAQueryFactory queryFactory;
+  private final QMemberRoleEntity memberRoleEntity = QMemberRoleEntity.memberRoleEntity;
+
+  @Override
+  public boolean findByUuidAndRoleName(MembersDto.RolesDto rolesDto) {
+    return queryFactory
+            .select(memberRoleEntity)
+            .from(memberRoleEntity)
+            .where(
+                memberRoleEntity
+                    .id
+                    .memberUuid
+                    .eq(rolesDto.getUuid())
+                    .and(memberRoleEntity.id.roleName.eq(rolesDto.getRoleName())))
+            .fetchOne()
+        != null;
+  }
+}