From b180e0eab568043d6b2478ee550508b68bf0352d Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 15 Dec 2025 11:21:40 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95,=20archived=20=EC=86=8C=EC=8A=A4?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../postgres/core/MembersCoreService.java | 8 +-- .../postgres/entity/MemberArchivedEntity.java | 53 ------------------- .../entity/MemberArchivedEntityId.java | 44 --------------- .../postgres/entity/MemberEntity.java | 10 ++++ .../members/MembersArchivedRepository.java | 7 --- .../MembersArchivedRepositoryCustom.java | 3 -- .../MembersArchivedRepositoryImpl.java | 6 --- src/main/resources/application-local.yml | 4 +- 8 files changed, 17 insertions(+), 118 deletions(-) delete mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java delete mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntityId.java delete mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepository.java delete mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryCustom.java delete mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryImpl.java diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java index d2ec60f2..1c3ffbd0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java +++ b/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); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java deleted file mode 100644 index 8a1281aa..00000000 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntityId.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntityId.java deleted file mode 100644 index 6e525254..00000000 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntityId.java +++ /dev/null @@ -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); - } -} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java index 19de1956..f0ec2048 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java +++ b/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(); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepository.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepository.java deleted file mode 100644 index f674888f..00000000 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepository.java +++ /dev/null @@ -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, MembersArchivedRepositoryCustom {} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryCustom.java deleted file mode 100644 index 65846fcc..00000000 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryCustom.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.kamco.cd.kamcoback.postgres.repository.members; - -public interface MembersArchivedRepositoryCustom {} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryImpl.java deleted file mode 100644 index 4802a918..00000000 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersArchivedRepositoryImpl.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.kamco.cd.kamcoback.postgres.repository.members; - -import org.springframework.stereotype.Repository; - -@Repository -public class MembersArchivedRepositoryImpl implements MembersArchivedRepositoryCustom {} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 7b211531..78387204 100644 --- a/src/main/resources/application-local.yml +++ b/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://localhost:15432/kamco_cds + url: jdbc:postgresql://192.168.2.127:15432/kamco_cds + #url: jdbc:postgresql://localhost:15432/kamco_cds username: kamco_cds password: kamco_cds_Q!W@E#R$ hikari: