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/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) => ({ diff --git a/src/schema/money/queries.ts b/src/schema/money/queries.ts index a9f46ab8..54f297eb 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,12 @@ 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] = {