From 1458d600411b3796dd1761d50f0957953aa8c06f Mon Sep 17 00:00:00 2001 From: ilham Date: Mon, 3 Jan 2022 00:34:08 +0700 Subject: [PATCH] fix: move history user code --- src/transaction/transaction.controller.ts | 47 ++++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/transaction/transaction.controller.ts b/src/transaction/transaction.controller.ts index 2818c7a..0eeb4f5 100644 --- a/src/transaction/transaction.controller.ts +++ b/src/transaction/transaction.controller.ts @@ -125,6 +125,30 @@ export class TransactionController { }; } + @Get('history-user/:id') + async getHistoryTransactionUserByParam( + @Query('page') page: number, + @Query('pageSize') pageSize: number, + @Query('start') startDate: string, + @Query('end') endDate: string, + @Param('id', ParseUUIDPipe) id: string, + ) { + const data = await this.transactionService.transactionHistoryByUser( + page, + id, + startDate == 'null' ? null : startDate, + endDate == 'null' ? null : endDate, + pageSize, + ); + + return { + ...data, + statusCode: HttpStatus.OK, + message: 'success', + }; + } + + @Get('history-deposit') async getHistoryDepositUser( @Query('page') page: number, @@ -219,29 +243,6 @@ export class TransactionController { }; } - @Get('history-user/:id') - async getHistoryTransactionUserByParam( - @Query('page') page: number, - @Query('pageSize') pageSize: number, - @Query('start') startDate: string, - @Query('end') endDate: string, - @Param('id', ParseUUIDPipe) id: string, - ) { - const data = await this.transactionService.transactionHistoryByUser( - page, - id, - startDate == 'null' ? null : startDate, - endDate == 'null' ? null : endDate, - pageSize, - ); - - return { - ...data, - statusCode: HttpStatus.OK, - message: 'success', - }; - } - @Put('deposit-return/confirmation/:id/:status') async confirmDepositReturn( @Param('id', ParseUUIDPipe) id: string,