Refactor: Continue implementation plan

supabase/functions/process-scheduled-deletions/index.ts

@@ -1,9 +1,10 @@
 import { serve } from 'https://deno.land/std@0.168.0/http/server.ts';
 import { createClient } from 'https://esm.sh/@supabase/supabase-js@2';
+import { startRequest, endRequest } from "../_shared/logger.ts";
 
 const corsHeaders = {
   'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type',
+  'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type, x-request-id',
 };
 
 serve(async (req) => {
@@ -11,6 +12,8 @@ serve(async (req) => {
     return new Response(null, { headers: corsHeaders });
   }
 
+  const tracking = startRequest('process-scheduled-deletions');
+
   try {
     // Use service role for admin operations
     const supabaseAdmin = createClient(
@@ -18,7 +21,7 @@ serve(async (req) => {
       Deno.env.get('SUPABASE_SERVICE_ROLE_KEY') ?? ''
     );
 
-    console.log('Processing scheduled account deletions...');
+    console.log('Processing scheduled account deletions...', { requestId: tracking.requestId });
 
     // Find confirmed deletion requests that are past their scheduled date
     const { data: pendingDeletions, error: fetchError } = await supabaseAdmin
@@ -33,15 +36,23 @@ serve(async (req) => {
 
     if (!pendingDeletions || pendingDeletions.length === 0) {
       console.log('No deletions to process');
+      
+      endRequest(tracking, 200);
+      
       return new Response(
         JSON.stringify({
           success: true,
           message: 'No deletions to process',
           processed: 0,
+          requestId: tracking.requestId
         }),
         {
           status: 200,
-          headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+          headers: { 
+            ...corsHeaders, 
+            'Content-Type': 'application/json',
+            'X-Request-ID': tracking.requestId
+          },
         }
       );
     }
@@ -170,25 +181,42 @@ serve(async (req) => {
 
     console.log(`Processed ${successCount} deletion(s) successfully, ${errorCount} error(s)`);
 
+    endRequest(tracking, 200);
+
     return new Response(
       JSON.stringify({
         success: true,
         message: `Processed ${successCount} deletion(s)`,
         processed: successCount,
         errors: errorCount,
+        requestId: tracking.requestId
       }),
       {
         status: 200,
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+        headers: { 
+          ...corsHeaders, 
+          'Content-Type': 'application/json',
+          'X-Request-ID': tracking.requestId
+        },
       }
     );
   } catch (error) {
     console.error('Error processing scheduled deletions:', error);
+    
+    endRequest(tracking, 500, error.message);
+    
     return new Response(
-      JSON.stringify({ error: error.message }),
+      JSON.stringify({ 
+        error: error.message,
+        requestId: tracking.requestId
+      }),
       {
         status: 500,
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+        headers: { 
+          ...corsHeaders, 
+          'Content-Type': 'application/json',
+          'X-Request-ID': tracking.requestId
+        },
       }
     );
   }