From 276b9790f80db8edaf0dc6dec4c9b8362a9111a7 Mon Sep 17 00:00:00 2001
From: ahah525 <ahah525@naver.com>
Date: Mon, 7 Nov 2022 13:06:39 +0900
Subject: [PATCH] =?UTF-8?q?#29=20-=20Refactor:=20MemberExtra=20=EC=97=94?=
 =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EB=8F=84=EC=9E=85=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EC=B6=9C=EA=B8=88=20=EA=B3=84=EC=A2=8C=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC,=20=EC=B6=9C=EA=B8=88=20=EC=8B=A0=EC=B2=AD=ED=8F=BC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/MemberController.java   |  4 +-
 .../app/member/service/MemberService.java     | 13 ++++--
 .../controller/WithdrawController.java        |  5 ++-
 .../member/manage_withdraw_account.html       | 41 +++++++++++--------
 .../resources/templates/withdraw/apply.html   |  4 +-
 5 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/controller/MemberController.java b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/controller/MemberController.java
index a32a018..a25f755 100644
--- a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/controller/MemberController.java
+++ b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/controller/MemberController.java
@@ -187,7 +187,7 @@ public String findPassword(@Valid String username, String email, Model model) {
     @PreAuthorize("isAuthenticated()")
     @GetMapping("/manageWithdrawAccount")
     public String manageWithdrawAccount(@AuthenticationPrincipal MemberContext memberContext, Model model) {
-        Member member = memberContext.getMember();
+        Member member = memberService.findByUsername(memberContext.getUsername());
         model.addAttribute("member", member);
 
         return "member/manage_withdraw_account";
@@ -211,7 +211,7 @@ public String registerWithdrawAccount(
             return "member/register_withdraw_account";
         }
         Member member = memberService.findByUsername(memberContext.getUsername());
-        memberService.modifyBankAccount(member, withDrawAccountForm);
+        memberService.createBankInfo(member, withDrawAccountForm);
 
         // 출금 게좌 관리 페이지로 리다이렉트
         return "redirect:/member/manageWithdrawAccount";
diff --git a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/service/MemberService.java b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/service/MemberService.java
index f4e10f0..4abf50d 100644
--- a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/service/MemberService.java
+++ b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/member/service/MemberService.java
@@ -6,6 +6,7 @@
 import com.example.mutbooks.app.mail.service.MailService;
 import com.example.mutbooks.app.member.entity.AuthLevel;
 import com.example.mutbooks.app.member.entity.Member;
+import com.example.mutbooks.app.member.entity.MemberExtra;
 import com.example.mutbooks.app.member.exception.PasswordNotMatchedException;
 import com.example.mutbooks.app.member.form.JoinForm;
 import com.example.mutbooks.app.member.form.ModifyForm;
@@ -146,8 +147,14 @@ public CashLog addCash(Member member, int price, String eventType) {
 
     // 계좌 등록
     @Transactional
-    public void modifyBankAccount(Member member, WithdrawAccountForm withDrawAccountForm) {
-        member.modifyBankAccount(withDrawAccountForm.getBankName(), withDrawAccountForm.getBankAccountNo());
-        forceAuthentication(member);
+    public void createBankInfo(Member member, WithdrawAccountForm withDrawAccountForm) {
+        MemberExtra memberExtra = MemberExtra.builder()
+                .member(member)
+                .bankName(withDrawAccountForm.getBankName())
+                .bankAccountNo(withDrawAccountForm.getBankAccountNo())
+                .build();
+        member.modifyMemberExtra(memberExtra);
+        // TODO: 계좌 정보는 memberContext 값에 담겨있지 않으므로 세션값 강제 수정할 필요X
+        //forceAuthentication(member);
     }
 }
diff --git a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/withdraw/controller/WithdrawController.java b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/withdraw/controller/WithdrawController.java
index 234134d..b409913 100644
--- a/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/withdraw/controller/WithdrawController.java
+++ b/3Week_Mission/mutbooks/src/main/java/com/example/mutbooks/app/withdraw/controller/WithdrawController.java
@@ -2,6 +2,7 @@
 
 import com.example.mutbooks.app.base.security.dto.MemberContext;
 import com.example.mutbooks.app.member.entity.Member;
+import com.example.mutbooks.app.member.service.MemberService;
 import com.example.mutbooks.app.withdraw.form.WithdrawApplyForm;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,11 +16,13 @@
 @RequiredArgsConstructor
 @RequestMapping("/withdraw")
 public class WithdrawController {
+    private final MemberService memberService;
+
     // 출금 신청 폼
     @PreAuthorize("isAuthenticated()")
     @GetMapping("/apply")
     public String showApply(@AuthenticationPrincipal MemberContext memberContext, WithdrawApplyForm withdrawApplyForm, Model model) {
-        Member member = memberContext.getMember();
+        Member member = memberService.findByUsername(memberContext.getUsername());
         model.addAttribute("member", member);
 
         return "withdraw/apply";
diff --git a/3Week_Mission/mutbooks/src/main/resources/templates/member/manage_withdraw_account.html b/3Week_Mission/mutbooks/src/main/resources/templates/member/manage_withdraw_account.html
index ca77329..13769bc 100644
--- a/3Week_Mission/mutbooks/src/main/resources/templates/member/manage_withdraw_account.html
+++ b/3Week_Mission/mutbooks/src/main/resources/templates/member/manage_withdraw_account.html
@@ -13,23 +13,30 @@
             <h1 class="font-bold text-lg">출금계좌 관리</h1>
 
             <div class="flex flex-col gap-3">
-                <div class="form-control">
-                    <label class="label">
-                        <span class="label-text">은행</span>
-                    </label>
-                    <span class="input input-bordered" style="display: flex; align-items: center" th:text="${member.bankName}"></span>
-                </div>
-
-                <div class="form-control">
-                    <label class="label">
-                        <span class="label-text">계좌번호</span>
-                    </label>
-                    <span class="input input-bordered" style="display: flex; align-items: center" th:text="${member.bankAccountNo}"></span>
-                </div>
-
-                <div class="grid grid-cols-2 mt-2 gap-2">
-                    <a href="/member/registerWithdrawAccount" class="btn btn-secondary btn-outline">출금계좌 등록</a>
-                </div>
+                <th:block th:if="${member.hasBankInfo()}">
+                    <div class="form-control">
+                        <label class="label">
+                            <span class="label-text">은행</span>
+                        </label>
+                        <span class="input input-bordered" style="display: flex; align-items: center" th:text="${member.memberExtra.bankName}"></span>
+                    </div>
+
+                    <div class="form-control">
+                        <label class="label">
+                            <span class="label-text">계좌번호</span>
+                        </label>
+                        <span class="input input-bordered" style="display: flex; align-items: center" th:text="${member.memberExtra.bankAccountNo}"></span>
+                    </div>
+                    <div class="grid grid-cols-2 mt-2 gap-2">
+                        <a href="/member/modifyWithdrawAccount" class="btn btn-secondary btn-outline">출금계좌 수정</a>
+                    </div>
+                </th:block>
+                <th:block th:if="${!member.hasBankInfo()}">
+                    <div class="mt-5">출금 계좌 정보가 존재하지 않습니다.<br>아래 버튼을 클릭해 출금 계좌 정보를 등록해주세요.</div>
+                    <div class="grid grid-cols-2 mt-2 gap-2">
+                        <a href="/member/registerWithdrawAccount" class="btn btn-secondary btn-outline">출금계좌 등록</a>
+                    </div>
+                </th:block>
             </div>
         </div>
 
diff --git a/3Week_Mission/mutbooks/src/main/resources/templates/withdraw/apply.html b/3Week_Mission/mutbooks/src/main/resources/templates/withdraw/apply.html
index 23959bc..634c579 100644
--- a/3Week_Mission/mutbooks/src/main/resources/templates/withdraw/apply.html
+++ b/3Week_Mission/mutbooks/src/main/resources/templates/withdraw/apply.html
@@ -57,12 +57,12 @@ <h1 class="font-bold text-lg">출금신청</h1>
                 <div class="text-lg">
 <!--                    <div>입금 받을 은행계좌 정보입니다.</div>-->
                     <span>은행 : </span>
-                    <span th:text="${member.bankName}"></span>
+                    <span th:text="${member.memberExtra.bankName}"></span>
                 </div>
 
                 <div class="text-lg">
                     <span>계좌번호 : </span>
-                    <span th:text="${member.bankAccountNo}"></span>
+                    <span th:text="${member.memberExtra.bankAccountNo}"></span>
                 </div>
             </div>