Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src/donations: Fix donation filter query #612

Merged
merged 7 commits into from
Mar 22, 2024
Merged

src/donations: Fix donation filter query #612

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36b12b5
src/donations: Fix donation filter query
sashko9807 Mar 15, 2024
2dad43c
Merge branch 'master' of https://github.com/sashko9807/podkrepibg-api…
sashko9807 Mar 19, 2024
52e9e50
fix: Include person's first and lastName in search
sashko9807 Mar 19, 2024
eaf93c1
Merge branch 'master' into fix-donation-filters
sashko9807 Mar 20, 2024
1eddf57
Allow to filter payments by id
sashko9807 Mar 21, 2024
b98d18b
Merge branch 'master' into fix-donation-filters
sashko9807 Mar 21, 2024
63082bc
Merge branch 'fix-donation-filters' of https://github.com/sashko9807/…
sashko9807 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions apps/api/src/donations/donations.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,15 @@ export class DonationsService {
lte: to,
},
paymentId: paymentId,
payment: {
slavcho marked this conversation as resolved.
Show resolved Hide resolved
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 } },
})
Expand Down Expand Up @@ -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,
Expand Down
Loading