src/donations: Fix donation filter query (#612)

* src/donations: Fix donation filter query * fix: Include person's first and lastName in search * Allow to filter payments by id
podkrepi-bg · Mar 22, 2024 · 8a3f614 · 8a3f614
1 parent 3089a38
commit 8a3f614
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/apps/api/src/donations/donations.service.ts b/apps/api/src/donations/donations.service.ts
@@ -385,11 +385,15 @@ export class DonationsService {
         lte: to,
       },
       paymentId: paymentId,
+      payment: {
+        status: paymentStatus,
+        provider: paymentProvider,
+      },
       OR: [
-        { payment: { status: paymentStatus } },
-        { payment: { provider: paymentProvider } },
         { payment: { billingEmail: { contains: search } } },
         { payment: { billingName: { contains: search } } },
+        { person: { firstName: { contains: search } } },
+        { person: { lastName: { contains: search } } },
       ],
       targetVault: { campaign: { id: campaignId } },
     })
@@ -431,7 +435,7 @@ export class DonationsService {
     pageSize?: number,
   ): Promise<ListDonationsDto<PaymentWithDonationCount>> {
     const whereClause = Prisma.validator<Prisma.PaymentWhereInput>()({
-      // id: paymentId,
+      id: paymentId,
       amount: {
         gte: minAmount,
         lte: maxAmount,