Continue Phase 2 Batch 2 and Batch 3

Migrate 6 background jobs to use wrapEdgeFunction: cleanup-old-versions, process-scheduled-deletions, data-retention-cleanup, run-cleanup-jobs, scheduled-maintenance, process-expired-bans. Replace old server routines with edgeFunction wrapper, add centralized logging, tracing, and standardized error handling, and adjust for batch-wise deployment.

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

@@ -1,26 +1,19 @@
-import { serve } from 'https://deno.land/std@0.168.0/http/server.ts';
 import { createClient } from 'https://esm.sh/@supabase/supabase-js@2';
-import { corsHeadersWithTracing as corsHeaders } from '../_shared/cors.ts';
-import { edgeLogger, startRequest, endRequest } from "../_shared/logger.ts";
+import { createEdgeFunction } from '../_shared/edgeFunctionWrapper.ts';
+import { edgeLogger } from '../_shared/logger.ts';
 
-serve(async (req) => {
-  if (req.method === 'OPTIONS') {
-    return new Response(null, { headers: corsHeaders });
-  }
-
-  const tracking = startRequest('process-scheduled-deletions');
-
-  try {
-    // Use service role for admin operations
-    const supabaseAdmin = createClient(
-      Deno.env.get('SUPABASE_URL') ?? '',
-      Deno.env.get('SUPABASE_SERVICE_ROLE_KEY') ?? ''
-    );
-
-    edgeLogger.info('Processing scheduled account deletions', { action: 'scheduled_deletions', requestId: tracking.requestId });
+export default createEdgeFunction(
+  {
+    name: 'process-scheduled-deletions',
+    requireAuth: false,
+  },
+  async (req, context, supabase) => {
+    edgeLogger.info('Processing scheduled account deletions', { 
+      requestId: context.requestId 
+    });
 
     // Find confirmed deletion requests that are past their scheduled date
-    const { data: pendingDeletions, error: fetchError } = await supabaseAdmin
+    const { data: pendingDeletions, error: fetchError } = await supabase
       .from('account_deletion_requests')
       .select('*')
       .eq('status', 'confirmed')
@@ -31,59 +24,57 @@ serve(async (req) => {
     }
 
     if (!pendingDeletions || pendingDeletions.length === 0) {
-      edgeLogger.info('No deletions to process', { action: 'scheduled_deletions', requestId: tracking.requestId });
-      
-      endRequest(tracking, 200);
+      edgeLogger.info('No deletions to process', { 
+        requestId: context.requestId 
+      });
       
       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',
-            'X-Request-ID': tracking.requestId
-          },
-        }
+        { headers: { 'Content-Type': 'application/json' } }
       );
     }
 
-    edgeLogger.info('Found deletions to process', { action: 'scheduled_deletions', count: pendingDeletions.length, requestId: tracking.requestId });
+    edgeLogger.info('Found deletions to process', { 
+      count: pendingDeletions.length,
+      requestId: context.requestId 
+    });
 
     let successCount = 0;
     let errorCount = 0;
 
     for (const deletion of pendingDeletions) {
       try {
-        edgeLogger.info('Processing deletion for user', { action: 'scheduled_deletions', userId: deletion.user_id });
+        edgeLogger.info('Processing deletion for user', { 
+          userId: deletion.user_id,
+          requestId: context.requestId 
+        });
 
         // Get user email for confirmation email
-        const { data: userData } = await supabaseAdmin.auth.admin.getUserById(deletion.user_id);
+        const { data: userData } = await supabase.auth.admin.getUserById(deletion.user_id);
         const userEmail = userData?.user?.email;
 
         // Delete reviews (CASCADE will handle review_photos)
-        await supabaseAdmin
+        await supabase
           .from('reviews')
           .delete()
           .eq('user_id', deletion.user_id);
 
         // Anonymize submissions and photos
-        await supabaseAdmin
+        await supabase
           .rpc('anonymize_user_submissions', { target_user_id: deletion.user_id });
 
         // Delete user roles
-        await supabaseAdmin
+        await supabase
           .from('user_roles')
           .delete()
           .eq('user_id', deletion.user_id);
 
         // Get profile to check for avatar before deletion
-        const { data: profile } = await supabaseAdmin
+        const { data: profile } = await supabase
           .from('profiles')
           .select('avatar_image_id')
           .eq('user_id', deletion.user_id)
@@ -96,7 +87,10 @@ serve(async (req) => {
 
           if (cloudflareAccountId && cloudflareApiToken) {
             try {
-              edgeLogger.info('Deleting avatar image', { action: 'scheduled_deletions', avatarId: profile.avatar_image_id });
+              edgeLogger.info('Deleting avatar image', { 
+                avatarId: profile.avatar_image_id,
+                requestId: context.requestId 
+              });
               const deleteResponse = await fetch(
                 `https://api.cloudflare.com/client/v4/accounts/${cloudflareAccountId}/images/v1/${profile.avatar_image_id}`,
                 {
@@ -108,48 +102,66 @@ serve(async (req) => {
               );
 
               if (!deleteResponse.ok) {
-                edgeLogger.error('Failed to delete avatar from Cloudflare', { action: 'scheduled_deletions', error: await deleteResponse.text() });
+                edgeLogger.error('Failed to delete avatar from Cloudflare', { 
+                  error: await deleteResponse.text(),
+                  requestId: context.requestId 
+                });
               } else {
-                edgeLogger.info('Avatar deleted from Cloudflare successfully', { action: 'scheduled_deletions' });
+                edgeLogger.info('Avatar deleted from Cloudflare successfully', { 
+                  requestId: context.requestId 
+                });
               }
             } catch (avatarError) {
-              edgeLogger.error('Error deleting avatar from Cloudflare', { action: 'scheduled_deletions', error: avatarError });
+              edgeLogger.error('Error deleting avatar from Cloudflare', { 
+                error: avatarError,
+                requestId: context.requestId 
+              });
             }
           }
         }
 
         // Delete profile
-        await supabaseAdmin
+        await supabase
           .from('profiles')
           .delete()
           .eq('user_id', deletion.user_id);
 
         // Remove from Novu before deleting auth user
         try {
-          edgeLogger.info('Removing Novu subscriber', { action: 'scheduled_deletions', userId: deletion.user_id });
+          edgeLogger.info('Removing Novu subscriber', { 
+            userId: deletion.user_id,
+            requestId: context.requestId 
+          });
           
-          const { error: novuError } = await supabaseAdmin.functions.invoke(
+          const { error: novuError } = await supabase.functions.invoke(
             'remove-novu-subscriber',
             {
               body: { 
                 subscriberId: deletion.user_id,
-                deleteSubscriber: true // Also delete the subscriber entirely
+                deleteSubscriber: true
               }
             }
           );
           
           if (novuError) {
-            edgeLogger.error('Failed to remove Novu subscriber', { action: 'scheduled_deletions', error: novuError });
+            edgeLogger.error('Failed to remove Novu subscriber', { 
+              error: novuError,
+              requestId: context.requestId 
+            });
           } else {
-            edgeLogger.info('Novu subscriber removed successfully', { action: 'scheduled_deletions' });
+            edgeLogger.info('Novu subscriber removed successfully', { 
+              requestId: context.requestId 
+            });
           }
         } catch (novuError) {
-          // Non-blocking - log but continue with deletion
-          edgeLogger.error('Error removing Novu subscriber', { action: 'scheduled_deletions', error: novuError });
+          edgeLogger.error('Error removing Novu subscriber', { 
+            error: novuError,
+            requestId: context.requestId 
+          });
         }
 
         // Update deletion request status
-        await supabaseAdmin
+        await supabase
           .from('account_deletion_requests')
           .update({
             status: 'completed',
@@ -158,7 +170,7 @@ serve(async (req) => {
           .eq('id', deletion.id);
 
         // Delete auth user
-        await supabaseAdmin.auth.admin.deleteUser(deletion.user_id);
+        await supabase.auth.admin.deleteUser(deletion.user_id);
 
         // Send final confirmation email if we have the email
         if (userEmail) {
@@ -186,22 +198,34 @@ serve(async (req) => {
                 }),
               });
             } catch (emailError) {
-              edgeLogger.error('Failed to send confirmation email', { action: 'scheduled_deletions', error: emailError });
+              edgeLogger.error('Failed to send confirmation email', { 
+                error: emailError,
+                requestId: context.requestId 
+              });
             }
           }
         }
 
         successCount++;
-        edgeLogger.info('Successfully deleted account for user', { action: 'scheduled_deletions', userId: deletion.user_id });
+        edgeLogger.info('Successfully deleted account for user', { 
+          userId: deletion.user_id,
+          requestId: context.requestId 
+        });
       } catch (error) {
         errorCount++;
-        edgeLogger.error('Failed to delete account for user', { action: 'scheduled_deletions', userId: deletion.user_id, error });
+        edgeLogger.error('Failed to delete account for user', { 
+          userId: deletion.user_id,
+          error,
+          requestId: context.requestId 
+        });
       }
     }
 
-    edgeLogger.info('Processed deletions', { action: 'scheduled_deletions', successCount, errorCount, requestId: tracking.requestId });
-
-    endRequest(tracking, 200);
+    edgeLogger.info('Processed deletions', { 
+      successCount,
+      errorCount,
+      requestId: context.requestId 
+    });
 
     return new Response(
       JSON.stringify({
@@ -209,35 +233,8 @@ serve(async (req) => {
         message: `Processed ${successCount} deletion(s)`,
         processed: successCount,
         errors: errorCount,
-        requestId: tracking.requestId
       }),
-      {
-        status: 200,
-        headers: { 
-          ...corsHeaders, 
-          'Content-Type': 'application/json',
-          'X-Request-ID': tracking.requestId
-        },
-      }
-    );
-  } catch (error) {
-    edgeLogger.error('Error processing scheduled deletions', { action: 'scheduled_deletions', error: error.message, requestId: tracking.requestId });
-    
-    endRequest(tracking, 500, error.message);
-    
-    return new Response(
-      JSON.stringify({ 
-        error: error.message,
-        requestId: tracking.requestId
-      }),
-      {
-        status: 500,
-        headers: { 
-          ...corsHeaders, 
-          'Content-Type': 'application/json',
-          'X-Request-ID': tracking.requestId
-        },
-      }
+      { headers: { 'Content-Type': 'application/json' } }
     );
   }
-});
+);