update: handle automatic query updates better

Author: Johnmiicheal

src/app/api/cron-process-query/route.ts

@@ -623,7 +623,7 @@ async function processQueryDirectly(query: any) {
     // Get user's subscription and current usage
     const { data: subscription, error: subError } = await supabase
       .from('user_subscriptions')
-      .select('query_count, status, price_id')
+      .select('query_count, status, price_id, payg_credits')
       .eq('user_id', query.user_id)
       .single();
 
@@ -673,7 +673,7 @@ async function processQueryDirectly(query: any) {
     });
 
     // Check if user has enough credits
-    if (currentUsage + creditsRequired > userConstraints.max_credits) {
+    if (currentUsage + creditsRequired > userConstraints.max_credits && subscription.payg_credits === 0) {
       console.warn(`⚠️ User ${query.user_id} has insufficient credits. Pausing query ${query.id}`);
 
       // Track insufficient credits event
@@ -712,7 +712,7 @@ async function processQueryDirectly(query: any) {
     }
 
     // Check if subscription is active
-    if (subscription.status !== 'active') {
+    if (subscription.status !== 'active' && subscription.payg_credits === 0) {
       console.warn(`⚠️ User ${query.user_id} subscription is not active (${subscription.status}). Pausing query ${query.id}`);
 
       // Track inactive subscription event

src/app/api/schedule-query/route.ts

@@ -691,7 +691,7 @@ async function processQuery(
   // Get user's subscription and current usage
   const { data: subscription, error: subError } = await supabase
     .from('user_subscriptions')
-    .select('query_count, status, price_id')
+    .select('query_count, status, price_id, payg_credits')
     .eq('user_id', query.user_id)
     .single();
 
@@ -763,7 +763,7 @@ async function processQuery(
   });
 
   // Check if user has enough credits
-  if (currentUsage + creditsRequired > userConstraints.max_credits) {
+  if (currentUsage + creditsRequired > userConstraints.max_credits && subscription.payg_credits === 0) {
     console.warn(`⚠️ User ${query.user_id} has insufficient credits for query ${query.id}`);
     sentryServer.logger.warn(`User ${query.user_id} has insufficient credits for query ${query.id}`, { 
       log_source: 'schedule_query',
@@ -789,7 +789,7 @@ async function processQuery(
   }
 
   // Check if subscription is active
-  if (subscription.status !== 'active') {
+  if (subscription.status !== 'active' && subscription.payg_credits === 0) {
     console.warn(`⚠️ User ${query.user_id} subscription is not active (${subscription.status}) for query ${query.id}`);
     sentryServer.logger.warn(`User ${query.user_id} subscription is not active (${subscription.status}) for query ${query.id}`, { 
       log_source: 'schedule_query',

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

@@ -55,6 +55,58 @@ export async function POST(request: Request) {
     process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
   );
 
+  // Function to reactivate paused queries when user gets more credits
+  async function reactivatePausedQueries(userId: string, reason: string) {
+    try {
+      console.log(`🔄 Checking for paused queries to reactivate for user ${userId} (${reason})`);
+      
+      // Find all paused queries for this user
+      const { data: pausedQueries, error: fetchError } = await supabase
+        .from('scheduled_queries')
+        .select('id, query, user_id')
+        .eq('user_id', userId)
+        .eq('status', 'paused');
+
+      if (fetchError) {
+        console.error('❌ Error fetching paused queries:', fetchError);
+        return;
+      }
+
+      if (!pausedQueries || pausedQueries.length === 0) {
+        console.log(`✅ No paused queries found for user ${userId}`);
+        return;
+      }
+
+      console.log(`🔄 Found ${pausedQueries.length} paused queries to reactivate for user ${userId}`);
+
+      // Reactivate all paused queries
+      const { error: reactivateError } = await supabase
+        .from('scheduled_queries')
+        .update({ 
+          status: 'active',
+          next_analysis_at: new Date(Date.now() + 2 * 60 * 1000).toISOString(), // Run in 2 minutes
+          updated_at: new Date().toISOString()
+        })
+        .eq('user_id', userId)
+        .eq('status', 'paused');
+
+      if (reactivateError) {
+        console.error('❌ Error reactivating paused queries:', reactivateError);
+        return;
+      }
+
+      console.log(`✅ Successfully reactivated ${pausedQueries.length} queries for user ${userId} (${reason})`);
+      
+      // Log each reactivated query for debugging
+      pausedQueries.forEach(query => {
+        console.log(`  📝 Reactivated query: "${query.query}" (ID: ${query.id})`);
+      });
+
+    } catch (error) {
+      console.error('❌ Exception in reactivatePausedQueries:', error);
+    }
+  }
+
   // Handle the event
   switch (event.type) {
     case 'checkout.session.completed': {
@@ -92,6 +144,9 @@ export async function POST(request: Request) {
               if (transactionError) {
                 console.error('Error updating transaction status:', transactionError);
               }
+
+              // Reactivate any paused queries since user now has credits
+              await reactivatePausedQueries(userId, 'PAYG credits added');
             } else {
               console.error('Error adding pay-as-you-go credits:', result.error);
 
@@ -151,6 +206,9 @@ export async function POST(request: Request) {
           }
 
           console.log('Subscription saved to database');
+          
+          // Reactivate any paused queries since user now has active subscription
+          await reactivatePausedQueries(userId, 'New subscription created');
         }
       }
       break;
@@ -183,6 +241,18 @@ export async function POST(request: Request) {
               { status: 500 }
             );
           }
+
+          // Get user_id to reactivate paused queries
+          const { data: userSubscription } = await supabase
+            .from('user_subscriptions')
+            .select('user_id')
+            .eq('stripe_subscription_id', subscriptionId)
+            .single();
+
+          if (userSubscription?.user_id) {
+            // Reactivate any paused queries since subscription payment succeeded
+            await reactivatePausedQueries(userSubscription.user_id, 'Subscription payment succeeded');
+          }
         } catch (error) {
           console.error('Error retrieving subscription:', error);
           return NextResponse.json(
@@ -215,6 +285,18 @@ export async function POST(request: Request) {
           { status: 500 }
         );
       }
+
+      // Get user_id to reactivate paused queries if subscription became active
+      const { data: userSubscription } = await supabase
+        .from('user_subscriptions')
+        .select('user_id')
+        .eq('stripe_subscription_id', subscription.id)
+        .single();
+
+      if (userSubscription?.user_id && subscription.status === 'active') {
+        // Reactivate any paused queries since subscription is now active
+        await reactivatePausedQueries(userSubscription.user_id, 'Subscription updated to active');
+      }
       break;
     }
     case 'customer.subscription.deleted': {