#29 - Feat: MemberExtra 엔티티 추가(은행정보), Member/MemberContext 수정

likelion-backendschool · Nov 7, 2022 · d5c0e0b · d5c0e0b
1 parent 5b447ad
commit d5c0e0b
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 17 deletions.
diff --git a/...sion/mutbooks/src/main/java/com/example/mutbooks/app/base/security/dto/MemberContext.java b/...sion/mutbooks/src/main/java/com/example/mutbooks/app/base/security/dto/MemberContext.java
@@ -26,10 +26,10 @@ public class MemberContext extends User {
     private int restCash;
 
     // 임시 추가 필드
-    @Setter
-    private String bankName;
-    @Setter
-    private String bankAccountNo;
+//    @Setter
+//    private String bankName;
+//    @Setter
+//    private String bankAccountNo;
 
     public MemberContext(Member member, List<GrantedAuthority> authorities) {
         super(member.getUsername(), member.getPassword(), authorities);
@@ -42,8 +42,8 @@ public MemberContext(Member member, List<GrantedAuthority> authorities) {
         // 예치금 추가
         this.restCash = member.getRestCash();
         // 임시 추가
-        this.bankName = member.getBankName();
-        this.bankAccountNo = member.getBankAccountNo();
+//        this.bankName = member.getBankName();
+//        this.bankAccountNo = member.getBankAccountNo();
     }
 
     public Member getMember() {
@@ -58,8 +58,8 @@ public Member getMember() {
                 // 예치금 추가
                 .restCash(restCash)
                 // 임시 추가
-                .bankName(bankName)
-                .bankAccountNo(bankAccountNo)
+//                .bankName(bankName)
+//                .bankAccountNo(bankAccountNo)
                 .build();
     }
 

diff --git a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/entity/Member.java b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/entity/Member.java
@@ -8,9 +8,7 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,8 +33,9 @@ public class Member extends BaseEntity {
 
     private int restCash;      // 예치금
 
-    private String bankName;        // 출금 은행명
-    private String bankAccountNo;   // 출금 계좌번호
+    // Member 의 memberExtra 에 값이 저장될 때, MemberExtra 도 같이 저장되도록
+    @OneToOne(mappedBy = "member", cascade = CascadeType.ALL)
+    private MemberExtra memberExtra;
 
     // 비밀번호 수정
     public void modifyPassword(String newPassword) {
@@ -49,10 +48,17 @@ public void modifyInfo(String email, String nickname) {
         this.nickname = nickname;
     }
 
-    // 은행정보 수정
-    public void modifyBankAccount(String bankName, String bankAccountNo) {
-        this.bankName = bankName;
-        this.bankAccountNo = bankAccountNo;
+    // 추가정보 수정
+    public void modifyMemberExtra(MemberExtra memberExtra) {
+        this.memberExtra = memberExtra;
+    }
+
+    // 출금 계좌 정보 등록 여부
+    public boolean hasBankInfo() {
+        if(memberExtra == null) return false;
+        if(memberExtra.getBankName() == null) return false;
+        if(memberExtra.getBankAccountNo() == null) return false;
+        return true;
     }
 
     // 권한 부여

diff --git a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/entity/MemberExtra.java b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/entity/MemberExtra.java
@@ -0,0 +1,23 @@
+package com.example.mutbooks.app.member.entity;
+
+import com.example.mutbooks.app.base.entity.BaseEntity;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Entity
+@Getter
+@Setter
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString(callSuper = true)
+public class MemberExtra extends BaseEntity {
+    @OneToOne
+    private Member member;          // 관련 회원
+
+    private String bankName;        // 출금 은행명
+    private String bankAccountNo;   // 출금 계좌번호
+}