From 764731d99a5056fc5718d2a690ba563e908420c3 Mon Sep 17 00:00:00 2001 From: Alexander Petkov Date: Fri, 20 Oct 2023 14:08:49 +0300 Subject: [PATCH] src/donations: Include guaranteed donations in listPublic Removed unnecessary count query. Replaced with the length of the findMany query --- apps/api/src/donations/donations.service.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/api/src/donations/donations.service.ts b/apps/api/src/donations/donations.service.ts index dd319f8fd..3e93fa493 100644 --- a/apps/api/src/donations/donations.service.ts +++ b/apps/api/src/donations/donations.service.ts @@ -290,7 +290,10 @@ export class DonationsService { pageSize?: number, ): Promise> { const data = await this.prisma.donation.findMany({ - where: { status, targetVault: { campaign: { id: campaignId } } }, + where: { + OR: [{ status: status }, { status: DonationStatus.guaranteed }], + targetVault: { campaign: { id: campaignId } }, + }, orderBy: [{ updatedAt: 'desc' }], select: { id: true, @@ -308,13 +311,9 @@ export class DonationsService { take: pageSize ? pageSize : undefined, }) - const count = await this.prisma.donation.count({ - where: { status, targetVault: { campaign: { id: campaignId } } }, - }) - const result = { items: data, - total: count, + total: data.length, } return result