From 42c02fcd560bc8b400949cc5fa366e5506af48b1 Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Thu, 25 Aug 2022 08:37:51 +0000
Subject: [PATCH] member-settlement, member-game create resolver

---
 .../user/components/view.component.html       | 13 ++-
 .../member/user/components/view.component.ts  | 16 ++++
 .../resolvers/member-game-setting.resolver.ts | 86 ++++++++++++++++++
 .../member-settlement-setting.resolver.ts     | 87 +++++++++++++++++++
 .../modules/admin/member/user/user.routing.ts |  4 +
 .../services/member_game_setting.service.ts   |  5 +-
 .../member_settlement_setting.service.ts      |  5 +-
 7 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 src/app/modules/admin/member/user/resolvers/member-game-setting.resolver.ts
 create mode 100644 src/app/modules/admin/member/user/resolvers/member-settlement-setting.resolver.ts

diff --git a/src/app/modules/admin/member/user/components/view.component.html b/src/app/modules/admin/member/user/components/view.component.html
index e7b4f2b..9ea1113 100644
--- a/src/app/modules/admin/member/user/components/view.component.html
+++ b/src/app/modules/admin/member/user/components/view.component.html
@@ -447,6 +447,7 @@
                       type="text"
                       matInput
                       [formControlName]="'bacaraRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
@@ -458,6 +459,7 @@
                       type="text"
                       matInput
                       [formControlName]="'rulletRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
@@ -469,6 +471,7 @@
                       type="text"
                       matInput
                       [formControlName]="'dragonRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
@@ -479,7 +482,12 @@
                 <div class="flex">
                   <mat-form-field class="w-1/3 pr-2">
                     <mat-label>기타 게임 요율</mat-label>
-                    <input type="text" matInput [formControlName]="'etcRate'" />
+                    <input
+                      type="text"
+                      matInput
+                      [formControlName]="'etcRate'"
+                      style="width: 40%"
+                    />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
                     </div>
@@ -490,6 +498,7 @@
                       type="text"
                       matInput
                       [formControlName]="'slotRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
@@ -501,6 +510,7 @@
                       type="text"
                       matInput
                       [formControlName]="'casinoRusingRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
@@ -514,6 +524,7 @@
                       type="text"
                       matInput
                       [formControlName]="'slotRusingRate'"
+                      style="width: 40%"
                     />
                     <div class="mt-1 text-md text-hint">
                       %(최소 0 ~ 최대 0.2)
diff --git a/src/app/modules/admin/member/user/components/view.component.ts b/src/app/modules/admin/member/user/components/view.component.ts
index a196139..3783410 100644
--- a/src/app/modules/admin/member/user/components/view.component.ts
+++ b/src/app/modules/admin/member/user/components/view.component.ts
@@ -62,6 +62,11 @@ import { MemberBankAccountService } from 'app/modules/polyglot/member_bank_accou
 import { ListBanksResponse } from 'app/modules/proto/c2se/bank_pb';
 import { ListMemberClassesResponse } from 'app/modules/proto/c2se/member_class_pb';
 import { ListSitesResponse } from 'app/modules/proto/c2se/site_pb';
+import {
+  GetMemberSettlementSettingResponse,
+  ListMemberSettlementSettingsResponse,
+} from 'app/modules/proto/c2se/member_settlement_setting_pb';
+import { MemberSettlementSetting } from 'app/modules/proto/models/member_settlement_setting_pb';
 
 @Component({
   selector: 'user-view',
@@ -142,6 +147,8 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
   selectedPanel: string = 'accountInfo';
 
   memberLevels!: MemberLevel[];
+  memberSettlement!: MemberSettlementSetting;
+
   banks!: Bank[];
   sites!: Site[];
 
@@ -306,6 +313,15 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
 
       let listSitesResult: ListSitesResponse.Result = data['listSites'];
       this.sites = listSitesResult.getSitesList();
+      /* 
+      let memberSettlementResult: GetMemberSettlementSettingResponse.Result =
+        data['memberSettlement'];
+      const memberSettlement =
+        memberSettlementResult.getMemberSettlementSetting();
+
+      if (!!memberSettlement) {
+        this.memberSettlement = memberSettlement;
+      } */
 
       this.memberDefaultForm.patchValue({
         username: this.currentMember?.getUsername(),
diff --git a/src/app/modules/admin/member/user/resolvers/member-game-setting.resolver.ts b/src/app/modules/admin/member/user/resolvers/member-game-setting.resolver.ts
new file mode 100644
index 0000000..92f5460
--- /dev/null
+++ b/src/app/modules/admin/member/user/resolvers/member-game-setting.resolver.ts
@@ -0,0 +1,86 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { MemberGameSettingService } from 'app/modules/polyglot/member_game_setting/services/member_game_setting.service';
+import {
+  GetMemberGameSettingResponse,
+  ListMemberGameSettingsResponse,
+} from 'app/modules/proto/c2se/member_game_setting_pb';
+
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ListMemberGameResolver implements Resolve<any> {
+  /**
+   * Constructor
+   */
+  constructor(
+    private _router: Router,
+    private __memberGameSettingService: MemberGameSettingService
+  ) {}
+
+  // -----------------------------------------------------------------------------------------------------
+  // @ Public methods
+  // -----------------------------------------------------------------------------------------------------
+
+  /**
+   * Resolver
+   *
+   * @param route
+   * @param state
+   */
+
+  resolve(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ):
+    | Observable<ListMemberGameSettingsResponse.Result>
+    | Promise<ListMemberGameSettingsResponse.Result>
+    | ListMemberGameSettingsResponse.Result {
+    return this.__memberGameSettingService.listMemberGameSettings();
+  }
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class MemberGameSettingResolver implements Resolve<any> {
+  /**
+   * Constructor
+   */
+  constructor(
+    private _router: Router,
+    private __memberGameSettingService: MemberGameSettingService
+  ) {}
+
+  // -----------------------------------------------------------------------------------------------------
+  // @ Public methods
+  // -----------------------------------------------------------------------------------------------------
+
+  /**
+   * Resolver
+   *
+   * @param route
+   * @param state
+   */
+
+  resolve(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ):
+    | Observable<GetMemberGameSettingResponse.Result>
+    | Promise<GetMemberGameSettingResponse.Result>
+    | GetMemberGameSettingResponse.Result {
+    let memberId = route.paramMap.get('id');
+    if (!memberId) {
+      console.error('user.resolver memberId is null');
+    }
+    return this.__memberGameSettingService.getMemberGameSetting(memberId!);
+  }
+}
diff --git a/src/app/modules/admin/member/user/resolvers/member-settlement-setting.resolver.ts b/src/app/modules/admin/member/user/resolvers/member-settlement-setting.resolver.ts
new file mode 100644
index 0000000..055b2b6
--- /dev/null
+++ b/src/app/modules/admin/member/user/resolvers/member-settlement-setting.resolver.ts
@@ -0,0 +1,87 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { MemberSettlementSettingService } from 'app/modules/polyglot/member_settlement_setting/services/member_settlement_setting.service';
+import {
+  GetMemberSettlementSettingResponse,
+  ListMemberSettlementSettingsResponse,
+} from 'app/modules/proto/c2se/member_settlement_setting_pb';
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ListMemberSettlementsResolver implements Resolve<any> {
+  /**
+   * Constructor
+   */
+  constructor(
+    private _router: Router,
+    private __memberSettlementSettingService: MemberSettlementSettingService
+  ) {}
+
+  // -----------------------------------------------------------------------------------------------------
+  // @ Public methods
+  // -----------------------------------------------------------------------------------------------------
+
+  /**
+   * Resolver
+   *
+   * @param route
+   * @param state
+   */
+
+  resolve(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ):
+    | Observable<ListMemberSettlementSettingsResponse.Result>
+    | Promise<ListMemberSettlementSettingsResponse.Result>
+    | ListMemberSettlementSettingsResponse.Result {
+    return this.__memberSettlementSettingService.listMemberSettlementSettings();
+  }
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class MemberSettlementResolver implements Resolve<any> {
+  /**
+   * Constructor
+   */
+  constructor(
+    private _router: Router,
+    private __memberSettlementSettingService: MemberSettlementSettingService
+  ) {}
+
+  // -----------------------------------------------------------------------------------------------------
+  // @ Public methods
+  // -----------------------------------------------------------------------------------------------------
+
+  /**
+   * Resolver
+   *
+   * @param route
+   * @param state
+   */
+
+  resolve(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ):
+    | Observable<GetMemberSettlementSettingResponse.Result>
+    | Promise<GetMemberSettlementSettingResponse.Result>
+    | GetMemberSettlementSettingResponse.Result {
+    let memberId = route.paramMap.get('id');
+    if (!memberId) {
+      console.error('user.resolver memberId is null');
+    }
+    return this.__memberSettlementSettingService.getMemberSettlementSetting(
+      memberId!
+    );
+  }
+}
diff --git a/src/app/modules/admin/member/user/user.routing.ts b/src/app/modules/admin/member/user/user.routing.ts
index 28b9909..0953b8a 100644
--- a/src/app/modules/admin/member/user/user.routing.ts
+++ b/src/app/modules/admin/member/user/user.routing.ts
@@ -5,7 +5,9 @@ import { ViewComponent } from 'app/modules/admin/member/user/components/view.com
 import { SiteResolver } from 'app/shared/resolvers/site.resolver';
 import { ListMemberBanksResolver } from './resolvers/member-bank.resolver';
 import { ListMemberClassesResolver } from './resolvers/member-class.resolver';
+import { MemberGameSettingResolver } from './resolvers/member-game-setting.resolver';
 import { ListMemberLevelsResolver } from './resolvers/member-level.resolver';
+import { MemberSettlementResolver } from './resolvers/member-settlement-setting.resolver';
 
 import { MemberResolver, ListMemberResolver } from './resolvers/user.resolver';
 
@@ -27,6 +29,8 @@ export const userRoutes: Route[] = [
       listMemberLevels: ListMemberLevelsResolver,
       listMemberBanks: ListMemberBanksResolver,
       listSites: SiteResolver,
+      // memberSettlement: MemberSettlementResolver,
+      // memberGame: MemberGameSettingResolver,
     },
   },
 ];
diff --git a/src/app/modules/polyglot/member_game_setting/services/member_game_setting.service.ts b/src/app/modules/polyglot/member_game_setting/services/member_game_setting.service.ts
index ca607ae..600012e 100644
--- a/src/app/modules/polyglot/member_game_setting/services/member_game_setting.service.ts
+++ b/src/app/modules/polyglot/member_game_setting/services/member_game_setting.service.ts
@@ -87,10 +87,13 @@ export class MemberGameSettingService {
     );
   }
 
-  getMemberGameSetting(): Promise<GetMemberGameSettingResponse.Result> {
+  getMemberGameSetting(
+    id: string
+  ): Promise<GetMemberGameSettingResponse.Result> {
     return new Promise<GetMemberGameSettingResponse.Result>(
       (resolve, reject) => {
         let req = new GetMemberGameSettingRequest();
+        req.setId(id);
 
         this.__natsService
           .request<GetMemberGameSettingResponse.Result>(
diff --git a/src/app/modules/polyglot/member_settlement_setting/services/member_settlement_setting.service.ts b/src/app/modules/polyglot/member_settlement_setting/services/member_settlement_setting.service.ts
index 884e9c3..a553d32 100644
--- a/src/app/modules/polyglot/member_settlement_setting/services/member_settlement_setting.service.ts
+++ b/src/app/modules/polyglot/member_settlement_setting/services/member_settlement_setting.service.ts
@@ -91,10 +91,13 @@ export class MemberSettlementSettingService {
     );
   }
 
-  getMemberSettlementSetting(): Promise<GetMemberSettlementSettingResponse.Result> {
+  getMemberSettlementSetting(
+    id: string
+  ): Promise<GetMemberSettlementSettingResponse.Result> {
     return new Promise<GetMemberSettlementSettingResponse.Result>(
       (resolve, reject) => {
         let req = new GetMemberSettlementSettingRequest();
+        req.setId(id);
 
         this.__natsService
           .request<GetMemberSettlementSettingResponse.Result>(