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/cleanup-old-versions/index.ts

@@ -1,5 +1,5 @@
 import { createClient } from 'https://esm.sh/@supabase/supabase-js@2';
-import { corsHeaders } from '../_shared/cors.ts';
+import { createEdgeFunction } from '../_shared/edgeFunctionWrapper.ts';
 import { edgeLogger } from '../_shared/logger.ts';
 import { formatEdgeError } from '../_shared/errorFormatter.ts';
 
@@ -10,24 +10,12 @@ interface CleanupStats {
   errors: string[];
 }
 
-Deno.serve(async (req) => {
-  // Handle CORS preflight
-  if (req.method === 'OPTIONS') {
-    return new Response(null, { headers: corsHeaders });
-  }
-
-  const supabaseClient = createClient(
-    Deno.env.get('SUPABASE_URL') ?? '',
-    Deno.env.get('SUPABASE_SERVICE_ROLE_KEY') ?? '',
-    {
-      auth: {
-        autoRefreshToken: false,
-        persistSession: false
-      }
-    }
-  );
-
-  try {
+export default createEdgeFunction(
+  {
+    name: 'cleanup-old-versions',
+    requireAuth: false,
+  },
+  async (req, context, supabase) => {
     const startTime = Date.now();
     const stats: CleanupStats = {
       item_edit_history_deleted: 0,
@@ -36,10 +24,12 @@ Deno.serve(async (req) => {
       errors: [],
     };
 
-    edgeLogger.info('Starting version cleanup job');
+    edgeLogger.info('Starting version cleanup job', { 
+      requestId: context.requestId 
+    });
 
     // Get retention settings from admin_settings
-    const { data: retentionSetting, error: settingsError } = await supabaseClient
+    const { data: retentionSetting, error: settingsError } = await supabase
       .from('admin_settings')
       .select('setting_value')
       .eq('setting_key', 'version_retention_days')
@@ -56,7 +46,7 @@ Deno.serve(async (req) => {
     edgeLogger.info('Cleanup configuration', { retentionDays, cutoff: cutoffDate.toISOString() });
 
     // Step 1: Delete orphaned edit history (where submission_item no longer exists)
-    const { data: orphanedRecords, error: orphanError } = await supabaseClient
+    const { data: orphanedRecords, error: orphanError } = await supabase
       .rpc('get_orphaned_edit_history');
 
     if (orphanError) {
@@ -66,7 +56,7 @@ Deno.serve(async (req) => {
       const orphanedIds = orphanedRecords.map((r: { id: string }) => r.id);
       edgeLogger.info('Found orphaned edit history records', { count: orphanedIds.length });
 
-      const { error: deleteOrphanError } = await supabaseClient
+      const { error: deleteOrphanError } = await supabase
         .from('item_edit_history')
         .delete()
         .in('id', orphanedIds);
@@ -81,7 +71,7 @@ Deno.serve(async (req) => {
     }
 
     // Step 2: For each item, keep most recent 10 versions, delete older ones beyond retention
-    const { data: items, error: itemsError } = await supabaseClient
+    const { data: items, error: itemsError } = await supabase
       .from('submission_items')
       .select('id');
 
@@ -95,7 +85,7 @@ Deno.serve(async (req) => {
       for (const item of items) {
         try {
           // Get all versions for this item, ordered by date (newest first)
-          const { data: versions, error: versionsError } = await supabaseClient
+          const { data: versions, error: versionsError } = await supabase
             .from('item_edit_history')
             .select('id, edited_at')
             .eq('item_id', item.id)
@@ -114,7 +104,7 @@ Deno.serve(async (req) => {
               .map(v => v.id);
 
             if (versionsToDelete.length > 0) {
-              const { error: deleteError } = await supabaseClient
+              const { error: deleteError } = await supabase
                 .from('item_edit_history')
                 .delete()
                 .in('id', versionsToDelete);
@@ -134,7 +124,7 @@ Deno.serve(async (req) => {
 
     // Step 3: Update last cleanup timestamp
     const cleanupTimestamp = new Date().toISOString();
-    const { error: updateError } = await supabaseClient
+    const { error: updateError } = await supabase
       .from('admin_settings')
       .update({ setting_value: `"${cleanupTimestamp}"` })
       .eq('setting_key', 'last_version_cleanup');
@@ -144,7 +134,7 @@ Deno.serve(async (req) => {
     }
 
     // Step 4: Log cleanup statistics to audit log
-    await supabaseClient
+    await supabase
       .from('admin_audit_log')
       .insert({
         admin_user_id: null,
@@ -153,7 +143,7 @@ Deno.serve(async (req) => {
         details: {
           stats: {
             ...stats,
-            errors: undefined, // Don't log errors array in details
+            errors: undefined,
           },
           retention_days: retentionDays,
           executed_at: cleanupTimestamp,
@@ -166,6 +156,7 @@ Deno.serve(async (req) => {
     edgeLogger.info('Cleanup completed successfully', {
       ...stats,
       errors: stats.errors.length > 0 ? stats.errors : undefined,
+      requestId: context.requestId,
     });
 
     return new Response(
@@ -174,23 +165,7 @@ Deno.serve(async (req) => {
         stats,
         message: `Cleaned up ${stats.item_edit_history_deleted + stats.orphaned_records_deleted} version records`,
       }),
-      {
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
-        status: 200,
-      }
-    );
-  } catch (error) {
-    edgeLogger.error('Cleanup job failed', { error: formatEdgeError(error) });
-    
-    return new Response(
-      JSON.stringify({
-        success: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
-      }),
-      {
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
-        status: 500,
-      }
+      { headers: { 'Content-Type': 'application/json' } }
     );
   }
-});
+);