fix: order not created in db issue

Srihari62 · Srihari62 · commit 1042ac7c6d92 · 2026-06-20T15:14:28.000+05:30
diff --git a/apps/order-service/src/controllers/order.controller.ts b/apps/order-service/src/controllers/order.controller.ts
@@ -12,10 +12,20 @@ const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, {
 
 // Shared order processing logic - Hardened for Production
 const processOrderCreation = async (userId: string, sessionId: string, paymentMethod: string) => {
+    const createdKey = `order-created:${sessionId}`;
+    // Atomically set processed flag / acquire lock to prevent duplicate creation
+    const lockAcquired = await redis.set(createdKey, "true", "EX", 86400, "NX");
+    if (!lockAcquired) {
+        console.log(`[Order] Order for session ${sessionId} is already processed or being processed.`);
+        return;
+    }
+
     const sessionKey = `payment-session:${sessionId}`;
     const sessionData = await redis.get(sessionKey);
 
     if (!sessionData) {
+        // Release lock so it can be retried later
+        await redis.del(createdKey);
         throw new Error(`Critical: Payment session ${sessionId} not found or expired.`);
     }
 
@@ -290,7 +300,33 @@ export const verifyPaymentSession = async (req: any, res: Response, next: NextFu
         const sessionId = req.query.sessionId as string;
         const sessionData = await redis.get(`payment-session:${sessionId}`);
         if (!sessionData) return res.status(404).json({ message: "Session expired" });
-        return res.status(200).json({ success: true, session: JSON.parse(sessionData) });
+
+        const session = JSON.parse(sessionData);
+
+        // Self-heal: Check if order has already been created for this session
+        const createdKey = `order-created:${sessionId}`;
+        const isCreated = await redis.get(createdKey);
+
+        if (!isCreated) {
+            console.log(`[Order] Order not marked as created for session ${sessionId}. Checking Stripe...`);
+            try {
+                // Search for Stripe PaymentIntent matching this sessionId
+                const searchResults = await stripe.paymentIntents.search({
+                    query: `metadata['sessionId']:'${sessionId}'`,
+                });
+                
+                const paymentIntent = searchResults.data[0];
+                if (paymentIntent && paymentIntent.status === "succeeded") {
+                    console.log(`[Order] Found succeeded Stripe PaymentIntent ${paymentIntent.id} for session ${sessionId}. Self-healing order creation...`);
+                    const userId = paymentIntent.metadata.userId || session.userId;
+                    await processOrderCreation(userId, sessionId, "Stripe");
+                }
+            } catch (stripeError) {
+                console.error("[Order] Stripe session self-healing check failed:", stripeError);
+            }
+        }
+
+        return res.status(200).json({ success: true, session });
     } catch (error) {
         return next(error)
     }
diff --git a/apps/seller-ui/src/app/(routes)/dashboard/settings/page.tsx b/apps/seller-ui/src/app/(routes)/dashboard/settings/page.tsx
@@ -255,9 +255,16 @@ const SettingsPage = () => {
                   <button 
                     onClick={connectStripe}
                     disabled={isConnectingStripe}
-                    className="bg-blue-600 hover:bg-blue-500 text-white font-black uppercase tracking-[0.2em] text-[10px] px-12 py-5 rounded-2xl transition-all shadow-xl shadow-blue-600/20 disabled:opacity-50"
+                    className="bg-blue-600 hover:bg-blue-500 text-white font-black uppercase tracking-[0.2em] text-[10px] px-12 py-5 rounded-2xl transition-all shadow-xl shadow-blue-600/20 disabled:opacity-50 flex items-center justify-center gap-2 mx-auto"
                   >
-                    {isConnectingStripe ? "Connecting..." : "Connect Stripe Account"}
+                    {isConnectingStripe ? (
+                      <>
+                        <Loader2 className="animate-spin w-4 h-4" />
+                        Connecting...
+                      </>
+                    ) : (
+                      "Connect Stripe Account"
+                    )}
                   </button>
                 </div>
               )}
diff --git a/apps/seller-ui/src/app/(routes)/signup/page.tsx b/apps/seller-ui/src/app/(routes)/signup/page.tsx
@@ -3,7 +3,7 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 import React, { useRef, useState } from "react";
 import { useForm } from "react-hook-form";
-import { Eye, EyeOff } from "lucide-react";
+import { Eye, EyeOff, Loader2 } from "lucide-react";
 import { useMutation } from "@tanstack/react-query";
 import axios, { AxiosError } from "axios";
 import countries from "@/utils/countries";
@@ -27,6 +27,7 @@ const Signup = () => {
   const [otp, setOtp] = useState(["", "", "", ""]);
   const [sellerData, setSellerData] = useState<FormData | null>(null);
   const [sellerId, setSellerId] = useState("");
+  const [isConnectingStripe, setIsConnectingStripe] = useState(false);
   const inputRefs = useRef<(HTMLInputElement | null)[]>([]);
 
   const {
@@ -118,6 +119,7 @@ const Signup = () => {
 
   const connectStripe = async () => {
     try {
+      setIsConnectingStripe(true);
       console.log(sellerId, "SellerId");
       if (!sellerId) {
         toast.error("Seller ID is missing. Please restart signup.");
@@ -139,6 +141,8 @@ const Signup = () => {
           error.message ||
           "Failed to connect to Stripe"
       );
+    } finally {
+      setIsConnectingStripe(false);
     }
   };
 
@@ -360,9 +364,19 @@ const Signup = () => {
             <br />
             <button
               onClick={connectStripe}
-              className="w-full m-auto flex items-center justify-center gap-3 text-lg bg-[#334155] text-white py-2 rounded-lg"
+              disabled={isConnectingStripe}
+              className="w-full m-auto flex items-center justify-center gap-3 text-lg bg-[#334155] text-white py-2 rounded-lg disabled:opacity-50"
             >
-              Connect <StripeLogo />
+              {isConnectingStripe ? (
+                <>
+                  <Loader2 className="animate-spin w-5 h-5" />
+                  Connecting...
+                </>
+              ) : (
+                <>
+                  Connect <StripeLogo />
+                </>
+              )}
             </button>
           </div>
         )}
diff --git a/apps/seller-ui/src/app/shared/components/sidebar/sidebar.item.tsx b/apps/seller-ui/src/app/shared/components/sidebar/sidebar.item.tsx
@@ -5,24 +5,34 @@ interface Props {
   icon: React.ReactNode;
   title: string;
   isActive?: boolean;
-  href: string;
+  href?: string;
+  onClick?: () => void;
 }
 
-const SidebarItem = ({ icon, title, isActive, href }: Props) => {
-  return (
-    <Link href={href} className="my-2 block">
-      <div
-        className={`flex gap-2 w-full min-h-12 h-full items-center px-[13px] rounded-lg cursor-pointer transition hover:bg-[#2b2f31] 
-      ${
-        isActive &&
-        "scale-[.98] bg-[#0f3158] fill-blue-200 hover:!bg-[#0f3158d6]"
-      } `}
-      >
-        {icon}
-        <h5 className="text-slate-200 text-lg">{title}</h5>
-      </div>
-    </Link>
+const SidebarItem = ({ icon, title, isActive, href, onClick }: Props) => {
+  const content = (
+    <div
+      onClick={onClick}
+      className={`flex gap-2 w-full min-h-12 h-full items-center px-[13px] rounded-lg cursor-pointer transition hover:bg-[#2b2f31] 
+    ${
+      isActive &&
+      "scale-[.98] bg-[#0f3158] fill-blue-200 hover:!bg-[#0f3158d6]"
+    } `}
+    >
+      {icon}
+      <h5 className="text-slate-200 text-lg">{title}</h5>
+    </div>
   );
+
+  if (href) {
+    return (
+      <Link href={href} className="my-2 block">
+        {content}
+      </Link>
+    );
+  }
+
+  return <div className="my-2 block">{content}</div>;
 };
 
 export default SidebarItem;
diff --git a/apps/seller-ui/src/app/shared/components/sidebar/sidebar.tsx b/apps/seller-ui/src/app/shared/components/sidebar/sidebar.tsx
@@ -1,14 +1,16 @@
 "use client";
 
 import useSidebar from "@/hooks/useSidebar";
-import { usePathname } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
 import React, { useEffect } from "react";
 import Box from "../box";
 import { Sidebar } from "./sidebar.styles";
 import Link from "next/link";
 import useSeller from "@/hooks/useSeller";
 import Logo from "@/assets/svgs/logo";
 import SidebarItem from "./sidebar.item";
+import axiosInstance from "@/utils/axiosInstance";
+import toast from "react-hot-toast";
 import {
   BellPlus,
   BellRing,
@@ -28,12 +30,24 @@ import SidebarMenu from "./sidebar.menu";
 const SideBarWrapper = () => {
   const { activeSidebar, setActiveSidebar } = useSidebar();
   const pathName = usePathname();
+  const router = useRouter();
   const { seller } = useSeller();
 
   useEffect(() => {
     setActiveSidebar(pathName);
   }, [pathName, setActiveSidebar]);
 
+  const handleLogout = async () => {
+    try {
+      await axiosInstance.get("/api/logout");
+      toast.success("Logged out successfully");
+      router.push("/login");
+    } catch (error: any) {
+      console.error("Logout failed:", error);
+      toast.error("Logout failed. Please try again.");
+    }
+  };
+
   const getIconColor = (path: string) => {
     return activeSidebar === path ? "#0085ff" : "#969696";
   };
@@ -196,8 +210,7 @@ const SideBarWrapper = () => {
                 icon={
                   <LogOut size={20} color={getIconColor("/dashboard/logout")} />
                 }
-                isActive={activeSidebar === "/dashboard/logout"}
-                href="/dashboard/logout"
+                onClick={handleLogout}
               />
             </SidebarMenu>
           </div>
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -59,9 +59,9 @@ services:
     command: |
       bash -c '
         echo "Creating Kafka Topics...."
-        kafka-topics --create --topic user-events --bootstrap-server kafka:29092 --replication-factor 1 --partitions 1
+        kafka-topics --create --topic users-events --bootstrap-server kafka:29092 --replication-factor 1 --partitions 1
         kafka-topics --create --topic logs --bootstrap-server kafka:29092 --replication-factor 1 --partitions 1
-        kafka-topics --create --topic chat.new_message --bootstrap-server kafka:29092 --replication-factor 1 --partitions 1
+        kafka-topics --create --topic chat.new.message --bootstrap-server kafka:29092 --replication-factor 1 --partitions 1
         echo "Kafka Topics Created Successfully...."
       '
     restart: no
diff --git a/packages/utils/kafka/index.ts b/packages/utils/kafka/index.ts
@@ -1,14 +1,35 @@
-import {Kafka} from "kafkajs";
-
-export const kafka = new Kafka({
-    clientId: "kafka-service",
-    brokers: [process.env.KAFKA_BROKER!],
-    ssl: {
-        rejectUnauthorized: false,
-    },
-    sasl: {
-        mechanism: "plain",
-        username: process.env.KAFKA_API_KEY!,
-        password: process.env.KAFKA_API_SECRET!
+import { Kafka, KafkaConfig } from "kafkajs";
+
+const getEnv = (key: string): string | undefined => {
+  const value = process.env[key];
+  if (value !== undefined) return value.trim();
+
+  for (const envKey of Object.keys(process.env)) {
+    if (envKey.trim() === key) {
+      return process.env[envKey]?.trim();
     }
-})
+  }
+  return undefined;
+};
+
+const broker = getEnv("KAFKA_BROKER") || getEnv("KAFKA_BROKERS") || "localhost:9092";
+const apiKey = getEnv("KAFKA_API_KEY");
+const apiSecret = getEnv("KAFKA_API_SECRET");
+
+const kafkaConfig: KafkaConfig = {
+  clientId: "kafka-service",
+  brokers: [broker],
+};
+
+if (apiKey && apiSecret) {
+  kafkaConfig.ssl = {
+    rejectUnauthorized: false,
+  };
+  kafkaConfig.sasl = {
+    mechanism: "plain",
+    username: apiKey,
+    password: apiSecret,
+  };
+}
+
+export const kafka = new Kafka(kafkaConfig);
