From d9c39cbb7b074d8cfc7ad2ab910a2ca469317c30 Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Mon, 29 Aug 2022 02:30:22 +0000
Subject: [PATCH] bug fix

---
 .../deposit/components/list.component.html    | 36 ++++++++++---
 .../bank/deposit/components/list.component.ts | 50 +++++++++++++++----
 .../withdraw/components/list.component.html   |  2 +-
 .../withdraw/components/list.component.ts     |  9 ++--
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html
index aa8af2d..b9cf453 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.html
+++ b/src/app/modules/admin/bank/deposit/components/list.component.html
@@ -221,35 +221,51 @@
                   </div>
                   <!-- 구분 -->
                   <div>
-                    {{ __getMemberClassesByMemberId(deposit.getMemberId()) }}
+                    {{
+                      __getMemberClassesByMemberId(deposit.getMember()?.getId())
+                    }}
                   </div>
                   <!-- 등급, 아이디, 닉네임 -->
                   <div
-                    (click)="viewUserDetail(deposit.getMemberId())"
+                    (click)="viewUserDetail(deposit.getMember()?.getId())"
                     style="cursor: pointer"
                   >
-                    {{ __getMemberLevelByMemberId(deposit.getMemberId()) }}
+                    {{
+                      __getMemberLevelByMemberId(deposit.getMember()?.getId())
+                    }}
                     <hr style="margin: 7px 0px" />
                     <div>
                       {{
-                        __getMemberById(deposit.getMemberId())?.getUsername()
+                        __getMemberById(
+                          deposit.getMember()?.getId()
+                        )?.getUsername()
                       }}
                     </div>
                     <hr style="margin: 7px 0px" />
-                    {{ __getMemberById(deposit.getMemberId())?.getNickname() }}
+                    {{
+                      __getMemberById(
+                        deposit.getMember()?.getId()
+                      )?.getNickname()
+                    }}
                   </div>
                   <!-- 입금예정금액, 은행, 예금주 -->
                   <div>
                     {{ deposit.getAmount() }}
                     <hr style="margin: 7px 0px" />
-                    {{ __getMemberBankByMemberId(deposit.getMemberId()) }}
+                    {{
+                      __getMemberBankByMemberId(deposit.getMember()?.getId())
+                    }}
                     <hr style="margin: 7px 0px" />
                     {{ deposit.getName() }}
                   </div>
 
                   <!-- 정산종류, 비고 -->
                   <div>
-                    {{ __getMemberSettlementByMemberId(deposit.getMemberId()) }}
+                    {{
+                      __getMemberSettlementByMemberId(
+                        deposit.getMember()?.getId()
+                      )
+                    }}
                     <hr style="margin: 7px 0px" />
                     {{ deposit.getMemo() }}
                   </div>
@@ -298,7 +314,11 @@
                       class="bet-mat-small-8"
                       [color]="'primary'"
                     >
-                      {{ __getMemberRefferByMemberId(deposit.getMemberId()) }}
+                      {{
+                        __getMemberRefferByMemberId(
+                          deposit.getMember()?.getId()
+                        )
+                      }}
                     </button>
                   </div>
                   <div class="hidden lg:block">
diff --git a/src/app/modules/admin/bank/deposit/components/list.component.ts b/src/app/modules/admin/bank/deposit/components/list.component.ts
index cfd07f7..f0bed2c 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.ts
+++ b/src/app/modules/admin/bank/deposit/components/list.component.ts
@@ -42,6 +42,7 @@ import {
 } from 'app/modules/proto/c2se/member_bank_deposit_pb';
 import {
   MemberBankDeposit,
+  MemberBankDepositModel,
   MemberBankDepositState,
 } from 'app/modules/proto/models/member_bank_deposit_pb';
 import { MemberModel } from 'app/modules/proto/models/member_pb';
@@ -89,7 +90,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
 
   listMember!: MemberModel[];
   memberClasses!: MemberClass[];
-  bankDeposit$!: Observable<MemberBankDeposit[] | undefined>;
+  bankDeposit$!: Observable<MemberBankDepositModel[] | undefined>;
   __checkedDeposits: string[] = [];
 
   __isSearchOpened = false;
@@ -211,7 +212,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   // @ Public methods
   // -----------------------------------------------------------------------------------------------------
 
-  viewUserDetail(id: string): void {
+  viewUserDetail(id: string | undefined): void {
+    if (!id) {
+      return;
+    }
     let url: string = 'member/user/' + id;
     this.router.navigateByUrl(url);
   }
@@ -289,7 +293,12 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
-  __getMemberRefferByMemberId(memberId: string): string | undefined {
+  __getMemberRefferByMemberId(
+    memberId: string | undefined
+  ): string | undefined {
+    if (!memberId) {
+      return;
+    }
     const member = this.__getMemberById(memberId);
 
     if (!!member) {
@@ -306,7 +315,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
 
     return undefined;
   }
-  __getDepositState(deposit: MemberBankDeposit): string | undefined {
+  __getDepositState(deposit: MemberBankDepositModel): string | undefined {
     const state = deposit.getState();
     let result: string = '';
 
@@ -314,6 +323,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
       case MemberBankDepositState.APPLICATION:
         result = '신청';
         break;
+      case MemberBankDepositState.PENDING:
+        result = '대기';
+        break;
       case MemberBankDepositState.COMPLETE:
         result = '완료';
         break;
@@ -324,7 +336,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     return result;
   }
 
-  __getMemberSettlementByMemberId(memberId: string): string | undefined {
+  __getMemberSettlementByMemberId(
+    memberId: string | undefined
+  ): string | undefined {
+    if (!memberId) {
+      return;
+    }
+
     const member = this.__getMemberById(memberId);
 
     if (!!member) {
@@ -334,7 +352,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
 
     return undefined;
   }
-  __getMemberLevelByMemberId(memberId: string): string | undefined {
+  __getMemberLevelByMemberId(memberId: string | undefined): string | undefined {
+    if (!memberId) {
+      return;
+    }
     const member = this.__getMemberById(memberId);
 
     if (!!member) {
@@ -344,7 +365,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     return undefined;
   }
 
-  __getMemberBankByMemberId(memberId: string): string | undefined {
+  __getMemberBankByMemberId(memberId: string | undefined): string | undefined {
+    if (!memberId) {
+      return;
+    }
     const member = this.__getMemberById(memberId);
 
     if (!!member) {
@@ -354,7 +378,12 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     return undefined;
   }
 
-  __getMemberClassesByMemberId(memberId: string): string | undefined {
+  __getMemberClassesByMemberId(
+    memberId: string | undefined
+  ): string | undefined {
+    if (!memberId) {
+      return;
+    }
     const member = this.__getMemberById(memberId);
 
     if (!!member) {
@@ -363,7 +392,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
 
     return undefined;
   }
-  __getMemberById(memberId: string): MemberModel | undefined {
+  __getMemberById(memberId: string | undefined): MemberModel | undefined {
+    if (!memberId) {
+      return;
+    }
     return this.listMember.find((v) => v.getId() === memberId);
   }
 }
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html
index b270b85..a0d1cc5 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.html
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.html
@@ -206,7 +206,7 @@
                     회원
                     <hr style="margin: 7px 0px" />
                     <div
-                      (click)="viewUserDetail(withdraw.getMemberId())"
+                      (click)="viewUserDetail(withdraw.getMember()!.getId())"
                       style="cursor: pointer"
                     >
                       test {{ idx }}
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.ts b/src/app/modules/admin/bank/withdraw/components/list.component.ts
index 1bc2699..900e343 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.ts
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts
@@ -35,7 +35,10 @@ import { WithdrawPagination } from '../models/withdraw-pagination';
 import { WithdrawService } from '../services/withdraw.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ListMemberBankWithdrawsResponse } from 'app/modules/proto/c2se/member_bank_withdraw_pb';
-import { MemberBankWithdraw } from 'app/modules/proto/models/member_bank_withdraw_pb';
+import {
+  MemberBankWithdraw,
+  MemberBankWithdrawModel,
+} from 'app/modules/proto/models/member_bank_withdraw_pb';
 
 @Component({
   selector: 'withdraw-list',
@@ -72,7 +75,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild(MatPaginator) private _paginator!: MatPaginator;
   @ViewChild(MatSort) private _sort!: MatSort;
 
-  bankWithdraw$!: Observable<MemberBankWithdraw[] | undefined>;
+  bankWithdraw$!: Observable<MemberBankWithdrawModel[] | undefined>;
 
   __isSearchOpened = false;
   isLoading = false;
@@ -226,7 +229,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     return item.id || index;
   }
 
-  __getMemoTooltop(withdraw: MemberBankWithdraw): string {
+  __getMemoTooltop(withdraw: MemberBankWithdrawModel): string {
     if (!withdraw.getMemo() || withdraw.getMemo() === '') {
       return '메모없음';
     }