fix: fix coderabbit reviews

Author: apsinghdev

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

@@ -11,11 +11,31 @@ CREATE TYPE "PaymentStatus" AS ENUM ('created', 'authorized', 'captured', 'refun
 -- 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;
+-- AlterTable: Migrate Payment.status from TEXT to PaymentStatus enum
+-- First, temporarily drop NOT NULL constraint to allow safe conversion
+ALTER TABLE "Payment" ALTER COLUMN "status" DROP NOT NULL;
+
+-- Convert the column type preserving existing data
+ALTER TABLE "Payment" ALTER COLUMN "status" TYPE "PaymentStatus" USING status::"PaymentStatus";
+
+-- Backfill any NULLs with a default value if needed (shouldn't be necessary but being safe)
+-- If there are NULLs, we'd set a default here, but since original was NOT NULL, this shouldn't be needed
+
+-- Re-add NOT NULL constraint after successful conversion
+ALTER TABLE "Payment" ALTER COLUMN "status" SET NOT NULL;
+
+-- AlterTable: Migrate Subscription.status from TEXT to SubscriptionStatus enum
+-- First, temporarily drop NOT NULL constraint to allow safe conversion
+ALTER TABLE "Subscription" ALTER COLUMN "status" DROP NOT NULL;
+
+-- Convert the column type preserving existing data
+ALTER TABLE "Subscription" ALTER COLUMN "status" TYPE "SubscriptionStatus" USING status::"SubscriptionStatus";
+
+-- Backfill any NULLs with a default value if needed (shouldn't be necessary but being safe)
+-- If there are NULLs, we'd set a default here, but since original was NOT NULL, this shouldn't be needed
+
+-- Re-add NOT NULL constraint after successful conversion
+ALTER TABLE "Subscription" ALTER COLUMN "status" SET NOT NULL;
+
+-- AlterTable: Make Subscription.endDate nullable
+ALTER TABLE "Subscription" ALTER COLUMN "endDate" DROP NOT NULL;

apps/api/src/prisma.ts

@@ -117,3 +117,5 @@ async function connectDB() {
 
 export { withTimeout };
 export default { prisma, connectDB };
+
+export type ExtendedPrismaClient = typeof prisma;

apps/api/src/routers/payment.ts

@@ -7,7 +7,7 @@ import prismaModule from "../prisma.js";
 
 const { prisma } = prismaModule;
 
-const ALLOWED_NOTE_KEYS = ["plan", "user_email"] as const;
+const ALLOWED_NOTE_KEYS = ["plan"] as const;
 const MAX_NOTE_VALUE_LENGTH = 255;
 
 const createOrderSchema = z.object({

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

@@ -116,13 +116,30 @@ export const authService = {
       createData.session_state = session_state;
     }
 
-    const account = await prisma.account.upsert({
-      where: {
-        provider_providerAccountId: {
-          provider,
-          providerAccountId,
-        },
+    // Prisma rejects upsert with empty update object, so short-circuit to findUnique
+    const whereClause = {
+      provider_providerAccountId: {
+        provider,
+        providerAccountId,
       },
+    };
+
+    if (Object.keys(updateData).length === 0) {
+      const existingAccount = await prisma.account.findUnique({
+        where: whereClause,
+      });
+
+      if (existingAccount) {
+        return existingAccount;
+      }
+
+      return await prisma.account.create({
+        data: createData,
+      });
+    }
+
+    const account = await prisma.account.upsert({
+      where: whereClause,
       update: updateData,
       create: createData,
     });

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

@@ -1,7 +1,5 @@
 import type { PrismaClient } from "@prisma/client";
-import type prismaModule from "../prisma.js";
-
-type ExtendedPrismaClient = typeof prismaModule.prisma;
+import type { ExtendedPrismaClient } from "../prisma.js";
 
 export const queryService = {
   /**

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

@@ -1,9 +1,7 @@
 import type { PrismaClient } from "@prisma/client";
-import type prismaModule from "../prisma.js";
+import type { ExtendedPrismaClient } from "../prisma.js";
 import { SUBSCRIPTION_STATUS } from "../constants/subscription.js";
 
-type ExtendedPrismaClient = typeof prismaModule.prisma;
-
 export const userService = {
   /**
    * Get total count of users

apps/api/src/utils/encryption.ts

@@ -94,16 +94,48 @@ export function decrypt(
 
 /**
  * Encrypt OAuth tokens in an Account object
+ * Only includes token fields that are explicitly present (not undefined) in the input
+ * This prevents overwriting existing tokens with null on partial updates
  */
 export function encryptAccountTokens(data: any): any {
   if (!data) return data;
 
-  return {
-    ...data,
-    refresh_token: data.refresh_token ? encrypt(data.refresh_token) : null,
-    access_token: data.access_token ? encrypt(data.access_token) : null,
-    id_token: data.id_token ? encrypt(data.id_token) : null,
-  };
+  const {
+    refresh_token: _refresh_token,
+    access_token: _access_token,
+    id_token: _id_token,
+    expires_at: _expires_at,
+    token_type: _token_type,
+    scope: _scope,
+    ...result
+  } = data;
+
+  // Only add token fields if they were explicitly provided
+  if (data.access_token !== undefined) {
+    result.access_token = encrypt(data.access_token);
+  }
+
+  if (data.refresh_token !== undefined) {
+    result.refresh_token = encrypt(data.refresh_token);
+  }
+
+  if (data.id_token !== undefined) {
+    result.id_token = encrypt(data.id_token);
+  }
+
+  if (data.expires_at !== undefined) {
+    result.expires_at = data.expires_at;
+  }
+
+  if (data.token_type !== undefined) {
+    result.token_type = data.token_type;
+  }
+
+  if (data.scope !== undefined) {
+    result.scope = data.scope;
+  }
+
+  return result;
 }
 
 /**

apps/web/src/components/checkout/checkout-confirmation.tsx

@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import { Check } from "lucide-react";
 import { cn } from "@/lib/utils";
 import { useSession } from "next-auth/react";
+import type { Session } from "next-auth";
 
 interface CheckoutConfirmationProps {
   className?: string;
@@ -14,17 +15,24 @@ const CheckoutConfirmation: React.FC<CheckoutConfirmationProps> = ({
 }) => {
   const { data: session } = useSession();
   const [error, setError] = useState<string | null>(null);
+  const [isJoining, setIsJoining] = useState(false);
 
   const handleJoinCommunity = async () => {
+    if (isJoining) return;
+    setIsJoining(true);
+    setError(null);
+
     if (!session?.user) {
       setError("Please sign in to join the community");
+      setIsJoining(false);
       return;
     }
 
-    const accessToken = (session as any)?.accessToken;
+    const accessToken = (session as Session)?.accessToken;
 
     if (!accessToken) {
       setError("Authentication token not found");
+      setIsJoining(false);
       return;
     }
 
@@ -40,6 +48,7 @@ const CheckoutConfirmation: React.FC<CheckoutConfirmationProps> = ({
       if (!response.ok) {
         const errorData = await response.json();
         setError(errorData.error || "Failed to join community");
+        setIsJoining(false);
         return;
       }
 
@@ -48,6 +57,7 @@ const CheckoutConfirmation: React.FC<CheckoutConfirmationProps> = ({
     } catch (err) {
       console.error("Failed to join community:", err);
       setError("Failed to connect to server");
+      setIsJoining(false);
     }
   };
 
@@ -84,9 +94,10 @@ const CheckoutConfirmation: React.FC<CheckoutConfirmationProps> = ({
             <div className="pt-4">
               <button
                 onClick={handleJoinCommunity}
+                disabled={isJoining}
                 className="px-8 py-3 bg-[#A970FF] hover:bg-[#9255E8] text-white font-semibold rounded-lg transition-colors duration-200"
               >
-                Join
+                {isJoining ? "Joining..." : "Join"}
               </button>
               {error && <p className="text-red-400 text-sm mt-2">{error}</p>}
             </div>

apps/web/src/providers/trpc-provider.tsx

@@ -4,6 +4,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { httpBatchLink } from "@trpc/client";
 import { useState, useMemo } from "react";
 import { useSession } from "next-auth/react";
+import type { Session } from "next-auth";
 import superjson from "superjson";
 import { trpc } from "@/lib/trpc";
 
@@ -31,7 +32,7 @@ export function TRPCProvider({ children }: { children: React.ReactNode }) {
           transformer: superjson,
           url: trpcUrl,
           async headers() {
-            const token = (session as any)?.accessToken;
+            const token = (session as Session)?.accessToken;
             if (token) {
               return {
                 authorization: `Bearer ${token}`,