feat : member & member_basic_inform 엔티티 수정

TEAM-LIAISON · Aug 30, 2024 · a4bd1d6 · a4bd1d6
1 parent f349db6
commit a4bd1d6
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 27 deletions.
diff --git a/src/main/generated/liaison/linkit/member/domain/QMember.java b/src/main/generated/liaison/linkit/member/domain/QMember.java
@@ -26,17 +26,13 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath email = createString("email");
 
-    public final BooleanPath existDefaultPrivateProfile = createBoolean("existDefaultPrivateProfile");
-
-    public final BooleanPath existDefaultTeamProfile = createBoolean("existDefaultTeamProfile");
-
     public final BooleanPath existMemberBasicInform = createBoolean("existMemberBasicInform");
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final QMemberBasicInform memberBasicInform;
 
-    public final EnumPath<liaison.linkit.member.domain.type.MemberType> memberType = createEnum("memberType", liaison.linkit.member.domain.type.MemberType.class);
+    public final EnumPath<liaison.linkit.member.domain.type.MemberState> memberState = createEnum("memberState", liaison.linkit.member.domain.type.MemberState.class);
 
     public final DateTimePath<java.time.LocalDateTime> modifiedAt = createDateTime("modifiedAt", java.time.LocalDateTime.class);
 
@@ -48,8 +44,6 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath socialLoginId = createString("socialLoginId");
 
-    public final EnumPath<liaison.linkit.member.domain.type.MemberState> status = createEnum("status", liaison.linkit.member.domain.type.MemberState.class);
-
     public final liaison.linkit.team.domain.QTeamProfile teamProfile;
 
     public final EnumPath<liaison.linkit.member.domain.type.TeamProfileType> teamProfileType = createEnum("teamProfileType", liaison.linkit.member.domain.type.TeamProfileType.class);

diff --git a/src/main/generated/liaison/linkit/member/domain/QMemberBasicInform.java b/src/main/generated/liaison/linkit/member/domain/QMemberBasicInform.java
@@ -24,6 +24,8 @@ public class QMemberBasicInform extends EntityPathBase<MemberBasicInform> {
 
     public final liaison.linkit.global.QBaseEntity _super = new liaison.linkit.global.QBaseEntity(this);
 
+    public final BooleanPath ageCheck = createBoolean("ageCheck");
+
     public final StringPath contact = createString("contact");
 
     //inherited
@@ -40,6 +42,10 @@ public class QMemberBasicInform extends EntityPathBase<MemberBasicInform> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> modifiedAt = _super.modifiedAt;
 
+    public final BooleanPath privateInformAgree = createBoolean("privateInformAgree");
+
+    public final BooleanPath serviceUseAgree = createBoolean("serviceUseAgree");
+
     //inherited
     public final EnumPath<liaison.linkit.global.type.StatusType> status = _super.status;
 

diff --git a/src/main/java/liaison/linkit/member/domain/Member.java b/src/main/java/liaison/linkit/member/domain/Member.java
@@ -2,7 +2,6 @@
 
 import jakarta.persistence.*;
 import liaison.linkit.member.domain.type.MemberState;
-import liaison.linkit.member.domain.type.MemberType;
 import liaison.linkit.member.domain.type.ProfileType;
 import liaison.linkit.member.domain.type.TeamProfileType;
 import liaison.linkit.profile.domain.Profile;
@@ -19,7 +18,6 @@
 import static jakarta.persistence.FetchType.LAZY;
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static liaison.linkit.member.domain.type.MemberState.ACTIVE;
-import static liaison.linkit.member.domain.type.MemberType.EMPTY_PROFILE;
 import static lombok.AccessLevel.PROTECTED;
 
 @Entity
@@ -50,13 +48,9 @@ public class Member {
     private String email;
 
     // 계정 상태 관리 컬럼
-    @Enumerated(value = STRING)
-    private MemberState status;
-
-    // 멤버 타입 관리
     @Column(nullable = false)
     @Enumerated(value = STRING)
-    private MemberType memberType;
+    private MemberState memberState;
 
     // 내 이력서 타입 (완성도 기반)
     @Column(nullable = false)
@@ -78,14 +72,6 @@ public class Member {
     @Column(nullable = false)
     private boolean existMemberBasicInform;
 
-    // 내 이력서 기본 항목 기입 여부
-    @Column(nullable = false)
-    private boolean existDefaultPrivateProfile;
-
-    // 팀 소개서 기본 항목 기입 여부
-    @Column(nullable = false)
-    private boolean existDefaultTeamProfile;
-
     @Column(nullable = false)
     private int privateWishCount;
 
@@ -101,16 +87,13 @@ public Member(
         this.id = id;
         this.socialLoginId = socialLoginId;
         this.email = email;
-        this.memberType = EMPTY_PROFILE;
         this.profileType = ProfileType.NO_PERMISSION;
         this.teamProfileType = TeamProfileType.NO_PERMISSION;
-        this.status = ACTIVE;
+        this.memberState = ACTIVE;
         this.createdAt = LocalDateTime.now();
         this.modifiedAt = LocalDateTime.now();
         this.memberBasicInform = memberBasicInform;
         this.existMemberBasicInform = false;
-        this.existDefaultPrivateProfile = false;
-        this.existDefaultTeamProfile = false;
         this.privateWishCount = 0;
         this.teamWishCount = 0;
     }

diff --git a/src/main/java/liaison/linkit/member/domain/MemberBasicInform.java b/src/main/java/liaison/linkit/member/domain/MemberBasicInform.java
@@ -31,8 +31,17 @@ public class MemberBasicInform extends BaseEntity {
     @Column(nullable = false, length = 30)
     private String contact;
 
+    @Column(nullable = false)
+    private boolean serviceUseAgree;
+
+    @Column(nullable = false)
+    private boolean privateInformAgree;
+
+    @Column(nullable = false)
+    private boolean ageCheck;
+
     // 뉴스레터 및 마케팅 정보 수신동의
-    @Column
+    @Column(nullable = false)
     private boolean marketingAgree;
 
     // 생성자
@@ -48,6 +57,9 @@ public MemberBasicInform(
         this.contact = contact;
         this.marketingAgree = marketingAgree;
         this.member = member;
+        this.serviceUseAgree = true;
+        this.privateInformAgree = true;
+        this.ageCheck = true;
     }
 
     public MemberBasicInform(

diff --git a/src/main/resources/db/migration/V1.1.3__Update_member_inform.sql b/src/main/resources/db/migration/V1.1.3__Update_member_inform.sql
@@ -0,0 +1,16 @@
+ALTER TABLE member DROP COLUMN exist_default_private_profile;
+ALTER TABLE member DROP COLUMN exist_default_team_profile;
+ALTER TABLE member DROP COLUMN member_type;
+ALTER TABLE member
+RENAME COLUMN status TO member_state;
+
+ALTER TABLE member
+MODIFY COLUMN member_state ENUM('DORMANT', 'ACTIVE', 'DELETED') NOT NULL;
+
+ALTER TABLE member_basic_inform
+MODIFY COLUMN marketing_agree BIT(1) NOT NULL;
+
+ALTER TABLE member_basic_inform
+ADD COLUMN service_use_agree BIT(1) NOT NULL,
+ADD COLUMN private_inform_agree BIT(1) NOT NULL,
+ADD COLUMN age_check BIT(1) NOT NULL;