From 2e6668ff0d4c24313f6079e9acf43d1b103f1545 Mon Sep 17 00:00:00 2001
From: Unchained <unchained@nodecrew.me>
Date: Wed, 25 Mar 2026 20:35:39 +0200
Subject: [PATCH] fix(webhook): prevent duplicate revenue tracking

Move analytics tracking inside ORDER_CONFIRMED conditional block
so revenue is only tracked once when order is confirmed, not twice
(once for ORDER_CREATED and once for ORDER_CONFIRMED).
---
 src/app/api/webhooks/saleor/route.ts | 37 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/app/api/webhooks/saleor/route.ts b/src/app/api/webhooks/saleor/route.ts
index 0e6fd7a..f49c978 100644
--- a/src/app/api/webhooks/saleor/route.ts
+++ b/src/app/api/webhooks/saleor/route.ts
@@ -163,28 +163,29 @@ async function handleOrderConfirmed(order: Order, eventType: string) {
   // Send customer email only for ORDER_CONFIRMED (not ORDER_CREATED)
   if (eventType === "ORDER_CONFIRMED") {
     await orderNotificationService.sendOrderConfirmation(order);
+    
+    // Track revenue and order analytics only on ORDER_CONFIRMED (not ORDER_CREATED)
+    // This prevents duplicate tracking when both events fire for the same order
+    analyticsService.trackOrderReceived({
+      orderId: order.id,
+      orderNumber: order.number,
+      total: order.total.gross.amount,
+      currency: order.total.gross.currency,
+      itemCount,
+      customerEmail: order.userEmail,
+      eventType,
+    });
+
+    analyticsService.trackRevenue({
+      amount: order.total.gross.amount,
+      currency: order.total.gross.currency,
+      orderId: order.id,
+      orderNumber: order.number,
+    });
   }
 
   // Send admin notification for both events
   await orderNotificationService.sendOrderConfirmationToAdmin(order);
-
-  // Track analytics (fire and forget - don't await)
-  analyticsService.trackOrderReceived({
-    orderId: order.id,
-    orderNumber: order.number,
-    total: order.total.gross.amount,
-    currency: order.total.gross.currency,
-    itemCount,
-    customerEmail: order.userEmail,
-    eventType,
-  });
-
-  analyticsService.trackRevenue({
-    amount: order.total.gross.amount,
-    currency: order.total.gross.currency,
-    orderId: order.id,
-    orderNumber: order.number,
-  });
 }
 
 async function handleOrderFulfilled(order: Order) {