From 45c348bcd3337e36b45cf3caf7c2dcb2f367aa97 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Thu, 16 Apr 2026 12:06:26 +0330 Subject: [PATCH] fix bug --- .../invoices/repositories/invoices.repository.ts | 7 +++++-- src/modules/referrals/providers/referrals.service.ts | 11 ++++++++--- .../repositories/referral-rewards.repository.ts | 3 +-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/modules/invoices/repositories/invoices.repository.ts b/src/modules/invoices/repositories/invoices.repository.ts index da57033..aad94eb 100755 --- a/src/modules/invoices/repositories/invoices.repository.ts +++ b/src/modules/invoices/repositories/invoices.repository.ts @@ -65,14 +65,17 @@ export class InvoicesRepository extends Repository { } async findPaginatedListByUserIds(queryDto: InvoicesSearchQueryDto, userIds: string[]) { + if (!userIds.length) { + return [[], 0] as [Invoice[], number]; + } + const { limit, skip } = PaginationUtils(queryDto); const queryBuilder = this.createQueryBuilder("invoice"); - console.log(userIds) queryBuilder .leftJoin("invoice.user", "user") .addSelect(["user.id", "user.firstName", "user.lastName", "user.email", "user.phone"]) - // .where("user.id IN (:...userIds)", { userIds }); + .where("user.id IN (:...userIds)", { userIds }); diff --git a/src/modules/referrals/providers/referrals.service.ts b/src/modules/referrals/providers/referrals.service.ts index 93ff2e9..06393e5 100755 --- a/src/modules/referrals/providers/referrals.service.ts +++ b/src/modules/referrals/providers/referrals.service.ts @@ -131,17 +131,22 @@ export class ReferralsService { } async findReferedUsersIds(userIds: string[]) { - const referedUSers = await this.referralsRepository.find({ + const referrals = await this.referralsRepository.find({ where: { referrer: { id: In(userIds) } }, + relations: { + referredUser: true + }, select: { - id: true + referredUser: { + id: true + } } }) - return referedUSers.map(u => u.id) + return referrals.map(r => r.referredUser.id) } //*********************************** */ diff --git a/src/modules/referrals/repositories/referral-rewards.repository.ts b/src/modules/referrals/repositories/referral-rewards.repository.ts index 4848d20..68bc179 100755 --- a/src/modules/referrals/repositories/referral-rewards.repository.ts +++ b/src/modules/referrals/repositories/referral-rewards.repository.ts @@ -14,9 +14,8 @@ export class ReferralRewardsRepository extends Repository { async findPaginatedList(userIds: string[], queryDto: SearchWithdrawRequestQueryDto) { const { limit, skip } = PaginationUtils(queryDto); - console.log(userIds) const qb = this.createQueryBuilder("rr") - // .where("rr.userId IN (:...userIds)", { userIds }) + .where("rr.userId IN (:...userIds)", { userIds }) .leftJoinAndSelect("rr.user", "user") .orderBy("rr.createdAt", "DESC") .skip(skip)