From 82e7886096e972b789361b2c26c1a1e9cc467c0b Mon Sep 17 00:00:00 2001 From: bjkim Date: Fri, 1 Aug 2025 13:44:33 +0900 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20USER=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/jwt/entity/ProjectEntity.java | 54 +++++++++++++++++++ .../kr/re/etri/security/jwt/models/User.java | 7 +-- 2 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java diff --git a/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java b/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java new file mode 100644 index 0000000..e6d0e5b --- /dev/null +++ b/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java @@ -0,0 +1,54 @@ +package kr.re.etri.security.jwt.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.Comment; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +@Comment("프로젝트") +@Entity +@Table(name = "tb_project") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ProjectEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Comment("ID") + private Long id; + @Column(unique = true) + @Comment("프로젝트 코드") + private String prjCd; + @Comment("프로젝트 이름") + private String prjNm; + @Comment("프로젝트 설명") + private String prjDesc; + @Comment("프로젝트 시작일") + private String prjStartDt; + @Comment("프로젝트 종료일") + private String prjEndDt; + @Comment("삭제 여부") + private String delYn; + @CreatedDate + @Comment("등록 일자") + private String regDate; + @Comment("등록 유저 ID") + private String regUserId; + @Comment("등록 유저 이름") + private String regUserNm; + @LastModifiedDate + @Comment("수정 일자") + private String modDate; + @Comment("수정 유저 ID") + private String modUserId; + @Comment("수정 유저 이름") + private String modUserNm; +} diff --git a/src/main/java/kr/re/etri/security/jwt/models/User.java b/src/main/java/kr/re/etri/security/jwt/models/User.java index 49d687f..47f1aa5 100644 --- a/src/main/java/kr/re/etri/security/jwt/models/User.java +++ b/src/main/java/kr/re/etri/security/jwt/models/User.java @@ -7,10 +7,7 @@ import jakarta.persistence.*; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.Getter; -import lombok.Setter; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; +import lombok.*; import org.hibernate.annotations.Comment; @Entity @@ -46,7 +43,7 @@ public class User { private String password; @ManyToMany(fetch = FetchType.LAZY) - @JoinTable(name = "user_roles", + @JoinTable(name = "tb_user_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) private Set roles = new HashSet<>();