diff --git a/src/transaction/entities/transactions.entity.ts b/src/transaction/entities/transactions.entity.ts index a1fed62..a9937e8 100644 --- a/src/transaction/entities/transactions.entity.ts +++ b/src/transaction/entities/transactions.entity.ts @@ -14,6 +14,8 @@ import { BaseModel } from '../../config/basemodel.entity'; import { statusTransaction, typeTransaction } from '../../helper/enum-list'; import { Partner } from '../../users/entities/partner.entity'; import { ProductHistoryPrice } from '../../product/entities/product-history-price.entity'; +import { User } from '../../users/entities/user.entity'; +import { UserDetail } from '../../users/entities/user_detail.entity'; @Entity() export class Transactions extends BaseModel { @@ -26,7 +28,10 @@ export class Transactions extends BaseModel { @Column() type: typeTransaction; - @Column() + @Column({ + type: 'uuid', + nullable: true, + }) user: string; @Column({ @@ -43,4 +48,6 @@ export class Transactions extends BaseModel { image_prove: string; mark_up_price: number; + + userData: UserDetail; } diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 352a95d..f7181a5 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -677,8 +677,6 @@ export class TransactionService { ) { const baseQuery = this.transactionRepository .createQueryBuilder('transaction') - .select('transaction.id', 'id') - .addSelect(['transaction.created_at', 'image_prove', 'amount']) .where('transaction.user_destination = :id and transaction.type = 3', { id: user, }) @@ -688,7 +686,14 @@ export class TransactionService { 'userData', 'userData.user = transaction.user', ) - .addSelect('userData.name', 'name'); + .select('transaction.id', 'id') + .addSelect([ + 'transaction.created_at', + 'image_prove', + 'amount', + 'status', + 'userData.name', + ]); const data = await baseQuery .offset(page * (pageSize || 10))