From 2ccd03df49cac1b51bbcf2181f631ee80a051a96 Mon Sep 17 00:00:00 2001 From: Pillippa Perez Pons Date: Sun, 25 Jan 2026 16:29:52 -0800 Subject: [PATCH 1/5] fixed donations --- src/schema/money/queries.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/schema/money/queries.ts b/src/schema/money/queries.ts index 2abee0f7..b48b4757 100644 --- a/src/schema/money/queries.ts +++ b/src/schema/money/queries.ts @@ -89,8 +89,9 @@ builder.queryFields((t) => ({ paymentLogs.forEach((p) => { const key = `${p.platform}-${p.currencyId}`; + const isPaid = p.originalResponseBlob.payment_status === "paid" || p.originalResponseBlob.status === "approved"; - if (!consolidatedPayments[key]) { + if (!consolidatedPayments[key] && isPaid) { consolidatedPayments[key] = { id: key, totalTransactionAmount: 0, From e2f3833613b9531efabfac71b66ce27a6b73bdda Mon Sep 17 00:00:00 2001 From: Pillippa Perez Pons Date: Sun, 25 Jan 2026 16:31:08 -0800 Subject: [PATCH 2/5] fixed payment --- src/schema/money/queries.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/schema/money/queries.ts b/src/schema/money/queries.ts index b48b4757..a9f46ab8 100644 --- a/src/schema/money/queries.ts +++ b/src/schema/money/queries.ts @@ -91,7 +91,7 @@ builder.queryFields((t) => ({ const key = `${p.platform}-${p.currencyId}`; const isPaid = p.originalResponseBlob.payment_status === "paid" || p.originalResponseBlob.status === "approved"; - if (!consolidatedPayments[key] && isPaid) { + if (!consolidatedPayments[key] || !isPaid) { consolidatedPayments[key] = { id: key, totalTransactionAmount: 0, From 5768485a8f62d17baaa719c247fd436fac46a8a5 Mon Sep 17 00:00:00 2001 From: Pillippa Perez Pons Date: Sun, 25 Jan 2026 16:41:23 -0800 Subject: [PATCH 3/5] fixed lint --- src/datasources/db/paymentLogs.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/datasources/db/paymentLogs.ts b/src/datasources/db/paymentLogs.ts index 9a14c075..020a726c 100644 --- a/src/datasources/db/paymentLogs.ts +++ b/src/datasources/db/paymentLogs.ts @@ -30,7 +30,10 @@ export const paymentLogsSchema = pgTable( withTimezone: true, }), currencyId: text("currency_id").notNull(), - originalResponseBlob: jsonb("original_response_blob").notNull(), + originalResponseBlob: jsonb("original_response_blob").default({ + payment_status: "pending", + status: "pending", + }), ...createdAndUpdatedAtFields, }, (t) => ({ From 6af49916f5edbb34fa5d8db6560b76329a07cf0f Mon Sep 17 00:00:00 2001 From: Pillippa Perez Pons Date: Sun, 25 Jan 2026 16:45:08 -0800 Subject: [PATCH 4/5] actions upgrade --- .github/workflows/integration_tests.yml | 2 +- package.json | 3 ++- src/schema/money/queries.ts | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 5a4bdbfb..8686c40b 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -57,7 +57,7 @@ jobs: file-coverage-mode: "changes" - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist-without-markdown path: | diff --git a/package.json b/package.json index 5c604c1f..82fe1e7c 100644 --- a/package.json +++ b/package.json @@ -111,5 +111,6 @@ "stripe": "^14.2.0", "worker-auth-providers": "^0.0.13-beta.4", "zod": "^3.21.4" - } + }, + "packageManager": "pnpm@10.9.0+sha512.0486e394640d3c1fb3c9d43d49cf92879ff74f8516959c235308f5a8f62e2e19528a65cdc2a3058f587cde71eba3d5b56327c8c33a97e4c4051ca48a10ca2d5f" } diff --git a/src/schema/money/queries.ts b/src/schema/money/queries.ts index a9f46ab8..24434878 100644 --- a/src/schema/money/queries.ts +++ b/src/schema/money/queries.ts @@ -10,6 +10,11 @@ import { PaymentLogRef, } from "~/schema/shared/refs"; +type PaymentResponseBlob = { + payment_status?: string; + status?: string; +}; + const SearchPaymentLogsInput = builder.inputType("SearchPaymentLogsInput", { fields: (t) => ({ startDate: t.field({ @@ -89,7 +94,8 @@ builder.queryFields((t) => ({ paymentLogs.forEach((p) => { const key = `${p.platform}-${p.currencyId}`; - const isPaid = p.originalResponseBlob.payment_status === "paid" || p.originalResponseBlob.status === "approved"; + const blob = p.originalResponseBlob as PaymentResponseBlob | null | undefined; + const isPaid = blob?.payment_status === "paid" || blob?.status === "approved"; if (!consolidatedPayments[key] || !isPaid) { consolidatedPayments[key] = { From 69890faf450a2a708ae95adbc11b8a675f597e53 Mon Sep 17 00:00:00 2001 From: Pillippa Perez Pons Date: Sun, 25 Jan 2026 16:47:57 -0800 Subject: [PATCH 5/5] added prettier --- src/schema/money/queries.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/schema/money/queries.ts b/src/schema/money/queries.ts index 24434878..54f297eb 100644 --- a/src/schema/money/queries.ts +++ b/src/schema/money/queries.ts @@ -94,8 +94,12 @@ builder.queryFields((t) => ({ paymentLogs.forEach((p) => { const key = `${p.platform}-${p.currencyId}`; - const blob = p.originalResponseBlob as PaymentResponseBlob | null | undefined; - const isPaid = blob?.payment_status === "paid" || blob?.status === "approved"; + const blob = p.originalResponseBlob as + | PaymentResponseBlob + | null + | undefined; + const isPaid = + blob?.payment_status === "paid" || blob?.status === "approved"; if (!consolidatedPayments[key] || !isPaid) { consolidatedPayments[key] = {