From 6785800f3c0674e4754ca63d71af8e644e577877 Mon Sep 17 00:00:00 2001 From: ASIF RAZA Date: Wed, 18 Nov 2026 16:30:08 +0500 Subject: [PATCH 1/2] fix: record Polar refunds and exclude them from payouts --- server/src/routes/webhook/polar.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/src/routes/webhook/polar.ts b/server/src/routes/webhook/polar.ts index f3882bde..846bf4be 100644 --- a/server/src/routes/webhook/polar.ts +++ b/server/src/routes/webhook/polar.ts @@ -1,6 +1,7 @@ import { Router, type Request, type Response } from "express"; import { webhooks } from "@polar-sh/sdk/2026-10"; import { env } from "../../config/env.js"; +import { prisma } from "../../db/prisma.js"; import { fulfillPolarOrderPaid } from "../../services/payments/fulfill-polar-order.js"; import { logger } from "../../utils/logger.js"; @@ -55,8 +56,16 @@ router.post("/", async (req: Request, res: Response) => { metadata, }); } else if (event.type === "order.refunded") { - // Product is non-refundable; keep access and log for ops visibility. - logger.info({ orderId: event.data.id, type: event.type }, "polar refund event ignored (non-refundable product)"); + const order = event.data; + const updated = await prisma.payment.updateMany({ + where: { + provider: "polar", + providerRef: { in: [order.id, order.checkout_id].filter((value): value is string => Boolean(value)) }, + status: "SUCCEEDED", + }, + data: { status: "REFUNDED", instructorPayoutStatus: "NOT_DUE" }, + }); + logger.info({ orderId: order.id, updated: updated.count, type: event.type }, "polar refund recorded"); } res.status(200).json({ received: true }); } catch (error) { From 4657c882e5e7631d38e54de83bcd481c97529e44 Mon Sep 17 00:00:00 2001 From: ASIF RAZA Date: Wed, 18 Nov 2026 16:46:38 +0500 Subject: [PATCH 2/2] Fixed the test failure by moving refund recording into the payment service --- server/src/routes/webhook/polar.ts | 14 +++----------- .../src/services/payments/fulfill-polar-order.ts | 9 +++++++++ .../services/payments/polar-webhook-route.test.ts | 4 +++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/server/src/routes/webhook/polar.ts b/server/src/routes/webhook/polar.ts index 846bf4be..be32a642 100644 --- a/server/src/routes/webhook/polar.ts +++ b/server/src/routes/webhook/polar.ts @@ -1,8 +1,7 @@ import { Router, type Request, type Response } from "express"; import { webhooks } from "@polar-sh/sdk/2026-10"; import { env } from "../../config/env.js"; -import { prisma } from "../../db/prisma.js"; -import { fulfillPolarOrderPaid } from "../../services/payments/fulfill-polar-order.js"; +import { fulfillPolarOrderPaid, recordPolarOrderRefunded } from "../../services/payments/fulfill-polar-order.js"; import { logger } from "../../utils/logger.js"; const router = Router(); @@ -57,15 +56,8 @@ router.post("/", async (req: Request, res: Response) => { }); } else if (event.type === "order.refunded") { const order = event.data; - const updated = await prisma.payment.updateMany({ - where: { - provider: "polar", - providerRef: { in: [order.id, order.checkout_id].filter((value): value is string => Boolean(value)) }, - status: "SUCCEEDED", - }, - data: { status: "REFUNDED", instructorPayoutStatus: "NOT_DUE" }, - }); - logger.info({ orderId: order.id, updated: updated.count, type: event.type }, "polar refund recorded"); + const updated = await recordPolarOrderRefunded({ orderId: order.id, checkoutId: order.checkout_id }); + logger.info({ orderId: order.id, updated, type: event.type }, "polar refund recorded"); } res.status(200).json({ received: true }); } catch (error) { diff --git a/server/src/services/payments/fulfill-polar-order.ts b/server/src/services/payments/fulfill-polar-order.ts index 1f9beca8..75e973d5 100644 --- a/server/src/services/payments/fulfill-polar-order.ts +++ b/server/src/services/payments/fulfill-polar-order.ts @@ -9,6 +9,15 @@ export type PolarOrderPaidInput = { metadata: Record | null | undefined; }; +export async function recordPolarOrderRefunded(input: { orderId: string; checkoutId?: string | null }): Promise { + const providerRefs = [input.orderId, input.checkoutId].filter((value): value is string => Boolean(value)); + const updated = await prisma.payment.updateMany({ + where: { provider: "polar", providerRef: { in: providerRefs }, status: "SUCCEEDED" }, + data: { status: "REFUNDED", instructorPayoutStatus: "NOT_DUE" }, + }); + return updated.count; +} + function metadataString(metadata: Record | null | undefined, key: string): string | null { const value = metadata?.[key]; return typeof value === "string" && value.trim() ? value.trim() : null; diff --git a/server/tests/unit/services/payments/polar-webhook-route.test.ts b/server/tests/unit/services/payments/polar-webhook-route.test.ts index 9bb69872..5b15cbba 100644 --- a/server/tests/unit/services/payments/polar-webhook-route.test.ts +++ b/server/tests/unit/services/payments/polar-webhook-route.test.ts @@ -4,6 +4,7 @@ import request from "supertest"; const validateEvent = vi.hoisted(() => vi.fn()); const fulfillPolarOrderPaid = vi.hoisted(() => vi.fn()); +const recordPolarOrderRefunded = vi.hoisted(() => vi.fn()); vi.mock("@polar-sh/sdk/2026-10", () => { class PolarWebhookVerificationError extends Error {} @@ -21,7 +22,7 @@ vi.mock("../../../../src/config/env.js", () => ({ env: { POLAR_WEBHOOK_SECRET: "whsec_test" }, })); -vi.mock("../../../../src/services/payments/fulfill-polar-order.js", () => ({ fulfillPolarOrderPaid })); +vi.mock("../../../../src/services/payments/fulfill-polar-order.js", () => ({ fulfillPolarOrderPaid, recordPolarOrderRefunded })); vi.mock("../../../../src/utils/logger.js", () => ({ logger: { warn: vi.fn(), info: vi.fn(), error: vi.fn() } })); import polarWebhookRoutes from "../../../../src/routes/webhook/polar.js"; @@ -93,5 +94,6 @@ describe("POST /webhooks/polar", () => { expect(res.status).toBe(200); expect(fulfillPolarOrderPaid).not.toHaveBeenCalled(); + expect(recordPolarOrderRefunded).toHaveBeenCalledWith({ orderId: "ord_refund", checkoutId: undefined }); }); });