diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 4a00f96..466ac9d 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -188,6 +188,13 @@ export const appRoutes: Route[] = [ (m: any) => m.CasinoModule ), }, + { + path: 'evolution', + loadChildren: () => + import('app/modules/admin/game/evolution/evolution.module').then( + (m: any) => m.EvolutionModule + ), + }, ], }, ], diff --git a/src/app/mock-api/apps/bank/withdraw/data.ts b/src/app/mock-api/apps/bank/withdraw/data.ts index 29b1643..72ff135 100644 --- a/src/app/mock-api/apps/bank/withdraw/data.ts +++ b/src/app/mock-api/apps/bank/withdraw/data.ts @@ -12,7 +12,7 @@ export const withdraws = [ registrationDate: '2022-06-10 16:51', processDate: '2022-06-10 16:51', deposit: 41200000, - withdrawal: 19000000, + withdraw: 19000000, total: 22200000, highRank: '[매장]kgon5', state: '완료', @@ -28,7 +28,7 @@ export const withdraws = [ registrationDate: '2022-06-08 18:31', processDate: '2022-06-08 20:13', deposit: 41200000, - withdrawal: 19000000, + withdraw: 19000000, total: 22200000, highRank: '[매장]kgon5', state: '완료', @@ -44,7 +44,7 @@ export const withdraws = [ registrationDate: '2022-06-08 01:22', processDate: '2022-06-08 01:22', deposit: 10000000, - withdrawal: 10000, + withdraw: 10000, total: 9990000, highRank: '[매장]kgon5', state: '완료', diff --git a/src/app/mock-api/apps/game/evolution/api.ts b/src/app/mock-api/apps/game/evolution/api.ts new file mode 100644 index 0000000..6c959a4 --- /dev/null +++ b/src/app/mock-api/apps/game/evolution/api.ts @@ -0,0 +1,216 @@ +import { Injectable } from '@angular/core'; +import { assign, cloneDeep } from 'lodash-es'; +import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; +import { evolutions as evolutionsData } from './data'; + +@Injectable({ + providedIn: 'root', +}) +export class GameEvolutionMockApi { + private _evolutions: any[] = evolutionsData; + + /** + * Constructor + */ + constructor(private _fuseMockApiService: FuseMockApiService) { + // Register Mock API handlers + this.registerHandlers(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Register Mock API handlers + */ + registerHandlers(): void { + // ----------------------------------------------------------------------------------------------------- + // @ Evolutions - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/game/evolution/evolutions', 300) + .reply(({ request }) => { + // Get available queries + const search = request.params.get('search'); + const sort = request.params.get('sort') || 'name'; + const order = request.params.get('order') || 'asc'; + const page = parseInt(request.params.get('page') ?? '1', 10); + const size = parseInt(request.params.get('size') ?? '10', 10); + + // Clone the evolutions + let evolutions: any[] | null = cloneDeep(this._evolutions); + + // Sort the evolutions + if (sort === 'sku' || sort === 'name' || sort === 'active') { + evolutions.sort((a, b) => { + const fieldA = a[sort].toString().toUpperCase(); + const fieldB = b[sort].toString().toUpperCase(); + return order === 'asc' + ? fieldA.localeCompare(fieldB) + : fieldB.localeCompare(fieldA); + }); + } else { + evolutions.sort((a, b) => + order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] + ); + } + + // If search exists... + if (search) { + // Filter the evolutions + evolutions = evolutions.filter( + (contact: any) => + contact.name && + contact.name.toLowerCase().includes(search.toLowerCase()) + ); + } + + // Paginate - Start + const evolutionsLength = evolutions.length; + + // Calculate pagination details + const begin = page * size; + const end = Math.min(size * (page + 1), evolutionsLength); + const lastPage = Math.max(Math.ceil(evolutionsLength / size), 1); + + // Prepare the pagination object + let pagination = {}; + + // If the requested page number is bigger than + // the last possible page number, return null for + // evolutions but also send the last possible page so + // the app can navigate to there + if (page > lastPage) { + evolutions = null; + pagination = { + lastPage, + }; + } else { + // Paginate the results by size + evolutions = evolutions.slice(begin, end); + + // Prepare the pagination mock-api + pagination = { + length: evolutionsLength, + size: size, + page: page, + lastPage: lastPage, + startIndex: begin, + endIndex: end - 1, + }; + } + + // Return the response + return [ + 200, + { + evolutions, + pagination, + }, + ]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Evolution - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/game/evolution/evolution') + .reply(({ request }) => { + // Get the id from the params + const id = request.params.get('id'); + + // Clone the evolutions + const evolutions = cloneDeep(this._evolutions); + + // Find the evolution + const evolution = evolutions.find((item: any) => item.id === id); + + // Return the response + return [200, evolution]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Evolution - POST + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPost('api/apps/gmae/evolution/evolution') + .reply(() => { + // Generate a new evolution + const newEvolution = { + id: FuseMockApiUtils.guid(), + startDate: '', + finishDate: '', + totalBetting: '', + winningMoney: '', + proceedingMoney: '', + calculate: '', + index: '', + division: '', + rank: '', + nickname: '', + bettingProgress: '', + odds: '', + bettingMoney: '', + hitMoney: '', + bettingTime: '', + result: '', + delete: '', + }; + + // Unshift the new evolution + this._evolutions.unshift(newEvolution); + + // Return the response + return [200, newEvolution]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Evolution - PATCH + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPatch('api/apps/game/evolution/evolution') + .reply(({ request }) => { + // Get the id and evolution + const id = request.body.id; + const evolution = cloneDeep(request.body.evolution); + + // Prepare the updated evolution + let updatedEvolution = null; + + // Find the evolution and update it + this._evolutions.forEach((item, index, evolutions) => { + if (item.id === id) { + // Update the evolution + evolutions[index] = assign({}, evolutions[index], evolution); + + // Store the updated evolution + updatedEvolution = evolutions[index]; + } + }); + + // Return the response + return [200, updatedEvolution]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Evolution - DELETE + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onDelete('api/apps/game/evolution/evolution') + .reply(({ request }) => { + // Get the id + const id = request.params.get('id'); + + // Find the evolution and delete it + this._evolutions.forEach((item, index) => { + if (item.id === id) { + this._evolutions.splice(index, 1); + } + }); + + // Return the response + return [200, true]; + }); + } +} diff --git a/src/app/mock-api/apps/game/evolution/data.ts b/src/app/mock-api/apps/game/evolution/data.ts new file mode 100644 index 0000000..706e992 --- /dev/null +++ b/src/app/mock-api/apps/game/evolution/data.ts @@ -0,0 +1,62 @@ +/* eslint-disable */ + +export const evolutions = [ + { + startDate: '2022-06-01 00:00', + finishDate: '2022-06-21 23:59', + availableBetting: 11545000, + bettingMoney: 11811000, + winningMoney: 11405200, + cancel: 0, + betWinCancel: 405800, + mainofficeRolling: 58114, + branchRolling: 34514, + divisionRolling: 23058, + officeRolling: 22982, + storeRolling: 11787, + memberRolling: 80295, + totalrolling: 230750, + highRank: '[매장]kgon5', + gameId: 'ks1_1007', + id: 'aa100', + nickname: 'aa100', + gameName: '에볼류션 카지노', + gameInfo1: 'Speed Baccarat J', + gameInfo2: '', + gameInfo3: '62ae9bdd396a5971c3921033', + form: '', + betting: 8000, + profitLoss: -8000, + beforeWinning: 69831, + winning: 0, + afterWinning: 69831, + beforeBetting: 77831, + afterBetting: 69831, + finalMoney: 69831, + bettingInfo1: 'Banker', + bettingInfo2: 8000, + bettingInfo3: 0, + data: '데이터확인', + comp: 'Y', + mainofficeName: 'kgon1', + mainofficePercent: '0.50', + mainofficePoint: '40.00', + branchName: 'kgon2', + branchPercent: '0.30', + branchPoint: '24.00', + divisionName: 'kgon3', + divisionPercent: '0.20', + divisionPoint: '16.00', + officeName: 'kgon4', + officePercent: '0.20', + officePoint: '16.00', + storeName: 'kgon5', + storePercent: '0.10', + storePoint: '8.00', + memberName: 'aa100', + memberPercent: '0.70', + memberPoint: '56.00', + bettingTime: '2022-06-19 12:44:33', + registrationTime: '2022-06-19 12:47:02', + }, +]; diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index f757f77..ad3e507 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -92,6 +92,13 @@ export const defaultNavigation: FuseNavigationItem[] = [ icon: 'heroicons_outline:academic-cap', link: '/game/casino', }, + { + id: 'game.evolution', + title: 'Evolution', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/game/evolution', + }, ], }, ]; diff --git a/src/app/mock-api/index.ts b/src/app/mock-api/index.ts index 50ae7fe..001c919 100644 --- a/src/app/mock-api/index.ts +++ b/src/app/mock-api/index.ts @@ -26,6 +26,7 @@ import { BankDepositMockApi } from './apps/bank/deposit/api'; import { BankWithdrawMockApi } from './apps/bank/withdraw/api'; import { GamePowerballMockApi } from './apps/game/powerball/api'; import { GameCasinoMockApi } from './apps/game/casino/api'; +import { GameEvolutionMockApi } from './apps/game/evolution/api'; export const mockApiServices = [ AcademyMockApi, @@ -56,4 +57,5 @@ export const mockApiServices = [ BankWithdrawMockApi, GamePowerballMockApi, GameCasinoMockApi, + GameEvolutionMockApi, ]; diff --git a/src/app/modules/admin/game/evolution/components/index.ts b/src/app/modules/admin/game/evolution/components/index.ts new file mode 100644 index 0000000..04759eb --- /dev/null +++ b/src/app/modules/admin/game/evolution/components/index.ts @@ -0,0 +1,3 @@ +import { ListComponent } from './list.component'; + +export const COMPONENTS = [ListComponent]; diff --git a/src/app/modules/admin/game/evolution/components/list.component.html b/src/app/modules/admin/game/evolution/components/list.component.html new file mode 100644 index 0000000..90ea4b9 --- /dev/null +++ b/src/app/modules/admin/game/evolution/components/list.component.html @@ -0,0 +1,368 @@ +
+ +
+ +
+ +
+ +
Evolution
+ +
+ + + + + + + 전체금액 + 배팅100만미만 + 배팅100-300만 + 배팅300-500만 + 배팅500만이상 + 당첨1000만초과 + + + + + 아이디 + 게임아이디 + 닉네임 + 게임종류 + + + + + + + + + +
+
+ + +
+ +
+ + +
+ +
+
+ + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + +
+ There are no evolution! +
+ +
+
+
diff --git a/src/app/modules/admin/game/evolution/components/list.component.ts b/src/app/modules/admin/game/evolution/components/list.component.ts new file mode 100644 index 0000000..629a2cb --- /dev/null +++ b/src/app/modules/admin/game/evolution/components/list.component.ts @@ -0,0 +1,190 @@ +import { + AfterViewInit, + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + OnDestroy, + OnInit, + ViewChild, + ViewEncapsulation, +} from '@angular/core'; +import { + FormBuilder, + FormControl, + FormGroup, + Validators, +} from '@angular/forms'; +import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { + debounceTime, + map, + merge, + Observable, + Subject, + switchMap, + takeUntil, +} from 'rxjs'; +import { fuseAnimations } from '@fuse/animations'; +import { FuseConfirmationService } from '@fuse/services/confirmation'; + +import { Evolution } from '../models/evolution'; +import { EvolutionPagination } from '../models/evolution-pagination'; +import { EvolutionService } from '../services/evolution.service'; + +@Component({ + selector: 'evolution-list', + templateUrl: './list.component.html', + styles: [ + /* language=SCSS */ + ` + .inventory-grid { + grid-template-columns: 60px auto 40px; + + @screen sm { + grid-template-columns: 60px auto 60px 72px; + } + + @screen md { + grid-template-columns: 60px 60px auto 112px 72px; + } + + @screen lg { + grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + } + } + `, + ], + encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: fuseAnimations, +}) +export class ListComponent implements OnInit, AfterViewInit, OnDestroy { + @ViewChild(MatPaginator) private _paginator!: MatPaginator; + @ViewChild(MatSort) private _sort!: MatSort; + + evolutions$!: Observable; + + isLoading = false; + searchInputControl = new FormControl(); + selectedEvolution?: Evolution; + pagination?: EvolutionPagination; + + private _unsubscribeAll: Subject = new Subject(); + + /** + * Constructor + */ + constructor( + private _changeDetectorRef: ChangeDetectorRef, + private _fuseConfirmationService: FuseConfirmationService, + private _formBuilder: FormBuilder, + private _evolutionService: EvolutionService + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Get the pagination + this._evolutionService.pagination$ + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe((pagination: EvolutionPagination | undefined) => { + // Update the pagination + this.pagination = pagination; + + // Mark for check + this._changeDetectorRef.markForCheck(); + }); + + // Get the products + this.evolutions$ = this._evolutionService.evolutions$; + } + + /** + * After view init + */ + ngAfterViewInit(): void { + if (this._sort && this._paginator) { + // Set the initial sort + this._sort.sort({ + id: 'nickname', + start: 'asc', + disableClear: true, + }); + + // Mark for check + this._changeDetectorRef.markForCheck(); + + // If the evolution changes the sort order... + this._sort.sortChange + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + // Reset back to the first page + this._paginator.pageIndex = 0; + }); + + // Get products if sort or page changes + merge(this._sort.sortChange, this._paginator.page) + .pipe( + switchMap(() => { + this.isLoading = true; + return this._evolutionService.getEvolutions( + this._paginator.pageIndex, + this._paginator.pageSize, + this._sort.active, + this._sort.direction + ); + }), + map(() => { + this.isLoading = false; + }) + ) + .subscribe(); + } + } + + /** + * On destroy + */ + ngOnDestroy(): void { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(null); + this._unsubscribeAll.complete(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + // ----------------------------------------------------------------------------------------------------- + // @ Private methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Create product + */ + __createProduct(): void {} + + /** + * Toggle product details + * + * @param productId + */ + __toggleDetails(productId: string): void {} + + /** + * Track by function for ngFor loops + * + * @param index + * @param item + */ + __trackByFn(index: number, item: any): any { + return item.id || index; + } +} diff --git a/src/app/modules/admin/game/evolution/evolution.module.ts b/src/app/modules/admin/game/evolution/evolution.module.ts new file mode 100644 index 0000000..7fb584a --- /dev/null +++ b/src/app/modules/admin/game/evolution/evolution.module.ts @@ -0,0 +1,42 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { MatButtonModule } from '@angular/material/button'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatRippleModule } from '@angular/material/core'; +import { MatSortModule } from '@angular/material/sort'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTooltipModule } from '@angular/material/tooltip'; + +import { TranslocoModule } from '@ngneat/transloco'; + +import { SharedModule } from 'app/shared/shared.module'; + +import { COMPONENTS } from './components'; + +import { evolutionRoutes } from './evolution.routing'; + +@NgModule({ + declarations: [COMPONENTS], + imports: [ + TranslocoModule, + SharedModule, + RouterModule.forChild(evolutionRoutes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatPaginatorModule, + MatProgressBarModule, + MatRippleModule, + MatSortModule, + MatSelectModule, + MatTooltipModule, + ], +}) +export class EvolutionModule {} diff --git a/src/app/modules/admin/game/evolution/evolution.routing.ts b/src/app/modules/admin/game/evolution/evolution.routing.ts new file mode 100644 index 0000000..78500d7 --- /dev/null +++ b/src/app/modules/admin/game/evolution/evolution.routing.ts @@ -0,0 +1,15 @@ +import { Route } from '@angular/router'; + +import { ListComponent } from './components/list.component'; + +import { EvolutionsResolver } from './resolvers/evolution.resolver'; + +export const evolutionRoutes: Route[] = [ + { + path: '', + component: ListComponent, + resolve: { + deposits: EvolutionsResolver, + }, + }, +]; diff --git a/src/app/modules/admin/game/evolution/models/evolution-pagination.ts b/src/app/modules/admin/game/evolution/models/evolution-pagination.ts new file mode 100644 index 0000000..d1bff25 --- /dev/null +++ b/src/app/modules/admin/game/evolution/models/evolution-pagination.ts @@ -0,0 +1,8 @@ +export interface EvolutionPagination { + length: number; + size: number; + page: number; + lastPage: number; + startIndex: number; + endIndex: number; +} diff --git a/src/app/modules/admin/game/evolution/models/evolution.ts b/src/app/modules/admin/game/evolution/models/evolution.ts new file mode 100644 index 0000000..8d6f322 --- /dev/null +++ b/src/app/modules/admin/game/evolution/models/evolution.ts @@ -0,0 +1,58 @@ +export interface Evolution { + id?: string; + startDate?: string; + finishDate?: string; + availableBetting?: number; + bettingMoney?: number; + winningMoney?: number; + cancel?: number; + betWinCancel?: number; + mainofficeRolling?: number; + branchRolling?: number; + divisionRolling?: number; + officeRolling?: number; + storeRolling?: number; + memberRolling?: number; + totalrolling?: number; + highRank?: string; + gameId?: string; + nickname?: string; + gameName?: string; + gameInfo1?: string; + gameInfo2?: string; + gameInfo3?: string; + form?: string; + betting?: number; + profitLoss?: number; + beforeWinning?: number; + winning?: number; + afterWinning?: number; + beforeBetting?: number; + afterBetting?: number; + finalMoney?: number; + bettingInfo1?: string; + bettingInfo2?: number; + bettingInfo3?: number; + data?: string; + comp?: string; + mainofficeName?: string; + mainofficePercent?: number; + mainofficePoint?: number; + branchName?: string; + branchPercent?: number; + branchPoint?: number; + divisionName?: string; + divisionPercent?: number; + divisionPoint?: number; + officeName?: string; + officePercent?: number; + officePoint?: number; + storeName?: string; + storePercent?: number; + storePoint?: number; + memberName?: string; + memberPercent?: number; + memberPoint?: number; + bettingTime?: string; + registrationTime?: string; +} diff --git a/src/app/modules/admin/game/evolution/resolvers/evolution.resolver.ts b/src/app/modules/admin/game/evolution/resolvers/evolution.resolver.ts new file mode 100644 index 0000000..4fc4dd8 --- /dev/null +++ b/src/app/modules/admin/game/evolution/resolvers/evolution.resolver.ts @@ -0,0 +1,89 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { catchError, Observable, throwError } from 'rxjs'; + +import { Evolution } from '../models/evolution'; +import { EvolutionPagination } from '../models/evolution-pagination'; +import { EvolutionService } from '../services/evolution.service'; + +@Injectable({ + providedIn: 'root', +}) +export class EvolutionResolver implements Resolve { + /** + * Constructor + */ + constructor( + private _evolutionService: EvolutionService, + private _router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + return this._evolutionService + .getEvolutionById(route.paramMap.get('id')) + .pipe( + // Error here means the requested product is not available + catchError((error) => { + // Log the error + console.error(error); + + // Get the parent url + const parentUrl = state.url.split('/').slice(0, -1).join('/'); + + // Navigate to there + this._router.navigateByUrl(parentUrl); + + // Throw an error + return throwError(error); + }) + ); + } +} + +@Injectable({ + providedIn: 'root', +}) +export class EvolutionsResolver implements Resolve { + /** + * Constructor + */ + constructor(private _evolutionService: EvolutionService) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable<{ + pagination: EvolutionPagination; + evolutions: Evolution[]; + }> { + return this._evolutionService.getEvolutions(); + } +} diff --git a/src/app/modules/admin/game/evolution/services/evolution.service.ts b/src/app/modules/admin/game/evolution/services/evolution.service.ts new file mode 100644 index 0000000..396f0f7 --- /dev/null +++ b/src/app/modules/admin/game/evolution/services/evolution.service.ts @@ -0,0 +1,156 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { + BehaviorSubject, + filter, + map, + Observable, + of, + switchMap, + take, + tap, + throwError, +} from 'rxjs'; + +import { Evolution } from '../models/evolution'; +import { EvolutionPagination } from '../models/evolution-pagination'; + +@Injectable({ + providedIn: 'root', +}) +export class EvolutionService { + // Private + private __pagination = new BehaviorSubject( + undefined + ); + private __evolution = new BehaviorSubject(undefined); + private __evolutions = new BehaviorSubject( + undefined + ); + + /** + * Constructor + */ + constructor(private _httpClient: HttpClient) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Getter for pagination + */ + get pagination$(): Observable { + return this.__pagination.asObservable(); + } + + /** + * Getter for evolution + */ + get evolution$(): Observable { + return this.__evolution.asObservable(); + } + + /** + * Getter for evolutions + */ + get evolutions$(): Observable { + return this.__evolutions.asObservable(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Get evolutions + * + * + * @param page + * @param size + * @param sort + * @param order + * @param search + */ + getEvolutions( + page: number = 0, + size: number = 10, + sort: string = 'nickname', + order: 'asc' | 'desc' | '' = 'asc', + search: string = '' + ): Observable<{ + pagination: EvolutionPagination; + evolutions: Evolution[]; + }> { + return this._httpClient + .get<{ pagination: EvolutionPagination; evolutions: Evolution[] }>( + 'api/apps/game/evolution/evolutions', + { + params: { + page: '' + page, + size: '' + size, + sort, + order, + search, + }, + } + ) + .pipe( + tap((response) => { + this.__pagination.next(response.pagination); + this.__evolutions.next(response.evolutions); + }) + ); + } + + /** + * Get product by id + */ + getEvolutionById(id: string | null): Observable { + return this.__evolutions.pipe( + take(1), + map((evolutions) => { + // Find the product + const evolution = + evolutions?.find((item) => item.id === id) || undefined; + + // Update the product + this.__evolution.next(evolution); + + // Return the product + return evolution; + }), + switchMap((product) => { + if (!product) { + return throwError('Could not found product with id of ' + id + '!'); + } + + return of(product); + }) + ); + } + + /** + * Create product + */ + createEvolution(): Observable { + return this.evolutions$.pipe( + take(1), + switchMap((evolutions) => + this._httpClient + .post('api/apps/game/evolution/product', {}) + .pipe( + map((newEvolution) => { + // Update the evolutions with the new product + if (!!evolutions) { + this.__evolutions.next([newEvolution, ...evolutions]); + } + + // Return the new product + return newEvolution; + }) + ) + ) + ); + } +} diff --git a/src/app/modules/admin/game/powerball/components/list.component.html b/src/app/modules/admin/game/powerball/components/list.component.html index 6f53f83..4d837b5 100644 --- a/src/app/modules/admin/game/powerball/components/list.component.html +++ b/src/app/modules/admin/game/powerball/components/list.component.html @@ -24,7 +24,7 @@ >
{{ powerball.startDate }}~{{ powerball.finishDate }}까지의 총 - 베팅금액:{{ powerball.totalBetting }}원, 당첨금액:{{ + 배팅금액:{{ powerball.totalBetting }}원, 당첨금액:{{ powerball.winningMoney }}원, 진행중금액:{{ powerball.proceedingMoney }}원, 정산:{{ powerball.calculate @@ -84,7 +84,7 @@ 아이디 닉네임 파워볼회차 - 베팅번호 + 배팅번호 @@ -144,19 +144,19 @@ class="hidden sm:block" [mat-sort-header]="'bettingProgress'" > - 베팅진행내역 + 배팅진행내역