관리자 관리 수정, archived 소스 제거

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

@@ -74,7 +74,7 @@ public class MembersCoreService {
     }
 
     if (StringUtils.isNotBlank(updateReq.getStatus())) {
-      memberEntity.setStatus(updateReq.getStatus());
+      memberEntity.changeStatus(updateReq.getStatus());
     }
 
     if (StringUtils.isNotBlank(updateReq.getPassword())) {
@@ -85,11 +85,12 @@ public class MembersCoreService {
       }
 
       String password =
-          CommonStringUtils.hashPassword(updateReq.getPassword(), memberEntity.getPassword());
+          CommonStringUtils.hashPassword(updateReq.getPassword(), memberEntity.getEmployeeNo());
 
       memberEntity.setStatus(StatusType.PENDING.getId());
       memberEntity.setLoginFailCount(0);
       memberEntity.setPassword(password);
+      memberEntity.setPwdResetYn("Y");
     }
     memberEntity.setUpdtrUid(userUtil.getId());
     membersRepository.save(memberEntity);
@@ -110,12 +111,13 @@ public class MembersCoreService {
     }
 
     String password =
-        CommonStringUtils.hashPassword(initReq.getOldPassword(), memberEntity.getPassword());
+        CommonStringUtils.hashPassword(initReq.getOldPassword(), memberEntity.getEmployeeNo());
 
     memberEntity.setPassword(password);
     memberEntity.setStatus(StatusType.ACTIVE.getId());
     memberEntity.setUpdatedDttm(ZonedDateTime.now());
     memberEntity.setUpdtrUid(memberEntity.getId());
+    memberEntity.setPwdResetYn("N");
     membersRepository.save(memberEntity);
   }
 

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

@@ -1,53 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.entity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-import java.time.ZonedDateTime;
-import lombok.Getter;
-import lombok.Setter;
-import org.hibernate.annotations.ColumnDefault;
-
-@Getter
-@Setter
-@Entity
-@Table(name = "tb_member_archived")
-public class MemberArchivedEntity {
-
-  @EmbeddedId private MemberArchivedEntityId id;
-
-  @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 ZonedDateTime createdDttm;
-
-  @NotNull
-  @ColumnDefault("now()")
-  @Column(name = "archived_dttm", nullable = false)
-  private ZonedDateTime archivedDttm;
-}

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

@@ -1,44 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.entity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import jakarta.validation.constraints.NotNull;
-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 MemberArchivedEntityId implements Serializable {
-
-  private static final long serialVersionUID = -7102800377481389036L;
-
-  @NotNull
-  @Column(name = "user_id", nullable = false)
-  private Long userId;
-
-  @NotNull
-  @Column(name = "uuid", nullable = false)
-  private UUID uuid;
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
-      return false;
-    }
-    MemberArchivedEntityId entity = (MemberArchivedEntityId) o;
-    return Objects.equals(this.userId, entity.userId) && Objects.equals(this.uuid, entity.uuid);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(userId, uuid);
-  }
-}

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

@@ -11,6 +11,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.sql.Types;
 import java.time.ZonedDateTime;
+import java.util.Objects;
 import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
@@ -98,4 +99,13 @@ public class MemberEntity {
   @JdbcTypeCode(Types.CHAR)
   @Column(name = "pwd_reset_yn", columnDefinition = "CHAR(1)")
   private String pwdResetYn;
+
+  public void changeStatus(String newStatus) {
+    // 같은 값 보내도 무시
+    if (Objects.equals(this.status, newStatus)) {
+      return;
+    }
+    this.status = newStatus;
+    this.statusChgDttm = ZonedDateTime.now();
+  }
 }

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

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

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

@@ -1,3 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.members;
-
-public interface MembersArchivedRepositoryCustom {}

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

@@ -1,6 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.members;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class MembersArchivedRepositoryImpl implements MembersArchivedRepositoryCustom {}

src/main/resources/application-local.yml

@@ -15,8 +15,8 @@ spring:
         format_sql: true                  # ⚠️ 선택 - SQL 포맷팅 (가독성)
 
   datasource:
-    #url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
+    url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
-    url: jdbc:postgresql://localhost:15432/kamco_cds
+    #url: jdbc:postgresql://localhost:15432/kamco_cds
     username: kamco_cds
     password: kamco_cds_Q!W@E#R$
     hikari: