fix: loop and add enums in db

Author: apsinghdev

apps/api/prisma/migrations/20251030121123_add_payment_constraints/migration.sql

@@ -0,0 +1,21 @@
+/*
+  Warnings:
+
+  - Changed the type of `status` on the `Payment` table. No cast exists, the column would be dropped and recreated, which cannot be done if there is data, since the column is required.
+  - Changed the type of `status` on the `Subscription` table. No cast exists, the column would be dropped and recreated, which cannot be done if there is data, since the column is required.
+
+*/
+-- CreateEnum
+CREATE TYPE "PaymentStatus" AS ENUM ('created', 'authorized', 'captured', 'refunded', 'failed');
+
+-- CreateEnum
+CREATE TYPE "SubscriptionStatus" AS ENUM ('created', 'authenticated', 'active', 'pending', 'halted', 'cancelled', 'completed', 'expired');
+
+-- AlterTable
+ALTER TABLE "Payment" DROP COLUMN "status",
+ADD COLUMN     "status" "PaymentStatus" NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Subscription" DROP COLUMN "status",
+ADD COLUMN     "status" "SubscriptionStatus" NOT NULL,
+ALTER COLUMN "endDate" DROP NOT NULL;

apps/api/prisma/migrations/20251031113043_add_payment_status_enum/migration.sql

@@ -12,6 +12,25 @@ model QueryCount {
   total_queries BigInt
 }
 
+enum PaymentStatus {
+  created
+  authorized
+  captured
+  refunded
+  failed
+}
+
+enum SubscriptionStatus {
+  created
+  authenticated
+  active
+  pending
+  halted
+  cancelled
+  completed
+  expired
+}
+
 model User {
   id            String         @id @default(cuid())
   email         String         @unique
@@ -48,9 +67,9 @@ model Payment {
   subscriptionId    String?
   razorpayPaymentId String        @unique
   razorpayOrderId   String
-  amount            Int
+  amount            Int           // Amount in paise (smallest currency unit)
   currency          String        @default("INR")
-  status            String
+  status            PaymentStatus
   createdAt         DateTime      @default(now())
   updatedAt         DateTime      @updatedAt
   subscription      Subscription? @relation(fields: [subscriptionId], references: [id])
@@ -61,9 +80,9 @@ model Subscription {
   id        String    @id @default(cuid())
   userId    String
   planId    String
-  status    String
+  status    SubscriptionStatus
   startDate DateTime  @default(now())
-  endDate   DateTime
+  endDate   DateTime?
   autoRenew Boolean   @default(true)
   payments  Payment[]
   plan      Plan      @relation(fields: [planId], references: [id], onDelete: Cascade)

apps/api/prisma/schema.prisma

@@ -0,0 +1,21 @@
+import Razorpay from "razorpay";
+
+const RAZORPAY_KEY_ID = process.env.RAZORPAY_KEY_ID;
+const RAZORPAY_KEY_SECRET = process.env.RAZORPAY_KEY_SECRET;
+
+if (!RAZORPAY_KEY_ID) {
+  throw new Error(
+    "RAZORPAY_KEY_ID is required but not set in environment variables. Please configure it in your .env file."
+  );
+}
+
+if (!RAZORPAY_KEY_SECRET) {
+  throw new Error(
+    "RAZORPAY_KEY_SECRET is required but not set in environment variables. Please configure it in your .env file."
+  );
+}
+
+export const rz_instance = new Razorpay({
+  key_id: RAZORPAY_KEY_ID,
+  key_secret: RAZORPAY_KEY_SECRET,
+});

apps/api/src/clients/razorpay.ts

@@ -10,7 +10,6 @@ import type { CorsOptions as CorsOptionsType } from "cors";
 import rateLimit from "express-rate-limit";
 import helmet from "helmet";
 import ipBlocker from "./middleware/ipBlock.js";
-import Razorpay from "razorpay";
 import crypto from "crypto";
 import { paymentService } from "./services/payment.service.js";
 import { verifyToken } from "./utils/auth.js";
@@ -23,11 +22,6 @@ const CORS_ORIGINS = process.env.CORS_ORIGINS
   ? process.env.CORS_ORIGINS.split(",")
   : ["http://localhost:3000", "http://localhost:5000"];
 
-export const rz_instance = new Razorpay({
-  key_id: process.env.RAZORPAY_KEY_ID!,
-  key_secret: process.env.RAZORPAY_KEY_SECRET!,
-});
-
 // Security headers
 app.use(helmet());
 app.use(

apps/api/src/index.ts

@@ -1,4 +1,4 @@
-import { rz_instance } from "../index.js";
+import { rz_instance } from "../clients/razorpay.js";
 import crypto from "crypto";
 import prismaModule from "../prisma.js";
 
@@ -43,7 +43,7 @@ type CreateOrderResponse = RazorpayOrderSuccess | RazorpayError;
 interface PaymentData {
   razorpayPaymentId: string;
   razorpayOrderId: string;
-  amount: number;
+  amount: number; // Amount in paise (smallest currency unit)
   currency: string;
 }
 
@@ -154,7 +154,7 @@ export const paymentService = {
           userId,
           razorpayPaymentId: paymentData.razorpayPaymentId,
           razorpayOrderId: paymentData.razorpayOrderId,
-          amount: paymentData.amount,
+          amount: paymentData.amount, // Amount in paise (smallest currency unit)
           currency: paymentData.currency,
           status: "captured",
         },

apps/api/src/services/payment.service.ts

@@ -42,7 +42,7 @@ const PaymentFlow: React.FC<PaymentFlowProps> = ({
   buttonText = "Invest",
   buttonClassName,
 }) => {
-  const { data: session } = useSession();
+  const { data: session, status: sessionStatus } = useSession();
   const router = useRouter();
   const [isProcessing, setIsProcessing] = useState(false);
   const orderDataRef = useRef<{
@@ -89,9 +89,11 @@ const PaymentFlow: React.FC<PaymentFlowProps> = ({
 
   const handlePayment = async () => {
     try {
-      // Check if user is logged in
-      if (!session) {
-        // Redirect to login with return URL to come back to pricing
+      if (sessionStatus === "loading") {
+        return;
+      }
+
+      if (sessionStatus === "unauthenticated" || !session) {
         router.push("/login?callbackUrl=/pricing");
         return;
       }
@@ -143,20 +145,46 @@ const PaymentFlow: React.FC<PaymentFlowProps> = ({
       };
 
       await initiatePayment(options);
-    } catch (error) {
+    } catch (error: any) {
       console.warn("Failed to create order:", error);
-      router.push("/login?callbackUrl=/pricing");
       setIsProcessing(false);
+
+      // Only redirect to login if it's an authentication error
+      const isAuthError =
+        error?.data?.code === "UNAUTHORIZED" ||
+        error?.message?.includes("UNAUTHORIZED") ||
+        error?.message?.includes("Missing or invalid authorization") ||
+        error?.message?.includes("Invalid or expired token");
+
+      if (isAuthError) {
+        router.push("/login?callbackUrl=/pricing");
+      } else {
+        // For other errors (network, validation, etc.), show user-friendly message
+        alert(
+          "Failed to create payment order. Please try again or contact support if the issue persists."
+        );
+      }
     }
   };
 
+  // Show loading state while session is being determined
+  const isButtonDisabled =
+    isProcessing || isLoading || sessionStatus === "loading";
+
+  const buttonTextDisplay =
+    sessionStatus === "loading"
+      ? "Loading..."
+      : isProcessing || isLoading
+        ? "Processing..."
+        : buttonText;
+
   return (
     <div className="flex flex-col gap-2">
       <PrimaryButton
-        classname={`${buttonClassName || "w-full"} ${isProcessing || isLoading ? "opacity-50 cursor-not-allowed" : ""}`}
-        onClick={isProcessing || isLoading ? undefined : handlePayment}
+        classname={`${buttonClassName || "w-full"} ${isButtonDisabled ? "opacity-50 cursor-not-allowed" : ""}`}
+        onClick={isButtonDisabled ? undefined : handlePayment}
       >
-        {isProcessing || isLoading ? "Processing..." : buttonText}
+        {buttonTextDisplay}
       </PrimaryButton>
       {error && <p className="text-sm text-red-500">Payment error: {error}</p>}
     </div>