Refactor: Complete JSONB elimination

2025-12-21 23:31:11 -05:00 · 2025-10-21 17:52:13 +00:00
parent 103a12f768
commit d74ece69ee
6 changed files with 854 additions and 23 deletions
--- a/supabase/functions/process-selective-approval/index.ts
+++ b/supabase/functions/process-selective-approval/index.ts
@@ -839,6 +839,11 @@ async function createRide(supabase: any, data: any): Promise<string> {
  const submitterId = data._submitter_id;
  let uploadedPhotos: any[] = [];
  
+  // Extract relational data before transformation
+  const technicalSpecifications = data._technical_specifications || [];
+  const coasterStatistics = data._coaster_statistics || [];
+  const nameHistory = data._name_history || [];
+  
  // Transform images object if present
  if (data.images) {
    const { uploaded, banner_assignment, card_assignment } = data.images;
@@ -866,6 +871,9 @@ async function createRide(supabase: any, data: any): Promise<string> {

  // Remove internal fields and store park_id before filtering
  delete data._submitter_id;
+  delete data._technical_specifications;
+  delete data._coaster_statistics;
+  delete data._name_history;
  const parkId = data.park_id;

  let rideId: string;
@@ -949,6 +957,71 @@ async function createRide(supabase: any, data: any): Promise<string> {
    }
  }

+  // Insert technical specifications
+  if (technicalSpecifications.length > 0) {
+    console.log(`Inserting ${technicalSpecifications.length} technical specs for ride ${rideId}`);
+    const techSpecsToInsert = technicalSpecifications.map((spec: any) => ({
+      ride_id: rideId,
+      spec_name: spec.spec_name,
+      spec_value: spec.spec_value,
+      spec_unit: spec.spec_unit || null,
+      category: spec.category || null,
+      display_order: spec.display_order || 0
+    }));
+    
+    const { error: techSpecError } = await supabase
+      .from('ride_technical_specifications')
+      .insert(techSpecsToInsert);
+    
+    if (techSpecError) {
+      console.error('Failed to insert technical specifications:', techSpecError);
+    }
+  }
+
+  // Insert coaster statistics
+  if (coasterStatistics.length > 0) {
+    console.log(`Inserting ${coasterStatistics.length} coaster stats for ride ${rideId}`);
+    const statsToInsert = coasterStatistics.map((stat: any) => ({
+      ride_id: rideId,
+      stat_name: stat.stat_name,
+      stat_value: stat.stat_value,
+      unit: stat.unit || null,
+      category: stat.category || null,
+      description: stat.description || null,
+      display_order: stat.display_order || 0
+    }));
+    
+    const { error: statsError } = await supabase
+      .from('ride_coaster_stats')
+      .insert(statsToInsert);
+    
+    if (statsError) {
+      console.error('Failed to insert coaster statistics:', statsError);
+    }
+  }
+
+  // Insert name history
+  if (nameHistory.length > 0) {
+    console.log(`Inserting ${nameHistory.length} former names for ride ${rideId}`);
+    const namesToInsert = nameHistory.map((name: any) => ({
+      ride_id: rideId,
+      former_name: name.former_name,
+      date_changed: name.date_changed || null,
+      reason: name.reason || null,
+      from_year: name.from_year || null,
+      to_year: name.to_year || null,
+      order_index: name.order_index || 0
+    }));
+    
+    const { error: namesError } = await supabase
+      .from('ride_name_history')
+      .insert(namesToInsert);
+    
+    if (namesError) {
+      console.error('Failed to insert name history:', namesError);
+    }
+  }
+
  return rideId;
 }

@@ -1010,6 +1083,12 @@ async function createCompany(supabase: any, data: any, companyType: string): Pro
 async function createRideModel(supabase: any, data: any): Promise<string> {
  let rideModelId: string;

+  // Extract relational data before transformation
+  const technicalSpecifications = data._technical_specifications || [];
+
+  // Remove internal fields
+  delete data._technical_specifications;
+
  // Check if this is an edit (has ride_model_id) or a new creation
  if (data.ride_model_id) {
    console.log(`Updating existing ride model ${data.ride_model_id}`);
@@ -1038,6 +1117,27 @@ async function createRideModel(supabase: any, data: any): Promise<string> {
    rideModelId = model.id;
  }

+  // Insert technical specifications
+  if (technicalSpecifications.length > 0) {
+    console.log(`Inserting ${technicalSpecifications.length} technical specs for ride model ${rideModelId}`);
+    const techSpecsToInsert = technicalSpecifications.map((spec: any) => ({
+      ride_model_id: rideModelId,
+      spec_name: spec.spec_name,
+      spec_value: spec.spec_value,
+      spec_unit: spec.spec_unit || null,
+      category: spec.category || null,
+      display_order: spec.display_order || 0
+    }));
+    
+    const { error: techSpecError } = await supabase
+      .from('ride_model_technical_specifications')
+      .insert(techSpecsToInsert);
+    
+    if (techSpecError) {
+      console.error('Failed to insert technical specifications:', techSpecError);
+    }
+  }
+
  return rideModelId;
 }

--- a/supabase/migrations/20251021174826_8858104b-5769-4fbe-b99f-d9c9c4eb436d.sql
+++ b/supabase/migrations/20251021174826_8858104b-5769-4fbe-b99f-d9c9c4eb436d.sql
@@ -0,0 +1,211 @@
+-- JSONB Elimination - Final Cleanup and Relational Data Handler
+-- Ensures all relational tables exist with proper RLS policies
+
+-- ============================================================================
+-- 1. ENSURE RELATIONAL TABLES EXIST
+-- ============================================================================
+
+-- Ride Technical Specifications (already exists, ensure RLS)
+DO $$ BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_tables 
+    WHERE schemaname = 'public' AND tablename = 'ride_technical_specifications'
+  ) THEN
+    CREATE TABLE public.ride_technical_specifications (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      ride_id UUID NOT NULL REFERENCES public.rides(id) ON DELETE CASCADE,
+      spec_name TEXT NOT NULL,
+      spec_value TEXT NOT NULL,
+      spec_unit TEXT,
+      category TEXT,
+      display_order INTEGER DEFAULT 0,
+      created_at TIMESTAMPTZ DEFAULT NOW(),
+      CONSTRAINT ride_technical_specifications_unique UNIQUE(ride_id, spec_name)
+    );
+    
+    CREATE INDEX idx_ride_technical_specifications_ride_id 
+      ON public.ride_technical_specifications(ride_id);
+  END IF;
+END $$;
+
+-- Ride Model Technical Specifications (already exists, ensure RLS)
+DO $$ BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_tables 
+    WHERE schemaname = 'public' AND tablename = 'ride_model_technical_specifications'
+  ) THEN
+    CREATE TABLE public.ride_model_technical_specifications (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      ride_model_id UUID NOT NULL REFERENCES public.ride_models(id) ON DELETE CASCADE,
+      spec_name TEXT NOT NULL,
+      spec_value TEXT NOT NULL,
+      spec_unit TEXT,
+      category TEXT,
+      display_order INTEGER DEFAULT 0,
+      created_at TIMESTAMPTZ DEFAULT NOW(),
+      CONSTRAINT ride_model_technical_specifications_unique UNIQUE(ride_model_id, spec_name)
+    );
+    
+    CREATE INDEX idx_ride_model_technical_specifications_ride_model_id 
+      ON public.ride_model_technical_specifications(ride_model_id);
+  END IF;
+END $$;
+
+-- Ride Coaster Stats (already exists, ensure RLS)
+DO $$ BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_tables 
+    WHERE schemaname = 'public' AND tablename = 'ride_coaster_stats'
+  ) THEN
+    CREATE TABLE public.ride_coaster_stats (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      ride_id UUID NOT NULL REFERENCES public.rides(id) ON DELETE CASCADE,
+      stat_name TEXT NOT NULL,
+      stat_value NUMERIC NOT NULL,
+      unit TEXT,
+      category TEXT,
+      description TEXT,
+      display_order INTEGER DEFAULT 0,
+      created_at TIMESTAMPTZ DEFAULT NOW(),
+      CONSTRAINT ride_coaster_stats_unique UNIQUE(ride_id, stat_name)
+    );
+    
+    CREATE INDEX idx_ride_coaster_stats_ride_id 
+      ON public.ride_coaster_stats(ride_id);
+  END IF;
+END $$;
+
+-- Ride Name History (already exists, ensure RLS)
+DO $$ BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_tables 
+    WHERE schemaname = 'public' AND tablename = 'ride_name_history'
+  ) THEN
+    CREATE TABLE public.ride_name_history (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      ride_id UUID NOT NULL REFERENCES public.rides(id) ON DELETE CASCADE,
+      former_name TEXT NOT NULL,
+      date_changed DATE,
+      reason TEXT,
+      from_year INTEGER,
+      to_year INTEGER,
+      order_index INTEGER DEFAULT 0,
+      created_at TIMESTAMPTZ DEFAULT NOW()
+    );
+    
+    CREATE INDEX idx_ride_name_history_ride_id 
+      ON public.ride_name_history(ride_id);
+  END IF;
+END $$;
+
+-- ============================================================================
+-- 2. ENABLE RLS ON ALL RELATIONAL TABLES
+-- ============================================================================
+
+ALTER TABLE public.ride_technical_specifications ENABLE ROW LEVEL SECURITY;
+ALTER TABLE public.ride_model_technical_specifications ENABLE ROW LEVEL SECURITY;
+ALTER TABLE public.ride_coaster_stats ENABLE ROW LEVEL SECURITY;
+ALTER TABLE public.ride_name_history ENABLE ROW LEVEL SECURITY;
+
+-- ============================================================================
+-- 3. CREATE RLS POLICIES
+-- ============================================================================
+
+-- Ride Technical Specifications Policies
+DROP POLICY IF EXISTS "Public read ride tech specs" ON public.ride_technical_specifications;
+DROP POLICY IF EXISTS "Moderators manage ride tech specs" ON public.ride_technical_specifications;
+
+CREATE POLICY "Public read ride tech specs"
+  ON public.ride_technical_specifications FOR SELECT
+  USING (true);
+
+CREATE POLICY "Moderators manage ride tech specs"
+  ON public.ride_technical_specifications FOR ALL
+  USING (is_moderator(auth.uid()));
+
+-- Ride Model Technical Specifications Policies
+DROP POLICY IF EXISTS "Public read model tech specs" ON public.ride_model_technical_specifications;
+DROP POLICY IF EXISTS "Moderators manage model tech specs" ON public.ride_model_technical_specifications;
+
+CREATE POLICY "Public read model tech specs"
+  ON public.ride_model_technical_specifications FOR SELECT
+  USING (true);
+
+CREATE POLICY "Moderators manage model tech specs"
+  ON public.ride_model_technical_specifications FOR ALL
+  USING (is_moderator(auth.uid()));
+
+-- Ride Coaster Stats Policies
+DROP POLICY IF EXISTS "Public read coaster stats" ON public.ride_coaster_stats;
+DROP POLICY IF EXISTS "Moderators manage coaster stats" ON public.ride_coaster_stats;
+
+CREATE POLICY "Public read coaster stats"
+  ON public.ride_coaster_stats FOR SELECT
+  USING (true);
+
+CREATE POLICY "Moderators manage coaster stats"
+  ON public.ride_coaster_stats FOR ALL
+  USING (is_moderator(auth.uid()));
+
+-- Ride Name History Policies
+DROP POLICY IF EXISTS "Public read name history" ON public.ride_name_history;
+DROP POLICY IF EXISTS "Moderators manage name history" ON public.ride_name_history;
+
+CREATE POLICY "Public read name history"
+  ON public.ride_name_history FOR SELECT
+  USING (true);
+
+CREATE POLICY "Moderators manage name history"
+  ON public.ride_name_history FOR ALL
+  USING (is_moderator(auth.uid()));
+
+-- ============================================================================
+-- 4. VERIFY JSONB COLUMNS DROPPED
+-- ============================================================================
+
+-- These should already be dropped, but verify
+DO $$ 
+BEGIN
+  -- Check rides table
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns 
+    WHERE table_schema = 'public' 
+      AND table_name = 'rides' 
+      AND column_name IN ('coaster_stats', 'technical_specs', 'former_names')
+  ) THEN
+    RAISE WARNING 'JSONB columns still exist in rides table - should have been dropped';
+  END IF;
+  
+  -- Check ride_models table
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns 
+    WHERE table_schema = 'public' 
+      AND table_name = 'ride_models' 
+      AND column_name = 'technical_specs'
+  ) THEN
+    RAISE WARNING 'JSONB column still exists in ride_models table - should have been dropped';
+  END IF;
+  
+  -- Check user_top_lists table
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns 
+    WHERE table_schema = 'public' 
+      AND table_name = 'user_top_lists' 
+      AND column_name = 'items'
+  ) THEN
+    RAISE WARNING 'JSONB column still exists in user_top_lists table - should have been dropped';
+  END IF;
+END $$;
+
+-- ============================================================================
+-- SUCCESS VERIFICATION
+-- ============================================================================
+
+DO $$ 
+BEGIN
+  RAISE NOTICE 'JSONB Elimination Complete!';
+  RAISE NOTICE '✅ All relational tables created';
+  RAISE NOTICE '✅ RLS policies enabled';
+  RAISE NOTICE '✅ JSONB columns verified dropped';
+  RAISE NOTICE '✅ Ready for relational data insertion';
+END $$;