Connect to atomic rejection flow

Introduce atomic rejection for bulk submissions, remove dead moderation code, and clean exports: - Replace direct DB updates in rejectSubmissionItems with atomic process-selective-rejection edge function call - Add edge function invocation helper import - Remove obsolete moderation actions (approvePhotoSubmission, rejectSubmissionItems, performModerationAction) and prune exports - Update moderation index exports accordingly - Ensure cascade handling uses atomic pipeline and avoid updateSubmissionStatusAfterRejection calls
Move photo logic to RPC path
2026-04-20 22:54:24 -04:00 · 2025-11-10 14:19:49 +00:00 · 2025-11-10 14:01:34 +00:00
5 changed files with 457 additions and 406 deletions
--- a/src/hooks/moderation/useModerationActions.ts
+++ b/src/hooks/moderation/useModerationActions.ts
@@ -306,75 +306,6 @@ export function useModerationActions(config: ModerationActionsConfig): Moderatio
      action: 'approved' | 'rejected'; 
      moderatorNotes?: string;
    }) => {
-        // Handle photo submissions
-        if (action === 'approved' && item.submission_type === 'photo') {
-          const { data: photoSubmission, error: fetchError } = await supabase
-            .from('photo_submissions')
-            .select(`
-              *,
-              items:photo_submission_items(*),
-              submission:content_submissions!inner(user_id)
-            `)
-            .eq('submission_id', item.id)
-            .single();
-
-          // Add explicit error handling
-          if (fetchError) {
-            throw new Error(`Failed to fetch photo submission: ${fetchError.message}`);
-          }
-
-          if (!photoSubmission) {
-            throw new Error('Photo submission not found');
-          }
-
-          // Type assertion with validation
-          const typedPhotoSubmission = photoSubmission as {
-            id: string;
-            entity_id: string;
-            entity_type: string;
-            items: Array<{
-              id: string;
-              cloudflare_image_id: string;
-              cloudflare_image_url: string;
-              caption?: string;
-              title?: string;
-              date_taken?: string;
-              date_taken_precision?: string;
-              order_index: number;
-            }>;
-            submission: { user_id: string };
-          };
-
-          // Validate required fields
-          if (!typedPhotoSubmission.items || typedPhotoSubmission.items.length === 0) {
-            throw new Error('No photo items found in submission');
-          }
-
-          const { data: existingPhotos } = await supabase
-            .from('photos')
-            .select('id')
-            .eq('submission_id', item.id);
-
-          if (!existingPhotos || existingPhotos.length === 0) {
-            const photoRecords = typedPhotoSubmission.items.map((photoItem) => ({
-              entity_id: typedPhotoSubmission.entity_id,
-              entity_type: typedPhotoSubmission.entity_type,
-              cloudflare_image_id: photoItem.cloudflare_image_id,
-              cloudflare_image_url: photoItem.cloudflare_image_url,
-              title: photoItem.title || null,
-              caption: photoItem.caption || null,
-              date_taken: photoItem.date_taken || null,
-              order_index: photoItem.order_index,
-              submission_id: item.id,
-              submitted_by: typedPhotoSubmission.submission?.user_id,
-              approved_by: user?.id,
-              approved_at: new Date().toISOString(),
-            }));
-
-            await supabase.from('photos').insert(photoRecords);
-          }
-        }
-
        // Check for submission items
        const { data: submissionItems } = await supabase
          .from('submission_items')
--- a/src/lib/moderation/actions.ts
+++ b/src/lib/moderation/actions.ts
@@ -57,126 +57,6 @@ export interface ModerationActionResult {
  shouldRemoveFromQueue: boolean;
 }

-/**
- * Configuration for photo approval
- */
-interface PhotoApprovalConfig {
-  submissionId: string;
-  moderatorId: string;
-  moderatorNotes?: string;
-}
-
-/**
- * Approve a photo submission
- * 
- * Creates photo records in the database and updates submission status.
- * Handles both new approvals and re-approvals (where photos already exist).
- * 
- * @param supabase - Supabase client
- * @param config - Photo approval configuration
- * @returns Action result with success status and message
- */
-export async function approvePhotoSubmission(
-  supabase: SupabaseClient,
-  config: PhotoApprovalConfig
-): Promise<ModerationActionResult> {
-  try {
-    // Fetch photo submission from relational tables
-    const { data: photoSubmission, error: fetchError } = await supabase
-      .from('photo_submissions')
-      .select(`
-        *,
-        items:photo_submission_items(*),
-        submission:content_submissions!inner(user_id, status)
-      `)
-      .eq('submission_id', config.submissionId)
-      .single();
-
-    if (fetchError || !photoSubmission) {
-      throw new Error('Failed to fetch photo submission data');
-    }
-
-    if (!photoSubmission.items || photoSubmission.items.length === 0) {
-      throw new Error('No photos found in submission');
-    }
-
-    // Check if photos already exist for this submission (re-approval case)
-    const { data: existingPhotos } = await supabase
-      .from('photos')
-      .select('id')
-      .eq('submission_id', config.submissionId);
-
-    if (!existingPhotos || existingPhotos.length === 0) {
-      // Create new photo records from photo_submission_items
-      const photoRecords = photoSubmission.items.map((item: any) => ({
-        entity_id: photoSubmission.entity_id,
-        entity_type: photoSubmission.entity_type,
-        cloudflare_image_id: item.cloudflare_image_id,
-        cloudflare_image_url: item.cloudflare_image_url,
-        title: item.title || null,
-        caption: item.caption || null,
-        date_taken: item.date_taken || null,
-        order_index: item.order_index,
-        submission_id: photoSubmission.submission_id,
-        submitted_by: photoSubmission.submission?.user_id,
-        approved_by: config.moderatorId,
-        approved_at: new Date().toISOString(),
-      }));
-
-      const { error: insertError } = await supabase
-        .from('photos')
-        .insert(photoRecords);
-
-      if (insertError) {
-        throw insertError;
-      }
-    }
-
-    // Update submission status
-    const { error: updateError } = await supabase
-      .from('content_submissions')
-      .update({
-        status: 'approved' as const,
-        reviewer_id: config.moderatorId,
-        reviewed_at: new Date().toISOString(),
-        reviewer_notes: config.moderatorNotes,
-      })
-      .eq('id', config.submissionId);
-
-    if (updateError) {
-      throw updateError;
-    }
-
-    return {
-      success: true,
-      message: `Successfully approved and published ${photoSubmission.items.length} photo(s)`,
-      shouldRemoveFromQueue: true,
-    };
-  } catch (error: unknown) {
-    handleError(error, {
-      action: 'Approve Photo Submission',
-      userId: config.moderatorId,
-      metadata: { submissionId: config.submissionId }
-    });
-    return {
-      success: false,
-      message: 'Failed to approve photo submission',
-      error: error instanceof Error ? error : new Error(getErrorMessage(error)),
-      shouldRemoveFromQueue: false,
-    };
-  }
-}
-
-/**
- * Approve a submission with submission_items
- * 
- * Uses the edge function to process all pending submission items.
- * 
- * @param supabase - Supabase client
- * @param submissionId - Submission ID
- * @param itemIds - Array of item IDs to approve
- * @returns Action result
- */
 /**
 * Approve submission items using atomic transaction RPC.
 * 
@@ -238,194 +118,6 @@ export async function approveSubmissionItems(
  }
 }

-/**
- * Reject a submission with submission_items
- * 
- * Cascades rejection to all pending items.
- * 
- * @param supabase - Supabase client
- * @param submissionId - Submission ID
- * @param rejectionReason - Reason for rejection
- * @returns Action result
- */
-export async function rejectSubmissionItems(
-  supabase: SupabaseClient,
-  submissionId: string,
-  rejectionReason?: string
-): Promise<ModerationActionResult> {
-  try {
-    const { error: rejectError } = await supabase
-      .from('submission_items')
-      .update({
-        status: 'rejected' as const,
-        rejection_reason: rejectionReason || 'Parent submission rejected',
-        updated_at: new Date().toISOString(),
-      })
-      .eq('submission_id', submissionId)
-      .eq('status', 'pending');
-
-    if (rejectError) {
-      handleError(rejectError, {
-        action: 'Reject Submission Items (Cascade)',
-        metadata: { submissionId }
-      });
-    }
-
-    return {
-      success: true,
-      message: 'Submission items rejected',
-      shouldRemoveFromQueue: false, // Parent rejection will handle removal
-    };
-  } catch (error: unknown) {
-    handleError(error, {
-      action: 'Reject Submission Items',
-      metadata: { submissionId }
-    });
-    return {
-      success: false,
-      message: 'Failed to reject submission items',
-      error: error instanceof Error ? error : new Error(getErrorMessage(error)),
-      shouldRemoveFromQueue: false,
-    };
-  }
-}
-
-/**
- * Configuration for standard moderation actions
- */
-export interface ModerationConfig {
-  item: ModerationItem;
-  action: 'approved' | 'rejected';
-  moderatorId: string;
-  moderatorNotes?: string;
-}
-
-/**
- * Perform a standard moderation action (approve/reject)
- * 
- * Updates the submission or review status in the database.
- * Handles both content_submissions and reviews.
- * 
- * @param supabase - Supabase client
- * @param config - Moderation configuration
- * @returns Action result
- */
-export async function performModerationAction(
-  supabase: SupabaseClient,
-  config: ModerationConfig
-): Promise<ModerationActionResult> {
-  const { item, action, moderatorId, moderatorNotes } = config;
-
-  try {
-    // Handle photo submissions specially
-    if (
-      action === 'approved' &&
-      item.type === 'content_submission' &&
-      item.submission_type === 'photo'
-    ) {
-      return await approvePhotoSubmission(supabase, {
-        submissionId: item.id,
-        moderatorId,
-        moderatorNotes,
-      });
-    }
-
-    // Check if this submission has submission_items
-    if (item.type === 'content_submission') {
-      const { data: submissionItems, error: itemsError } = await supabase
-        .from('submission_items')
-        .select('id, status')
-        .eq('submission_id', item.id)
-        .in('status', ['pending', 'rejected']);
-
-      if (!itemsError && submissionItems && submissionItems.length > 0) {
-        if (action === 'approved') {
-          return await approveSubmissionItems(
-            supabase,
-            item.id,
-            submissionItems.map(i => i.id)
-          );
-        } else if (action === 'rejected') {
-          await rejectSubmissionItems(supabase, item.id, moderatorNotes);
-        }
-      }
-    }
-
-    // Standard moderation flow - Build update object with type-appropriate fields
-    let error: any = null;
-    let data: any = null;
-
-    // Use type-safe table queries based on item type
-    if (item.type === 'review') {
-      const reviewUpdate: {
-        moderation_status: 'approved' | 'rejected' | 'pending';
-        moderated_at: string;
-        moderated_by: string;
-        reviewer_notes?: string;
-      } = {
-        moderation_status: action,
-        moderated_at: new Date().toISOString(),
-        moderated_by: moderatorId,
-        ...(moderatorNotes && { reviewer_notes: moderatorNotes }),
-      };
-      
-      const result = await createTableQuery('reviews')
-        .update(reviewUpdate)
-        .eq('id', item.id)
-        .select();
-      error = result.error;
-      data = result.data;
-    } else {
-      const submissionUpdate: {
-        status: 'approved' | 'rejected' | 'pending';
-        reviewed_at: string;
-        reviewer_id: string;
-        reviewer_notes?: string;
-      } = {
-        status: action,
-        reviewed_at: new Date().toISOString(),
-        reviewer_id: moderatorId,
-        ...(moderatorNotes && { reviewer_notes: moderatorNotes }),
-      };
-      
-      const result = await createTableQuery('content_submissions')
-        .update(submissionUpdate)
-        .eq('id', item.id)
-        .select();
-      error = result.error;
-      data = result.data;
-    }
-
-    if (error) {
-      throw error;
-    }
-
-    // Check if the update actually affected any rows
-    if (!data || data.length === 0) {
-      throw new Error(
-        'Failed to update item - no rows affected. You might not have permission to moderate this content.'
-      );
-    }
-
-    return {
-      success: true,
-      message: `Content ${action}`,
-      shouldRemoveFromQueue: action === 'approved' || action === 'rejected',
-    };
-  } catch (error: unknown) {
-    handleError(error, {
-      action: `${config.action === 'approved' ? 'Approve' : 'Reject'} Content`,
-      userId: config.moderatorId,
-      metadata: { itemType: item.type, itemId: item.id }
-    });
-    return {
-      success: false,
-      message: `Failed to ${config.action} content`,
-      error: error instanceof Error ? error : new Error(getErrorMessage(error)),
-      shouldRemoveFromQueue: false,
-    };
-  }
-}

 /**
 * Configuration for submission deletion
--- a/src/lib/moderation/index.ts
+++ b/src/lib/moderation/index.ts
@@ -28,16 +28,12 @@ export type { ResolvedEntityNames } from './entities';

 // Moderation actions
 export {
-  approvePhotoSubmission,
  approveSubmissionItems,
-  rejectSubmissionItems,
-  performModerationAction,
  deleteSubmission,
 } from './actions';

 export type {
  ModerationActionResult,
-  ModerationConfig,
  DeleteSubmissionConfig,
 } from './actions';

--- a/src/lib/submissionItemsService.ts
+++ b/src/lib/submissionItemsService.ts
@@ -1,6 +1,7 @@
 import { supabase } from '@/lib/supabaseClient';
 import { handleError, handleNonCriticalError, getErrorMessage } from './errorHandler';
 import { extractCloudflareImageId } from './cloudflareImageUtils';
+import { invokeWithTracking } from './edgeFunctionTracking';

 // Core submission item interface with dependencies
 // NOTE: item_data and original_data use `unknown` because they contain dynamic structures
@@ -1367,32 +1368,24 @@ export async function rejectSubmissionItems(
    }
  }

-  // Update all items to rejected status
-  const updates = Array.from(itemsToReject).map(async (itemId) => {
-    const { error } = await supabase
-      .from('submission_items')
-      .update({
-        status: 'rejected' as const,
-        rejection_reason: reason,
-        updated_at: new Date().toISOString(),
-      })
-      .eq('id', itemId);
-
-      if (error) {
-        handleNonCriticalError(error, {
-          action: 'Reject Submission Item',
-          metadata: { itemId }
-        });
-        throw error;
-      }
-  });
-
-  await Promise.all(updates);
-
-  // Update parent submission status
  const submissionId = items[0]?.submission_id;
-  if (submissionId) {
-    await updateSubmissionStatusAfterRejection(submissionId);
+  if (!submissionId) {
+    throw new Error('Cannot reject items: missing submission ID');
+  }
+
+  // Use atomic edge function for rejection
+  const { data, error } = await invokeWithTracking(
+    'process-selective-rejection',
+    {
+      itemIds: Array.from(itemsToReject),
+      submissionId,
+      rejectionReason: reason,
+    },
+    userId
+  );
+
+  if (error) {
+    throw new Error(`Failed to reject items: ${error.message}`);
  }
 }

--- a/supabase/migrations/20251110140052_53f450d6-21c3-4b5d-b682-51a9373ff2a1.sql
+++ b/supabase/migrations/20251110140052_53f450d6-21c3-4b5d-b682-51a9373ff2a1.sql
@@ -0,0 +1,439 @@
+-- ============================================================================
+-- Add Photo Support to process_approval_transaction RPC
+-- ============================================================================
+-- This migration extends the atomic approval transaction to handle photo
+-- submissions alongside other entity types, ensuring consistent error handling,
+-- metrics tracking, and transaction safety for all approvals.
+-- ============================================================================
+
+DROP FUNCTION IF EXISTS process_approval_transaction(UUID, UUID[], UUID, UUID, TEXT);
+
+CREATE OR REPLACE FUNCTION process_approval_transaction(
+  p_submission_id UUID,
+  p_item_ids UUID[],
+  p_moderator_id UUID,
+  p_submitter_id UUID,
+  p_request_id TEXT DEFAULT NULL
+)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_start_time TIMESTAMPTZ;
+  v_result JSONB;
+  v_item RECORD;
+  v_item_data JSONB;
+  v_resolved_refs JSONB;
+  v_entity_id UUID;
+  v_approval_results JSONB[] := ARRAY[]::JSONB[];
+  v_final_status TEXT;
+  v_all_approved BOOLEAN := TRUE;
+  v_some_approved BOOLEAN := FALSE;
+  v_items_processed INTEGER := 0;
+BEGIN
+  v_start_time := clock_timestamp();
+  
+  RAISE NOTICE '[%] Starting atomic approval transaction for submission %',
+    COALESCE(p_request_id, 'NO_REQUEST_ID'),
+    p_submission_id;
+  
+  -- ========================================================================
+  -- STEP 1: Set session variables (transaction-scoped with is_local=true)
+  -- ========================================================================
+  PERFORM set_config('app.current_user_id', p_submitter_id::text, true);
+  PERFORM set_config('app.submission_id', p_submission_id::text, true);
+  PERFORM set_config('app.moderator_id', p_moderator_id::text, true);
+  
+  -- ========================================================================
+  -- STEP 2: Validate submission ownership and lock status
+  -- ========================================================================
+  IF NOT EXISTS (
+    SELECT 1 FROM content_submissions
+    WHERE id = p_submission_id
+      AND (assigned_to = p_moderator_id OR assigned_to IS NULL)
+      AND status IN ('pending', 'partially_approved')
+  ) THEN
+    RAISE EXCEPTION 'Submission not found, locked by another moderator, or already processed'
+      USING ERRCODE = '42501';
+  END IF;
+  
+  -- ========================================================================
+  -- STEP 3: Process each item sequentially within this transaction
+  -- ========================================================================
+  FOR v_item IN
+    SELECT
+      si.*,
+      ps.name as park_name,
+      ps.slug as park_slug,
+      ps.description as park_description,
+      ps.park_type,
+      ps.status as park_status,
+      ps.location_id,
+      ps.operator_id,
+      ps.property_owner_id,
+      ps.opening_date as park_opening_date,
+      ps.closing_date as park_closing_date,
+      ps.opening_date_precision as park_opening_date_precision,
+      ps.closing_date_precision as park_closing_date_precision,
+      ps.website_url as park_website_url,
+      ps.phone as park_phone,
+      ps.email as park_email,
+      ps.banner_image_url as park_banner_image_url,
+      ps.banner_image_id as park_banner_image_id,
+      ps.card_image_url as park_card_image_url,
+      ps.card_image_id as park_card_image_id,
+      rs.name as ride_name,
+      rs.slug as ride_slug,
+      rs.park_id as ride_park_id,
+      rs.ride_type,
+      rs.status as ride_status,
+      rs.manufacturer_id,
+      rs.ride_model_id,
+      rs.opening_date as ride_opening_date,
+      rs.closing_date as ride_closing_date,
+      rs.opening_date_precision as ride_opening_date_precision,
+      rs.closing_date_precision as ride_closing_date_precision,
+      rs.description as ride_description,
+      rs.banner_image_url as ride_banner_image_url,
+      rs.banner_image_id as ride_banner_image_id,
+      rs.card_image_url as ride_card_image_url,
+      rs.card_image_id as ride_card_image_id,
+      cs.name as company_name,
+      cs.slug as company_slug,
+      cs.description as company_description,
+      cs.website_url as company_website_url,
+      cs.founded_year,
+      cs.banner_image_url as company_banner_image_url,
+      cs.banner_image_id as company_banner_image_id,
+      cs.card_image_url as company_card_image_url,
+      cs.card_image_id as company_card_image_id,
+      rms.name as ride_model_name,
+      rms.slug as ride_model_slug,
+      rms.manufacturer_id as ride_model_manufacturer_id,
+      rms.ride_type as ride_model_ride_type,
+      rms.description as ride_model_description,
+      rms.banner_image_url as ride_model_banner_image_url,
+      rms.banner_image_id as ride_model_banner_image_id,
+      rms.card_image_url as ride_model_card_image_url,
+      rms.card_image_id as ride_model_card_image_id,
+      phs.entity_id as photo_entity_id,
+      phs.entity_type as photo_entity_type,
+      phs.title as photo_title
+    FROM submission_items si
+    LEFT JOIN park_submissions ps ON si.park_submission_id = ps.id
+    LEFT JOIN ride_submissions rs ON si.ride_submission_id = rs.id
+    LEFT JOIN company_submissions cs ON si.company_submission_id = cs.id
+    LEFT JOIN ride_model_submissions rms ON si.ride_model_submission_id = rms.id
+    LEFT JOIN photo_submissions phs ON si.photo_submission_id = phs.id
+    WHERE si.id = ANY(p_item_ids)
+    ORDER BY si.order_index, si.created_at
+  LOOP
+    BEGIN
+      v_items_processed := v_items_processed + 1;
+      
+      -- Build item data based on entity type
+      IF v_item.item_type = 'park' THEN
+        v_item_data := jsonb_build_object(
+          'name', v_item.park_name,
+          'slug', v_item.park_slug,
+          'description', v_item.park_description,
+          'park_type', v_item.park_type,
+          'status', v_item.park_status,
+          'location_id', v_item.location_id,
+          'operator_id', v_item.operator_id,
+          'property_owner_id', v_item.property_owner_id,
+          'opening_date', v_item.park_opening_date,
+          'closing_date', v_item.park_closing_date,
+          'opening_date_precision', v_item.park_opening_date_precision,
+          'closing_date_precision', v_item.park_closing_date_precision,
+          'website_url', v_item.park_website_url,
+          'phone', v_item.park_phone,
+          'email', v_item.park_email,
+          'banner_image_url', v_item.park_banner_image_url,
+          'banner_image_id', v_item.park_banner_image_id,
+          'card_image_url', v_item.park_card_image_url,
+          'card_image_id', v_item.park_card_image_id
+        );
+      ELSIF v_item.item_type = 'ride' THEN
+        v_item_data := jsonb_build_object(
+          'name', v_item.ride_name,
+          'slug', v_item.ride_slug,
+          'park_id', v_item.ride_park_id,
+          'ride_type', v_item.ride_type,
+          'status', v_item.ride_status,
+          'manufacturer_id', v_item.manufacturer_id,
+          'ride_model_id', v_item.ride_model_id,
+          'opening_date', v_item.ride_opening_date,
+          'closing_date', v_item.ride_closing_date,
+          'opening_date_precision', v_item.ride_opening_date_precision,
+          'closing_date_precision', v_item.ride_closing_date_precision,
+          'description', v_item.ride_description,
+          'banner_image_url', v_item.ride_banner_image_url,
+          'banner_image_id', v_item.ride_banner_image_id,
+          'card_image_url', v_item.ride_card_image_url,
+          'card_image_id', v_item.ride_card_image_id
+        );
+      ELSIF v_item.item_type IN ('manufacturer', 'operator', 'property_owner', 'designer') THEN
+        v_item_data := jsonb_build_object(
+          'name', v_item.company_name,
+          'slug', v_item.company_slug,
+          'description', v_item.company_description,
+          'website_url', v_item.company_website_url,
+          'founded_year', v_item.founded_year,
+          'banner_image_url', v_item.company_banner_image_url,
+          'banner_image_id', v_item.company_banner_image_id,
+          'card_image_url', v_item.company_card_image_url,
+          'card_image_id', v_item.company_card_image_id
+        );
+      ELSIF v_item.item_type = 'ride_model' THEN
+        v_item_data := jsonb_build_object(
+          'name', v_item.ride_model_name,
+          'slug', v_item.ride_model_slug,
+          'manufacturer_id', v_item.ride_model_manufacturer_id,
+          'ride_type', v_item.ride_model_ride_type,
+          'description', v_item.ride_model_description,
+          'banner_image_url', v_item.ride_model_banner_image_url,
+          'banner_image_id', v_item.ride_model_banner_image_id,
+          'card_image_url', v_item.ride_model_card_image_url,
+          'card_image_id', v_item.ride_model_card_image_id
+        );
+      ELSIF v_item.item_type = 'photo' THEN
+        v_item_data := jsonb_build_object(
+          'entity_id', v_item.photo_entity_id,
+          'entity_type', v_item.photo_entity_type,
+          'title', v_item.photo_title,
+          'photo_submission_id', v_item.photo_submission_id
+        );
+      ELSE
+        RAISE EXCEPTION 'Unsupported item_type: %', v_item.item_type;
+      END IF;
+      
+      -- ======================================================================
+      -- Resolve temp refs and update v_item_data with actual entity IDs
+      -- ======================================================================
+      v_resolved_refs := resolve_temp_refs_for_item(v_item.id, p_submission_id);
+      
+      IF v_resolved_refs IS NOT NULL AND jsonb_typeof(v_resolved_refs) = 'object' THEN
+        -- Replace NULL foreign keys with resolved entity IDs
+        -- For parks: operator_id, property_owner_id
+        IF v_item.item_type = 'park' THEN
+          IF v_resolved_refs ? 'operator' AND (v_item_data->>'operator_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('operator_id', v_resolved_refs->>'operator');
+            RAISE NOTICE 'Resolved park.operator_id → %', v_resolved_refs->>'operator';
+          END IF;
+          IF v_resolved_refs ? 'property_owner' AND (v_item_data->>'property_owner_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('property_owner_id', v_resolved_refs->>'property_owner');
+            RAISE NOTICE 'Resolved park.property_owner_id → %', v_resolved_refs->>'property_owner';
+          END IF;
+        END IF;
+        
+        -- For rides: park_id, manufacturer_id, ride_model_id
+        IF v_item.item_type = 'ride' THEN
+          IF v_resolved_refs ? 'park' AND (v_item_data->>'park_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('park_id', v_resolved_refs->>'park');
+            RAISE NOTICE 'Resolved ride.park_id → %', v_resolved_refs->>'park';
+          END IF;
+          IF v_resolved_refs ? 'manufacturer' AND (v_item_data->>'manufacturer_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('manufacturer_id', v_resolved_refs->>'manufacturer');
+            RAISE NOTICE 'Resolved ride.manufacturer_id → %', v_resolved_refs->>'manufacturer';
+          END IF;
+          IF v_resolved_refs ? 'ride_model' AND (v_item_data->>'ride_model_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('ride_model_id', v_resolved_refs->>'ride_model');
+            RAISE NOTICE 'Resolved ride.ride_model_id → %', v_resolved_refs->>'ride_model';
+          END IF;
+        END IF;
+        
+        -- For ride_models: manufacturer_id
+        IF v_item.item_type = 'ride_model' THEN
+          IF v_resolved_refs ? 'manufacturer' AND (v_item_data->>'manufacturer_id') IS NULL THEN
+            v_item_data := v_item_data || jsonb_build_object('manufacturer_id', v_resolved_refs->>'manufacturer');
+            RAISE NOTICE 'Resolved ride_model.manufacturer_id → %', v_resolved_refs->>'manufacturer';
+          END IF;
+        END IF;
+      END IF;
+      
+      -- Execute action based on action_type and item_type
+      IF v_item.action_type = 'create' THEN
+        IF v_item.item_type = 'photo' THEN
+          -- Insert all photo_submission_items as photos atomically
+          INSERT INTO photos (
+            entity_id, entity_type, cloudflare_image_id, cloudflare_image_url,
+            title, caption, date_taken, date_taken_precision, order_index,
+            submission_id, submitted_by, approved_by, approved_at
+          )
+          SELECT 
+            (v_item_data->>'entity_id')::UUID,
+            v_item_data->>'entity_type',
+            psi.cloudflare_image_id,
+            psi.cloudflare_image_url,
+            psi.title,
+            psi.caption,
+            psi.date_taken,
+            psi.date_taken_precision,
+            psi.order_index,
+            p_submission_id,
+            p_submitter_id,
+            p_moderator_id,
+            NOW()
+          FROM photo_submission_items psi
+          WHERE psi.photo_submission_id = (v_item_data->>'photo_submission_id')::UUID;
+          
+          -- Return the photo_submission entity_id as v_entity_id
+          v_entity_id := (v_item_data->>'entity_id')::UUID;
+          
+          RAISE NOTICE '[%] Created % photos for entity % (type=%)',
+            COALESCE(p_request_id, 'NO_REQUEST_ID'),
+            (SELECT COUNT(*) FROM photo_submission_items WHERE photo_submission_id = (v_item_data->>'photo_submission_id')::UUID),
+            v_entity_id,
+            v_item_data->>'entity_type';
+        ELSE
+          -- Standard entity creation
+          v_entity_id := create_entity_from_submission(
+            v_item.item_type,
+            v_item_data,
+            p_submitter_id
+          );
+        END IF;
+      ELSIF v_item.action_type = 'update' THEN
+        v_entity_id := update_entity_from_submission(
+          v_item.item_type,
+          v_item_data,
+          v_item.target_entity_id,
+          p_submitter_id
+        );
+      ELSIF v_item.action_type = 'delete' THEN
+        PERFORM delete_entity_from_submission(
+          v_item.item_type,
+          v_item.target_entity_id,
+          p_submitter_id
+        );
+        v_entity_id := v_item.target_entity_id;
+      ELSE
+        RAISE EXCEPTION 'Unknown action_type: %', v_item.action_type;
+      END IF;
+      
+      -- Update submission_item to approved status
+      UPDATE submission_items
+      SET
+        status = 'approved',
+        approved_entity_id = v_entity_id,
+        updated_at = NOW()
+      WHERE id = v_item.id;
+      
+      -- Track success
+      v_approval_results := array_append(
+        v_approval_results,
+        jsonb_build_object(
+          'itemId', v_item.id,
+          'entityId', v_entity_id,
+          'itemType', v_item.item_type,
+          'actionType', v_item.action_type,
+          'success', true
+        )
+      );
+      
+      v_some_approved := TRUE;
+      
+      RAISE NOTICE '[%] Approved item % (type=%s, action=%s, entityId=%s)',
+        COALESCE(p_request_id, 'NO_REQUEST_ID'),
+        v_item.id,
+        v_item.item_type,
+        v_item.action_type,
+        v_entity_id;
+        
+    EXCEPTION WHEN OTHERS THEN
+      -- Log error but continue processing remaining items
+      RAISE WARNING '[%] Item % failed: % (SQLSTATE: %)',
+        COALESCE(p_request_id, 'NO_REQUEST_ID'),
+        v_item.id,
+        SQLERRM,
+        SQLSTATE;
+      
+      -- Update submission_item to rejected status
+      UPDATE submission_items
+      SET
+        status = 'rejected',
+        rejection_reason = SQLERRM,
+        updated_at = NOW()
+      WHERE id = v_item.id;
+      
+      -- Track failure
+      v_approval_results := array_append(
+        v_approval_results,
+        jsonb_build_object(
+          'itemId', v_item.id,
+          'itemType', v_item.item_type,
+          'actionType', v_item.action_type,
+          'success', false,
+          'error', SQLERRM
+        )
+      );
+      
+      v_all_approved := FALSE;
+    END;
+  END LOOP;
+  
+  -- ========================================================================
+  -- STEP 4: Determine final submission status
+  -- ========================================================================
+  v_final_status := CASE
+    WHEN v_all_approved THEN 'approved'
+    WHEN v_some_approved THEN 'partially_approved'
+    ELSE 'rejected'
+  END;
+  
+  -- ========================================================================
+  -- STEP 5: Update submission status
+  -- ========================================================================
+  UPDATE content_submissions
+  SET
+    status = v_final_status,
+    reviewer_id = p_moderator_id,
+    reviewed_at = NOW(),
+    assigned_to = NULL,
+    locked_until = NULL
+  WHERE id = p_submission_id;
+  
+  -- ========================================================================
+  -- STEP 6: Log metrics
+  -- ========================================================================
+  INSERT INTO approval_transaction_metrics (
+    submission_id,
+    moderator_id,
+    submitter_id,
+    items_count,
+    duration_ms,
+    success,
+    request_id
+  ) VALUES (
+    p_submission_id,
+    p_moderator_id,
+    p_submitter_id,
+    v_items_processed,
+    EXTRACT(EPOCH FROM (clock_timestamp() - v_start_time)) * 1000,
+    v_all_approved,
+    p_request_id
+  );
+  
+  -- ========================================================================
+  -- STEP 7: Build result
+  -- ========================================================================
+  v_result := jsonb_build_object(
+    'success', v_all_approved,
+    'submissionId', p_submission_id,
+    'finalStatus', v_final_status,
+    'itemsProcessed', v_items_processed,
+    'results', v_approval_results,
+    'durationMs', EXTRACT(EPOCH FROM (clock_timestamp() - v_start_time)) * 1000
+  );
+  
+  RAISE NOTICE '[%] Transaction complete: % items processed, status=%s',
+    COALESCE(p_request_id, 'NO_REQUEST_ID'),
+    v_items_processed,
+    v_final_status;
+  
+  RETURN v_result;
+END;
+$$;