fixed retry attempts duplicating exact orders

dilmaheu · Nov 6, 2023 · ee46a20 · ee46a20
1 parent 64e47c3
commit ee46a20
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/utils/context.ts b/src/utils/context.ts
@@ -18,8 +18,16 @@ export default new Proxy(
   },
 ) as Context;
 
-export async function setupContext(id: string) {
-  key = await hash(id, "SHA-256");
+export async function setupContext(request: Request, id: string | number) {
+  // remove retry attempt params from URL
+  const requestURL = new URL(request.url);
+
+  requestURL.searchParams.delete("attempt");
+  requestURL.searchParams.delete("requestID");
+
+  const contextID = requestURL.toString() + id;
+
+  key = await hash(contextID, "SHA-256");
 
   const storedContext = await (env.WORKER_CONTEXTS as KVNamespace).get(key);
 

diff --git a/src/workers/dilmahtea-me-dimass-webhook/src/index.ts b/src/workers/dilmahtea-me-dimass-webhook/src/index.ts
@@ -30,9 +30,7 @@ async function handlePOST(request: Request, env: ENV): Promise<Response> {
 
   const webhookData = JSON.parse(payload) as WebhookResponseData;
 
-  const contextID = request.url + webhookData.id;
-
-  await setupContext(contextID);
+  await setupContext(request, webhookData.id);
 
   const event = request.headers.get("X-SP-Event") as AcceptedShipmentEvents;
 

diff --git a/src/workers/dilmahtea-me-dimass-webhook/wrangler.toml b/src/workers/dilmahtea-me-dimass-webhook/wrangler.toml
@@ -12,7 +12,7 @@ routes = [
 kv_namespaces = [
     { binding = "EXACT_TOKENS", id = "0cbeb7b84a6a4e31b9c3360f97c9cef5" },
     { binding = "EXACT_LAYOUTS", id = "b75eb1bee9d7488fa33b8be89caab307" },
-    { binding = "WORKER_CONTEXTS", id = "3fcd1790b1e644caa0d76d1be2fc27f7" }
+    { binding = "WORKER_CONTEXTS", id = "bf39422efbc34bd58d3c3e064660474f" }
 ]
 services = [{ binding = "RETRY_WORKERS", service = "dilmahtea-me-retry-workers" }]
 

diff --git a/src/workers/dilmahtea-me-stripe-webhook/src/index.ts b/src/workers/dilmahtea-me-stripe-webhook/src/index.ts
@@ -42,9 +42,7 @@ async function handlePOST(request: Request, env: ENV) {
   // @ts-ignore
   const { paymentID, payment_type } = event.data.object.metadata as MetaData;
 
-  const contextID = request.url + paymentID;
-
-  await setupContext(contextID);
+  await setupContext(request, paymentID);
 
   const PAYMENT_INTENTS =
     payment_type === "crowdfunding"

diff --git a/src/workers/dilmahtea-me-stripe-webhook/wrangler.toml b/src/workers/dilmahtea-me-stripe-webhook/wrangler.toml
@@ -14,7 +14,7 @@ kv_namespaces = [
     { binding = "EXACT_TOKENS", id = "0cbeb7b84a6a4e31b9c3360f97c9cef5" },
     { binding = "CROWDFUNDINGS", id = "c971dd86589647799fb64dde47563fac" },
     { binding = "ECOMMERCE_PAYMENTS", id = "5086c43e26a14fa3a177ea876f514a8f" },
-    { binding = "WORKER_CONTEXTS", id = "3fcd1790b1e644caa0d76d1be2fc27f7" }
+    { binding = "WORKER_CONTEXTS", id = "bf39422efbc34bd58d3c3e064660474f" }
 ]
 services = [{ binding = "RETRY_WORKERS", service = "dilmahtea-me-retry-workers" }]