Refactor submission items

supabase/functions/process-selective-approval/index.ts

@@ -335,10 +335,16 @@ serve(async (req) => {
 
     edgeLogger.info('Processing selective approval', { action: 'approval_start', itemCount: itemIds.length, userId: authenticatedUserId, submissionId });
 
-    // Fetch all items for the submission
+    // Fetch all items with relational data for the submission
     const { data: items, error: fetchError } = await supabase
       .from('submission_items')
-      .select('*')
+      .select(`
+        *,
+        park_submission:park_submissions!item_data_id(*),
+        ride_submission:ride_submissions!item_data_id(*),
+        company_submission:company_submissions!item_data_id(*),
+        ride_model_submission:ride_model_submissions!item_data_id(*)
+      `)
       .in('id', itemIds);
 
     if (fetchError) {
@@ -405,8 +411,36 @@ serve(async (req) => {
       try {
         edgeLogger.info('Processing item', { action: 'approval_process_item', itemId: item.id, itemType: item.item_type });
         
+        // Extract data from relational tables based on item_type
+        let itemData: any;
+        switch (item.item_type) {
+          case 'park':
+            itemData = (item as any).park_submission;
+            break;
+          case 'ride':
+            itemData = (item as any).ride_submission;
+            break;
+          case 'manufacturer':
+          case 'operator':
+          case 'property_owner':
+          case 'designer':
+            itemData = (item as any).company_submission;
+            break;
+          case 'ride_model':
+            itemData = (item as any).ride_model_submission;
+            break;
+          default:
+            // For photo/timeline items, fall back to item_data (these still use JSONB)
+            itemData = item.item_data;
+        }
+        
+        if (!itemData && item.item_data) {
+          // Fallback to item_data if relational data not found (for backwards compatibility)
+          itemData = item.item_data;
+        }
+        
         // Validate entity data with strict validation, passing original_data for edits
-        const validation = validateEntityDataStrict(item.item_type, item.item_data, item.original_data);
+        const validation = validateEntityDataStrict(item.item_type, itemData, item.original_data);
         
         if (validation.blockingErrors.length > 0) {
           edgeLogger.error('Blocking validation errors', {
@@ -467,7 +501,7 @@ serve(async (req) => {
         }
         
         // Resolve dependencies in item data
-        const resolvedData = resolveDependencies(item.item_data, dependencyMap, sortedItems);
+        const resolvedData = resolveDependencies(itemData, dependencyMap, sortedItems);
         
         // Add submitter ID to the data for photo tracking
         resolvedData._submitter_id = submitterId;

supabase/migrations/20251103035256_0ff94070-9336-406c-98e3-d55937709cf2.sql

@@ -0,0 +1,25 @@
+-- ============================================================================
+-- ELIMINATE JSONB FROM submission_items
+-- ============================================================================
+-- Problem: submission_items.item_data stores entire submission payloads as JSONB
+-- Solution: Use existing relational tables (*_submissions) and link via foreign key
+--
+-- CRITICAL PROJECT RULE: NO JSON OR JSONB IN SQL COLUMNS FOR RELATIONAL DATA
+-- ============================================================================
+
+-- Step 1: Add foreign key column to link to relational submission tables
+ALTER TABLE submission_items 
+  ADD COLUMN item_data_id UUID;
+
+-- Step 2: Create index for performance
+CREATE INDEX idx_submission_items_item_data_id ON submission_items(item_data_id);
+
+-- Step 3: Add comments explaining the architecture
+COMMENT ON COLUMN submission_items.item_data_id IS 
+  'Foreign key to *_submissions tables based on item_type. park -> park_submissions, ride -> ride_submissions, company types -> company_submissions, ride_model -> ride_model_submissions. Replaces the deprecated item_data JSONB column.';
+
+COMMENT ON COLUMN submission_items.item_data IS 
+  'DEPRECATED: Use item_data_id to reference relational *_submissions tables. This JSONB column violates the NO JSON IN DATABASE rule and will be dropped.';
+
+COMMENT ON COLUMN submission_items.original_data IS 
+  'DEPRECATED: Use item_data_id to reference relational *_submissions tables. This JSONB column violates the NO JSON IN DATABASE rule and will be dropped.';