From 6be23a1a12c47d3dc400a7490cbbc7c9dde0d3d2 Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Thu, 7 Jul 2022 12:44:55 +0000
Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EA=B8=88=EA=B4=80=EB=A6=AC=EC=97=90?=
 =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../withdraw/components/list.component.html   | 25 +++++++------------
 .../withdraw/components/list.component.ts     |  2 ++
 .../admin/bank/withdraw/withdraw.routing.ts   |  9 +++++++
 3 files changed, 20 insertions(+), 16 deletions(-)

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 3308247..09eb281 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.html
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.html
@@ -113,12 +113,6 @@
               <div class="hidden sm:block" [mat-sort-header]="'state'">
                 상태
               </div>
-              <div
-                class="hidden sm:block"
-                [mat-sort-header]="'memberInfomation'"
-              >
-                회원정보
-              </div>
               <div
                 class="hidden sm:block"
                 [mat-sort-header]="'bettingInfomation'"
@@ -155,9 +149,15 @@
                   </div>
 
                   <!-- id -->
-                  <div class="hidden sm:block truncate">
-                    {{ withdraw.id }}
-                  </div>
+                  <ng-container *ngIf="users$ | async as users">
+                    <ng-container
+                      *ngFor="let user of users; trackBy: __trackByFn"
+                    >
+                      <div class="hidden sm:block truncate">
+                        {{ withdraw.id }}
+                      </div>
+                    </ng-container>
+                  </ng-container>
 
                   <!-- nickname -->
                   <div class="hidden sm:block truncate">
@@ -217,13 +217,6 @@
                     {{ withdraw.state }}
                   </div>
 
-                  <!-- memberInformation -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      회원정보
-                    </button>
-                  </div>
-
                   <!-- bettingInformation -->
                   <div class="hidden sm:block truncate">
                     <button mat-flat-button [color]="'primary'">
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 7715f34..5b9c012 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.ts
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts
@@ -29,6 +29,7 @@ import {
 import { fuseAnimations } from '@fuse/animations';
 import { FuseConfirmationService } from '@fuse/services/confirmation';
 
+import { User } from 'app/modules/admin/member/user/models/user';
 import { Withdraw } from '../models/withdraw';
 import { WithdrawPagination } from '../models/withdraw-pagination';
 import { WithdrawService } from '../services/withdraw.service';
@@ -65,6 +66,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild(MatSort) private _sort!: MatSort;
 
   withdraws$!: Observable<Withdraw[] | undefined>;
+  users$!: Observable<User[] | undefined>;
 
   isLoading = false;
   searchInputControl = new FormControl();
diff --git a/src/app/modules/admin/bank/withdraw/withdraw.routing.ts b/src/app/modules/admin/bank/withdraw/withdraw.routing.ts
index 823294f..1090e0b 100644
--- a/src/app/modules/admin/bank/withdraw/withdraw.routing.ts
+++ b/src/app/modules/admin/bank/withdraw/withdraw.routing.ts
@@ -1,8 +1,10 @@
 import { Route } from '@angular/router';
 
 import { ListComponent } from './components/list.component';
+import { ViewComponent } from '../../member/user/components/view.component';
 
 import { WithdrawsResolver } from './resolvers/withdraw.resolver';
+import { UserResolver } from '../../dashboards/user/user.resolvers';
 
 export const withdrawRoutes: Route[] = [
   {
@@ -12,4 +14,11 @@ export const withdrawRoutes: Route[] = [
       withdraws: WithdrawsResolver,
     },
   },
+  {
+    path: ':id',
+    component: ViewComponent,
+    resolve: {
+      users: UserResolver,
+    },
+  },
 ];