Fix subscription CTA flow and harden billing consistency

Author: olyaiy

src/app/(dashboard)/home/page.tsx

@@ -74,9 +74,9 @@ export default async function Home({
 
   // Get sort parameters for both sections
   const baseSort = (params.baseSort as SortOption) || 'createdAt';
-  const baseDirection = (params.baseDirection as SortDirection) || 'asc';
+  const baseDirection = (params.baseDirection as SortDirection) || 'desc';
   const tailoredSort = (params.tailoredSort as SortOption) || 'createdAt';
-  const tailoredDirection = (params.tailoredDirection as SortDirection) || 'asc';
+  const tailoredDirection = (params.tailoredDirection as SortDirection) || 'desc';
 
   // Sort function
   function sortResumes(resumes: ResumeSummary[], sort: SortOption, direction: SortDirection) {
@@ -89,8 +89,8 @@ export default async function Home({
           return modifier * ((a.target_role || '').localeCompare(b.target_role || '') || 0);
         case 'createdAt':
         default:
-          return modifier * (new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
-      
+          return modifier * (new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+       
     }
     });
   }

src/app/(dashboard)/resumes/page.tsx

@@ -37,7 +37,7 @@ export default async function ResumesPage({
         return modifier * (a.target_role?.localeCompare(b.target_role || '') || 0);
       case 'createdAt':
       default:
-        return modifier * (new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
+        return modifier * (new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
     }
   });
 

src/app/api/webhooks/stripe/route.ts

@@ -75,10 +75,7 @@ async function handleSubscriptionChange(
       planId: subscriptionData.planId,
       data: subscriptionData
     });
-    
-    // Log but don't throw the error to prevent webhook failure response
-    // This allows the webhook to acknowledge receipt even if DB update fails
-    console.error('Continuing webhook processing despite error...');
+    throw error;
   }
 }
 
@@ -244,27 +241,18 @@ export async function POST(req: Request) {
           status: subscription.status
         });
 
-        try {
-          await handleSubscriptionChange(
-            subscription.customer as string,
-            {
-              subscriptionId: subscription.id,
-              planId: 'free',
-              status: 'canceled',
-              currentPeriodEnd: null,
-              trialEnd: null,
-              cancelAtPeriodEnd: false
-            }
-          );
-          console.log('✅ Subscription deletion processed successfully');
-        } catch (error) {
-          console.error('❌ Failed to process subscription deletion:', {
-            error: error instanceof Error ? error.message : 'Unknown error',
+        await handleSubscriptionChange(
+          subscription.customer as string,
+          {
             subscriptionId: subscription.id,
-            customerId: subscription.customer
-          });
-          // Continue processing the webhook even if this fails
-        }
+            planId: 'free',
+            status: 'canceled',
+            currentPeriodEnd: null,
+            trialEnd: null,
+            cancelAtPeriodEnd: false
+          }
+        );
+        console.log('✅ Subscription deletion processed successfully');
         break;
       }
 

src/components/settings/subscription-section.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useState, useEffect } from 'react';
+import { useRouter } from 'next/navigation';
 import { Button } from "@/components/ui/button"
 import { Badge } from "@/components/ui/badge"
 import { Sparkles, Star, Clock, Zap, ArrowRight, Crown, Shield, Check, Users, TrendingUp } from "lucide-react"
@@ -13,6 +14,7 @@ export function SubscriptionSection() {
   const [isLoading, setIsLoading] = useState(false);
   const [profile, setProfile] = useState<SubscriptionSnapshot | null>(null);
   const [isLoadingProfile, setIsLoadingProfile] = useState(true);
+  const router = useRouter();
 
   useEffect(() => {
     async function fetchSubscriptionStatus() {
@@ -41,7 +43,15 @@ export function SubscriptionSection() {
     trialEndLabel,
   } = subscriptionAccessState;
 
-  const handlePortalSession = async () => {
+  const handleSubscriptionAction = async () => {
+    if (!hasProAccess) {
+      const priceId = process.env.NEXT_PUBLIC_STRIPE_PRO_PRICE_ID;
+      if (priceId) {
+        router.push(`/subscription/checkout?price_id=${priceId}`);
+      }
+      return;
+    }
+
     try {
       setIsLoading(true);
       const result = await createPortalSession();
@@ -289,7 +299,7 @@ export function SubscriptionSection() {
 
             {/* CTA Button */}
             <Button
-              onClick={handlePortalSession}
+              onClick={handleSubscriptionAction}
               disabled={isLoading}
               className={cn(
                 "w-full py-3 font-semibold rounded-lg transition-all duration-300",

src/utils/actions/stripe/actions.ts

@@ -281,77 +281,6 @@ export async function getSubscriptionStatus() {
   return subscription;
 }
 
-export async function createCheckoutSession(priceId: string) {
-  const supabase = await createClient();
-
-  const { data: { user }, error: userError } = await supabase.auth.getUser();
-  
-  if (userError || !user) {
-    throw new Error('User not authenticated');
-  }
-
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
-  const response = await fetch(`${basePath}/api/create-checkout-session`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      priceId,
-      userId: user.id,
-      email: user.email,
-    }),
-  });
-
-  if (!response.ok) {
-    throw new Error('Failed to create checkout session');
-  }
-
-  const { sessionId } = await response.json();
-  return { sessionId };
-}
-
-export async function cancelSubscription() {
-  const supabase = await createClient();
-
-  const { data: { user }, error: userError } = await supabase.auth.getUser();
-  
-  if (userError || !user) {
-    throw new Error('User not authenticated');
-  }
-
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH || '';
-  const response = await fetch(`${basePath}/api/cancel-subscription`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      userId: user.id,
-    }),
-  });
-
-  if (!response.ok) {
-    throw new Error('Failed to cancel subscription');
-  }
-
-  // Update the profile subscription status
-  const { error: updateError } = await supabase
-    .from('profiles')
-    .update({
-      subscription_status: 'canceled',
-    })
-    .eq('user_id', user.id);
-
-  if (updateError) {
-    throw new Error('Failed to update subscription status');
-  }
-
-  revalidatePath('/', 'layout');
-  revalidatePath('/settings', 'layout');
-  revalidatePath('/plans', 'layout');
-}
-
 export async function checkSubscriptionPlan() {
   const supabase = await createClient();
   const { data: { user } } = await supabase.auth.getUser();