diff --git a/src/transaction/transaction.controller.ts b/src/transaction/transaction.controller.ts index 56aaac5..d6e324d 100644 --- a/src/transaction/transaction.controller.ts +++ b/src/transaction/transaction.controller.ts @@ -117,13 +117,15 @@ export class TransactionController { async getHistoryTransactionUser( @Query('page') page: number, @Query('pageSize') pageSize: number, - @Query('transactionDate') transactionDate: string, + @Query('startDate') startDate: string, + @Query('endDate') endDate: string, @Request() req, ) { const data = await this.transactionService.transactionHistoryByUser( page, req.user.userId, - transactionDate, + startDate, + endDate, pageSize, ); diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 46b5052..f69d7a3 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -765,7 +765,8 @@ export class TransactionService { async transactionHistoryByUser( page: number, user: string, - transactionDate: string, + startDate: string, + endDate: string, pageSize?: number, ) { const userData = await this.userService.findExist(user); @@ -779,12 +780,6 @@ export class TransactionService { userBySupperior.push(user) } - if (transactionDate) { - filterTransactionDate = transactionDate.split(',').map((data) => { - return data.trim(); - }); - } - const baseQuery = this.transactionRepository .createQueryBuilder('transaction') .select('transaction.id', 'id') @@ -798,10 +793,10 @@ export class TransactionService { .addSelect('product.name', 'name') .addSelect('product.id', 'product_id'); - if (transactionDate && filterTransactionDate.length > 0) { + if (startDate && endDate) { baseQuery.where('transaction.created_at between :startDate and :enDate', { - startDate: filterTransactionDate[0], - enDate: filterTransactionDate[0], + startDate: new Date(startDate), + enDate: new Date(endDate), }); }