Compare commits

...

3 Commits

Author SHA1 Message Date
gpt-engineer-app[bot]
496ff48e34 Connect to Lovable Cloud
Implemented end-to-end fixes:
- Added INSERT RLS policies for park_submissions, ride_submissions, company_submissions, ride_model_submissions, and photo_submissions (own submissions and moderator access)
- Fixed process_approval_transaction to replace ride_type with category and updated references accordingly
- Enhanced rate limiting in testRunner.ts with a 6s base delay and 12s adaptive delays after submission-heavy suites
2025-11-10 18:34:14 +00:00
gpt-engineer-app[bot]
b47d5392d5 Enhance formatTestError patterns
Adds comprehensive error pattern matching in formatTestError to detect and format Supabase constraint violations (RLs, not-null, unique, foreign keys, check constraints, and related schema/permission issues) into actionable messages, extracting relevant details for clearer test failure guidance. Includes handling for common error shapes and preserves fallback messaging.
2025-11-10 18:22:00 +00:00
gpt-engineer-app[bot]
c5d40d07df Connect to Lovable Cloud
Apply quick wins and pipeline fixes for integration tests:
- Remove is_test_data flag from location inserts
- Increase test delay from 2.5s to 5s and add delays between suites to curb rate limiting
- Replace [object Object] error formatting with formatTestError across 10 test suites (31 edits) and add import
- Refactor unit/conversion tests and performance tests to use the approval pipeline
- Extend edge function handling by ensuring item_ids are included in idempotency key inserts (edge function fix)
- Update auth, data integrity, edgeFunction, moderation, performance, submission, unitConversion, and versioning test files accordingly
2025-11-10 18:20:22 +00:00
16 changed files with 817 additions and 159 deletions

View File

@@ -2,8 +2,87 @@
* Test Error Formatting Utility * Test Error Formatting Utility
* *
* Provides robust error formatting for test results to avoid "[object Object]" messages * Provides robust error formatting for test results to avoid "[object Object]" messages
* Includes pattern matching for common Supabase/Postgres constraint violations
*/ */
/**
* Error pattern matchers for common database constraint violations
*/
const ERROR_PATTERNS = [
{
// RLS policy violations
pattern: /new row violates row-level security policy for table "(\w+)"/i,
format: (match: RegExpMatchArray) =>
`RLS Policy Violation: Cannot insert into table "${match[1]}". Check that RLS policies allow this operation and user has proper authentication.`
},
{
// NOT NULL constraint violations
pattern: /null value in column "(\w+)" of relation "(\w+)" violates not-null constraint/i,
format: (match: RegExpMatchArray) =>
`NOT NULL Constraint: Column "${match[1]}" in table "${match[2]}" cannot be null. Provide a value for this required field.`
},
{
// UNIQUE constraint violations
pattern: /duplicate key value violates unique constraint "(\w+)"/i,
format: (match: RegExpMatchArray) =>
`UNIQUE Constraint: Duplicate value violates constraint "${match[1]}". This value already exists in the database.`
},
{
// Foreign key violations
pattern: /insert or update on table "(\w+)" violates foreign key constraint "(\w+)"/i,
format: (match: RegExpMatchArray) =>
`Foreign Key Violation: Table "${match[1]}" references non-existent record (constraint: "${match[2]}"). Ensure the referenced entity exists first.`
},
{
// Foreign key violations (alternative format)
pattern: /violates foreign key constraint/i,
format: () =>
`Foreign Key Violation: Referenced record does not exist. Create the parent entity before creating this dependent entity.`
},
{
// Check constraint violations
pattern: /new row for relation "(\w+)" violates check constraint "(\w+)"/i,
format: (match: RegExpMatchArray) =>
`Check Constraint: Validation failed for table "${match[1]}" (constraint: "${match[2]}"). The provided value does not meet validation requirements.`
},
{
// Column does not exist
pattern: /column "(\w+)" of relation "(\w+)" does not exist/i,
format: (match: RegExpMatchArray) =>
`Schema Error: Column "${match[1]}" does not exist in table "${match[2]}". Check database schema or migration status.`
},
{
// Could not find column in schema cache
pattern: /Could not find the '(\w+)' column of '(\w+)' in the schema cache/i,
format: (match: RegExpMatchArray) =>
`Schema Cache Error: Column "${match[1]}" not found in table "${match[2]}". The schema may have changed - try refreshing the database connection.`
},
{
// Table does not exist
pattern: /relation "(\w+)" does not exist/i,
format: (match: RegExpMatchArray) =>
`Schema Error: Table "${match[1]}" does not exist. Run migrations or check database schema.`
},
{
// Permission denied
pattern: /permission denied for (?:table|relation) "?(\w+)"?/i,
format: (match: RegExpMatchArray) =>
`Permission Denied: Insufficient permissions to access table "${match[1]}". Check RLS policies and user roles.`
},
{
// Rate limit errors
pattern: /Rate limit exceeded\. Please wait (\d+) seconds?/i,
format: (match: RegExpMatchArray) =>
`Rate Limited: Too many requests. Wait ${match[1]} seconds before retrying.`
},
{
// Rate limit errors (alternative format)
pattern: /Too many submissions in a short time\. Please wait (\d+) seconds?/i,
format: (match: RegExpMatchArray) =>
`Rate Limited: Submission throttled. Wait ${match[1]} seconds before submitting again.`
}
];
/** /**
* Format error for test result display * Format error for test result display
* Handles Error objects, PostgresError objects, and plain objects * Handles Error objects, PostgresError objects, and plain objects
@@ -12,48 +91,62 @@
* @returns Formatted, human-readable error string * @returns Formatted, human-readable error string
*/ */
export function formatTestError(error: unknown): string { export function formatTestError(error: unknown): string {
// Standard Error objects let errorMessage = '';
if (error instanceof Error) {
return error.message;
}
// Object-like errors (PostgresError, custom error objects, etc.) // Extract base error message
if (typeof error === 'object' && error !== null) { if (error instanceof Error) {
errorMessage = error.message;
} else if (typeof error === 'object' && error !== null) {
const err = error as any; const err = error as any;
// Try common error message properties // Try common error message properties
if (err.message && typeof err.message === 'string') { if (err.message && typeof err.message === 'string') {
return err.message; errorMessage = err.message;
}
// Include additional Supabase error details if present
if (err.details && typeof err.details === 'string') {
errorMessage += ` | Details: ${err.details}`;
}
if (err.hint && typeof err.hint === 'string') {
errorMessage += ` | Hint: ${err.hint}`;
}
if (err.code && typeof err.code === 'string') {
errorMessage += ` | Code: ${err.code}`;
}
}
// Some errors nest the actual error in an 'error' property // Some errors nest the actual error in an 'error' property
if (err.error) { else if (err.error) {
return formatTestError(err.error); return formatTestError(err.error);
} }
// Some APIs use 'msg' instead of 'message' // Some APIs use 'msg' instead of 'message'
if (err.msg && typeof err.msg === 'string') { else if (err.msg && typeof err.msg === 'string') {
return err.msg; errorMessage = err.msg;
} }
// Supabase errors might have details
if (err.details && typeof err.details === 'string') {
return `${err.message || 'Error'}: ${err.details}`;
}
// Last resort: stringify the entire object // Last resort: stringify the entire object
try { else {
const stringified = JSON.stringify(error, null, 2); try {
// If it's too long, truncate it const stringified = JSON.stringify(error, null, 2);
return stringified.length > 500 errorMessage = stringified.length > 500
? stringified.substring(0, 500) + '... (truncated)' ? stringified.substring(0, 500) + '... (truncated)'
: stringified; : stringified;
} catch { } catch {
// JSON.stringify can fail on circular references // JSON.stringify can fail on circular references
return String(error); errorMessage = String(error);
}
}
} else {
// Primitive values (strings, numbers, etc.)
errorMessage = String(error);
}
// Apply pattern matching to format known constraint violations
for (const { pattern, format } of ERROR_PATTERNS) {
const match = errorMessage.match(pattern);
if (match) {
return format(match);
} }
} }
// Primitive values (strings, numbers, etc.) // Return original message if no patterns matched
return String(error); return errorMessage;
} }

View File

@@ -550,7 +550,6 @@ export async function createParkDirectly(
country: data.location.country, country: data.location.country,
latitude: data.location.latitude, latitude: data.location.latitude,
longitude: data.location.longitude, longitude: data.location.longitude,
is_test_data: true,
}) })
.select() .select()
.single(); .single();

View File

@@ -6,6 +6,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { formatTestError } from '../formatTestError';
export const authTestSuite: TestSuite = { export const authTestSuite: TestSuite = {
id: 'auth', id: 'auth',
@@ -64,7 +65,7 @@ export const authTestSuite: TestSuite = {
suite: 'Authentication & Authorization', suite: 'Authentication & Authorization',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -137,7 +138,7 @@ export const authTestSuite: TestSuite = {
suite: 'Authentication & Authorization', suite: 'Authentication & Authorization',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -187,7 +188,7 @@ export const authTestSuite: TestSuite = {
suite: 'Authentication & Authorization', suite: 'Authentication & Authorization',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -248,7 +249,7 @@ export const authTestSuite: TestSuite = {
suite: 'Authentication & Authorization', suite: 'Authentication & Authorization',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };

View File

@@ -7,6 +7,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { TestDataTracker } from '../TestDataTracker'; import { TestDataTracker } from '../TestDataTracker';
import { formatTestError } from '../formatTestError';
export const dataIntegrityTestSuite: TestSuite = { export const dataIntegrityTestSuite: TestSuite = {
id: 'data-integrity', id: 'data-integrity',
@@ -77,7 +78,7 @@ export const dataIntegrityTestSuite: TestSuite = {
suite: 'Data Integrity & Constraints', suite: 'Data Integrity & Constraints',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -139,7 +140,7 @@ export const dataIntegrityTestSuite: TestSuite = {
suite: 'Data Integrity & Constraints', suite: 'Data Integrity & Constraints',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -239,7 +240,7 @@ export const dataIntegrityTestSuite: TestSuite = {
suite: 'Data Integrity & Constraints', suite: 'Data Integrity & Constraints',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -305,7 +306,7 @@ export const dataIntegrityTestSuite: TestSuite = {
suite: 'Data Integrity & Constraints', suite: 'Data Integrity & Constraints',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };

View File

@@ -6,6 +6,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { formatTestError } from '../formatTestError';
export const edgeFunctionTestSuite: TestSuite = { export const edgeFunctionTestSuite: TestSuite = {
id: 'edge-functions', id: 'edge-functions',
@@ -68,7 +69,7 @@ export const edgeFunctionTestSuite: TestSuite = {
suite: 'Edge Function Tests', suite: 'Edge Function Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -121,7 +122,7 @@ export const edgeFunctionTestSuite: TestSuite = {
suite: 'Edge Function Tests', suite: 'Edge Function Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -187,7 +188,7 @@ export const edgeFunctionTestSuite: TestSuite = {
suite: 'Edge Function Tests', suite: 'Edge Function Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -6,6 +6,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { formatTestError } from '../formatTestError';
export const moderationDependencyTestSuite: TestSuite = { export const moderationDependencyTestSuite: TestSuite = {
id: 'moderation-dependencies', id: 'moderation-dependencies',
@@ -102,7 +103,7 @@ export const moderationDependencyTestSuite: TestSuite = {
suite: 'Multi-Item Dependency Resolution', suite: 'Multi-Item Dependency Resolution',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -144,7 +145,7 @@ export const moderationDependencyTestSuite: TestSuite = {
suite: 'Multi-Item Dependency Resolution', suite: 'Multi-Item Dependency Resolution',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -6,6 +6,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { formatTestError } from '../formatTestError';
export const moderationLockTestSuite: TestSuite = { export const moderationLockTestSuite: TestSuite = {
id: 'moderation-locks', id: 'moderation-locks',
@@ -97,7 +98,7 @@ export const moderationLockTestSuite: TestSuite = {
suite: 'Moderation Lock Management', suite: 'Moderation Lock Management',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -183,7 +184,7 @@ export const moderationLockTestSuite: TestSuite = {
suite: 'Moderation Lock Management', suite: 'Moderation Lock Management',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -284,7 +285,7 @@ export const moderationLockTestSuite: TestSuite = {
suite: 'Moderation Lock Management', suite: 'Moderation Lock Management',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -6,6 +6,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { formatTestError } from '../formatTestError';
export const moderationTestSuite: TestSuite = { export const moderationTestSuite: TestSuite = {
id: 'moderation', id: 'moderation',
@@ -53,7 +54,7 @@ export const moderationTestSuite: TestSuite = {
suite: 'Moderation Queue & Workflow', suite: 'Moderation Queue & Workflow',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -7,6 +7,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { TestDataTracker } from '../TestDataTracker'; import { TestDataTracker } from '../TestDataTracker';
import { formatTestError } from '../formatTestError';
export const performanceTestSuite: TestSuite = { export const performanceTestSuite: TestSuite = {
id: 'performance', id: 'performance',
@@ -96,7 +97,7 @@ export const performanceTestSuite: TestSuite = {
suite: 'Performance & Scalability', suite: 'Performance & Scalability',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }
@@ -112,22 +113,36 @@ export const performanceTestSuite: TestSuite = {
let parkId: string | null = null; let parkId: string | null = null;
try { try {
// Create test park // Import helpers and create park via pipeline
const parkSlug = `test-park-perf-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; const {
const { data: park, error: parkError } = await supabase getCurrentUserId,
.from('parks') getAuthToken,
.insert({ generateUniqueParkData,
name: 'Test Park Performance', createTestParkSubmission,
slug: parkSlug, approveSubmission
park_type: 'theme_park', } = await import('../helpers/approvalTestHelpers');
status: 'operating',
is_test_data: true const userId = await getCurrentUserId();
}) const authToken = await getAuthToken();
.select('id') const parkData = generateUniqueParkData('perf-002');
.single();
if (parkError) throw new Error(`Park creation failed: ${parkError.message}`); const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
parkId = park.id; const approval = await approveSubmission(submissionId, [itemId], authToken);
if (!approval.success) {
throw new Error(`Park creation failed: ${approval.error || 'Unknown error'}`);
}
// Get park ID from submission item
const { data: parkItem } = await supabase
.from('submission_items')
.select('approved_entity_id')
.eq('id', itemId)
.single();
parkId = parkItem?.approved_entity_id || null;
if (!parkId) throw new Error('No park ID after approval');
tracker.track('parks', parkId); tracker.track('parks', parkId);
// Create multiple versions (updates) // Create multiple versions (updates)
@@ -182,7 +197,7 @@ export const performanceTestSuite: TestSuite = {
suite: 'Performance & Scalability', suite: 'Performance & Scalability',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -265,7 +280,7 @@ export const performanceTestSuite: TestSuite = {
suite: 'Performance & Scalability', suite: 'Performance & Scalability',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -8,6 +8,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { TestDataTracker } from '../TestDataTracker'; import { TestDataTracker } from '../TestDataTracker';
import { formatTestError } from '../formatTestError';
import { import {
generateUniqueParkData, generateUniqueParkData,
generateUniqueRideData, generateUniqueRideData,
@@ -115,7 +116,7 @@ export const submissionTestSuite: TestSuite = {
suite: 'Entity Submission & Validation', suite: 'Entity Submission & Validation',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -208,7 +209,7 @@ export const submissionTestSuite: TestSuite = {
suite: 'Entity Submission & Validation', suite: 'Entity Submission & Validation',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -295,7 +296,7 @@ export const submissionTestSuite: TestSuite = {
suite: 'Entity Submission & Validation', suite: 'Entity Submission & Validation',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -404,7 +405,7 @@ export const submissionTestSuite: TestSuite = {
suite: 'Entity Submission & Validation', suite: 'Entity Submission & Validation',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {

View File

@@ -7,6 +7,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { TestDataTracker } from '../TestDataTracker'; import { TestDataTracker } from '../TestDataTracker';
import { formatTestError } from '../formatTestError';
export const unitConversionTestSuite: TestSuite = { export const unitConversionTestSuite: TestSuite = {
id: 'unit-conversion', id: 'unit-conversion',
@@ -24,65 +25,93 @@ export const unitConversionTestSuite: TestSuite = {
let rideId: string | null = null; let rideId: string | null = null;
try { try {
// Create test park // Import helpers and create via pipeline
const parkSlug = `test-park-units-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; const {
const { data: park, error: parkError } = await supabase getCurrentUserId,
.from('parks') getAuthToken,
.insert({ generateUniqueParkData,
name: 'Test Park Units', generateUniqueRideData,
slug: parkSlug, createTestParkSubmission,
park_type: 'theme_park', createTestRideSubmission,
status: 'operating', approveSubmission
is_test_data: true } = await import('../helpers/approvalTestHelpers');
})
.select('id') const userId = await getCurrentUserId();
.single(); const authToken = await getAuthToken();
// Create and approve park
const parkData = generateUniqueParkData('unit-001-park');
const { submissionId: parkSubId, itemId: parkItemId } = await createTestParkSubmission(parkData, userId, tracker);
const parkApproval = await approveSubmission(parkSubId, [parkItemId], authToken);
if (parkError) throw new Error(`Park creation failed: ${parkError.message}`); if (!parkApproval.success) {
parkId = park.id; throw new Error(`Park creation failed: ${parkApproval.error || 'Unknown error'}`);
}
// Get park ID from submission item
const { data: parkItem } = await supabase
.from('submission_items')
.select('approved_entity_id')
.eq('id', parkItemId)
.single();
parkId = parkItem?.approved_entity_id || null;
if (!parkId) throw new Error('No park ID after approval');
tracker.track('parks', parkId); tracker.track('parks', parkId);
// Create ride with metric values // Create and approve ride with metric values
const rideSlug = `test-ride-units-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; const rideData = {
const testData = { ...generateUniqueRideData(parkId, 'unit-001-ride'),
name: 'Test Ride Metric', max_speed_kmh: 100.0,
slug: rideSlug, max_height_meters: 50.0,
park_id: parkId, length_meters: 1000.0,
category: 'roller_coaster', drop_height_meters: 45.0,
status: 'operating', height_requirement: 120
max_speed_kmh: 100.0, // km/h (metric)
max_height_meters: 50.0, // meters (metric)
length_meters: 1000.0, // meters (metric)
drop_height_meters: 45.0, // meters (metric)
height_requirement: 120 // cm (metric)
}; };
const { submissionId: rideSubId, itemId: rideItemId } = await createTestRideSubmission(rideData, userId, tracker);
const rideApproval = await approveSubmission(rideSubId, [rideItemId], authToken);
const { data: ride, error: rideError } = await supabase if (!rideApproval.success) {
.from('rides') throw new Error(`Ride creation failed: ${rideApproval.error || 'Unknown error'}`);
.insert({ ...testData, is_test_data: true }) }
.select('id, max_speed_kmh, max_height_meters, length_meters, drop_height_meters, height_requirement')
// Get ride ID from submission item
const { data: rideItem } = await supabase
.from('submission_items')
.select('approved_entity_id')
.eq('id', rideItemId)
.single(); .single();
if (rideError) throw new Error(`Ride creation failed: ${rideError.message}`); rideId = rideItem?.approved_entity_id || null;
if (!ride) throw new Error('Ride not returned'); if (!rideId) throw new Error('No ride ID after approval');
rideId = ride.id;
tracker.track('rides', rideId); tracker.track('rides', rideId);
// Fetch ride data for validation
const { data: ride, error: rideError } = await supabase
.from('rides')
.select('id, max_speed_kmh, max_height_meters, length_meters, drop_height_meters, height_requirement')
.eq('id', rideId)
.single();
if (rideError || !ride) throw new Error('Ride not found after creation');
// Validate values are stored in metric // Validate values are stored in metric
const tolerance = 0.01; // Allow small floating point differences const tolerance = 0.01;
if (Math.abs((ride.max_speed_kmh ?? 0) - testData.max_speed_kmh) > tolerance) { if (Math.abs((ride.max_speed_kmh ?? 0) - 100.0) > tolerance) {
throw new Error(`max_speed_kmh mismatch: expected ${testData.max_speed_kmh}, got ${ride.max_speed_kmh}`); throw new Error(`max_speed_kmh mismatch: expected 100.0, got ${ride.max_speed_kmh}`);
} }
if (Math.abs((ride.max_height_meters ?? 0) - testData.max_height_meters) > tolerance) { if (Math.abs((ride.max_height_meters ?? 0) - 50.0) > tolerance) {
throw new Error(`max_height_meters mismatch: expected ${testData.max_height_meters}, got ${ride.max_height_meters}`); throw new Error(`max_height_meters mismatch: expected 50.0, got ${ride.max_height_meters}`);
} }
if (Math.abs((ride.length_meters ?? 0) - testData.length_meters) > tolerance) { if (Math.abs((ride.length_meters ?? 0) - 1000.0) > tolerance) {
throw new Error(`length_meters mismatch: expected ${testData.length_meters}, got ${ride.length_meters}`); throw new Error(`length_meters mismatch: expected 1000.0, got ${ride.length_meters}`);
} }
if (Math.abs((ride.height_requirement ?? 0) - testData.height_requirement) > tolerance) { if (Math.abs((ride.height_requirement ?? 0) - 120) > tolerance) {
throw new Error(`height_requirement mismatch: expected ${testData.height_requirement} cm, got ${ride.height_requirement}`); throw new Error(`height_requirement mismatch: expected 120 cm, got ${ride.height_requirement}`);
} }
const duration = Date.now() - startTime; const duration = Date.now() - startTime;
@@ -108,7 +137,7 @@ export const unitConversionTestSuite: TestSuite = {
suite: 'Unit Conversion Tests', suite: 'Unit Conversion Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -131,44 +160,66 @@ export const unitConversionTestSuite: TestSuite = {
let rideId: string | null = null; let rideId: string | null = null;
try { try {
// Create test park // Import helpers and create via pipeline
const parkSlug = `test-park-ver-units-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; const {
const { data: park, error: parkError } = await supabase getCurrentUserId,
.from('parks') getAuthToken,
.insert({ generateUniqueParkData,
name: 'Test Park Version Units', generateUniqueRideData,
slug: parkSlug, createTestParkSubmission,
park_type: 'theme_park', createTestRideSubmission,
status: 'operating', approveSubmission
is_test_data: true } = await import('../helpers/approvalTestHelpers');
})
.select('id') const userId = await getCurrentUserId();
.single(); const authToken = await getAuthToken();
// Create and approve park
const parkData = generateUniqueParkData('unit-002-park');
const { submissionId: parkSubId, itemId: parkItemId } = await createTestParkSubmission(parkData, userId, tracker);
const parkApproval = await approveSubmission(parkSubId, [parkItemId], authToken);
if (parkError) throw new Error(`Park creation failed: ${parkError.message}`); if (!parkApproval.success) {
parkId = park.id; throw new Error(`Park creation failed: ${parkApproval.error || 'Unknown error'}`);
}
// Get park ID from submission item
const { data: parkItem } = await supabase
.from('submission_items')
.select('approved_entity_id')
.eq('id', parkItemId)
.single();
parkId = parkItem?.approved_entity_id || null;
if (!parkId) throw new Error('No park ID after approval');
tracker.track('parks', parkId); tracker.track('parks', parkId);
// Create ride with metric values // Create and approve ride with metric values
const rideSlug = `test-ride-ver-units-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; const rideData = {
const { data: ride, error: rideError } = await supabase ...generateUniqueRideData(parkId, 'unit-002-ride'),
.from('rides') max_speed_kmh: 120.0,
.insert({ max_height_meters: 60.0,
name: 'Test Ride Version Metric', height_requirement: 140
slug: rideSlug, };
park_id: parkId,
category: 'roller_coaster', const { submissionId: rideSubId, itemId: rideItemId } = await createTestRideSubmission(rideData, userId, tracker);
status: 'operating', const rideApproval = await approveSubmission(rideSubId, [rideItemId], authToken);
max_speed_kmh: 120.0,
max_height_meters: 60.0, if (!rideApproval.success) {
height_requirement: 140, throw new Error(`Ride creation failed: ${rideApproval.error || 'Unknown error'}`);
is_test_data: true }
})
.select('id') // Get ride ID from submission item
const { data: rideItem } = await supabase
.from('submission_items')
.select('approved_entity_id')
.eq('id', rideItemId)
.single(); .single();
if (rideError) throw new Error(`Ride creation failed: ${rideError.message}`); rideId = rideItem?.approved_entity_id || null;
rideId = ride.id; if (!rideId) throw new Error('No ride ID after approval');
tracker.track('rides', rideId); tracker.track('rides', rideId);
// Poll for version creation // Poll for version creation
@@ -226,7 +277,7 @@ export const unitConversionTestSuite: TestSuite = {
suite: 'Unit Conversion Tests', suite: 'Unit Conversion Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} finally { } finally {
@@ -307,7 +358,7 @@ export const unitConversionTestSuite: TestSuite = {
suite: 'Unit Conversion Tests', suite: 'Unit Conversion Tests',
status: 'fail', status: 'fail',
duration: Date.now() - startTime, duration: Date.now() - startTime,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
} }

View File

@@ -10,6 +10,7 @@
import { supabase } from '@/lib/supabaseClient'; import { supabase } from '@/lib/supabaseClient';
import type { TestSuite, TestResult } from '../testRunner'; import type { TestSuite, TestResult } from '../testRunner';
import { TestDataTracker } from '../TestDataTracker'; import { TestDataTracker } from '../TestDataTracker';
import { formatTestError } from '../formatTestError';
import { import {
generateUniqueParkData, generateUniqueParkData,
createTestParkSubmission, createTestParkSubmission,
@@ -106,7 +107,7 @@ export const versioningTestSuite: TestSuite = {
suite: 'Versioning & Rollback', suite: 'Versioning & Rollback',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -211,7 +212,7 @@ export const versioningTestSuite: TestSuite = {
suite: 'Versioning & Rollback', suite: 'Versioning & Rollback',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -304,7 +305,7 @@ export const versioningTestSuite: TestSuite = {
suite: 'Versioning & Rollback', suite: 'Versioning & Rollback',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };
@@ -441,7 +442,7 @@ export const versioningTestSuite: TestSuite = {
suite: 'Versioning & Rollback', suite: 'Versioning & Rollback',
status: 'fail', status: 'fail',
duration, duration,
error: error instanceof Error ? error.message : String(error), error: formatTestError(error),
stack: error instanceof Error ? error.stack : undefined, stack: error instanceof Error ? error.stack : undefined,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}; };

View File

@@ -53,9 +53,9 @@ export class IntegrationTestRunner {
private onProgress?: (result: TestResult) => void; private onProgress?: (result: TestResult) => void;
private delayBetweenTests: number; private delayBetweenTests: number;
constructor(onProgress?: (result: TestResult) => void, delayBetweenTests: number = 2500) { constructor(onProgress?: (result: TestResult) => void, delayBetweenTests: number = 6000) {
this.onProgress = onProgress; this.onProgress = onProgress;
this.delayBetweenTests = delayBetweenTests; // Default 2.5 seconds to prevent rate limiting this.delayBetweenTests = delayBetweenTests; // Default 6 seconds to prevent rate limiting
} }
/** /**
@@ -189,12 +189,58 @@ export class IntegrationTestRunner {
this.isRunning = true; this.isRunning = true;
this.shouldStop = false; this.shouldStop = false;
for (const suite of suites) { // Track submission-heavy suites for adaptive delays
await this.runSuite(suite); const submissionHeavySuites = [
'Entity Submission & Validation',
'Approval Pipeline',
'Unit Conversion Tests',
'Performance & Scalability'
];
for (let i = 0; i < suites.length; i++) {
await this.runSuite(suites[i]);
if (this.shouldStop) { if (this.shouldStop) {
break; break;
} }
// Add delay between suites with adaptive timing
if (i < suites.length - 1 && this.delayBetweenTests > 0) {
// Longer delay after submission-heavy suites
const isHeavySuite = submissionHeavySuites.includes(suites[i].name);
const delayMs = isHeavySuite
? this.delayBetweenTests * 2 // 12s delay after heavy suites
: this.delayBetweenTests; // 6s delay after others
const delaySeconds = delayMs / 1000;
const delayResult: TestResult = {
id: `suite-delay-${Date.now()}`,
name: `⏳ Suite completion delay: ${delaySeconds}s${isHeavySuite ? ' (submission-heavy)' : ''}`,
suite: 'System',
status: 'running',
duration: 0,
timestamp: new Date().toISOString(),
details: {
reason: 'Pausing between suites to prevent rate limiting',
isSubmissionHeavy: isHeavySuite
}
};
if (this.onProgress) {
this.onProgress(delayResult);
}
await this.delay(delayMs);
if (this.onProgress) {
this.onProgress({
...delayResult,
status: 'skip',
duration: delayMs,
details: { reason: 'Suite delay completed' }
});
}
}
} }
this.isRunning = false; this.isRunning = false;

View File

@@ -259,6 +259,7 @@ const handler = async (req: Request) => {
idempotency_key: idempotencyKey, idempotency_key: idempotencyKey,
submission_id: submissionId, submission_id: submissionId,
moderator_id: user.id, moderator_id: user.id,
item_ids: itemIds,
status: 'processing' status: 'processing'
}) })
.select() .select()

View File

@@ -262,6 +262,7 @@ const handler = async (req: Request) => {
idempotency_key: idempotencyKey, idempotency_key: idempotencyKey,
submission_id: submissionId, submission_id: submissionId,
moderator_id: user.id, moderator_id: user.id,
item_ids: itemIds,
status: 'processing' status: 'processing'
}) })
.select() .select()

View File

@@ -0,0 +1,444 @@
-- ============================================================================
-- Phase 8: Fix RLS Policies, SQL Schema, and Rate Limiting
-- ============================================================================
-- This migration addresses critical test failures:
-- 1. Adds missing INSERT policies for submission tables (26 tests)
-- 2. Fixes ride_type → category column references (2 tests)
-- ============================================================================
-- ============================================================================
-- PART 1: Add INSERT Policies for Submission Tables
-- ============================================================================
-- Park Submissions: Users can insert their own submissions
CREATE POLICY "park_submissions_insert_own"
ON public.park_submissions
FOR INSERT
TO authenticated
WITH CHECK (
EXISTS (
SELECT 1 FROM content_submissions cs
WHERE cs.id = submission_id
AND cs.user_id = auth.uid()
)
);
-- Park Submissions: Moderators can insert any submissions
CREATE POLICY "park_submissions_insert_moderators"
ON public.park_submissions
FOR INSERT
TO authenticated
WITH CHECK (
is_moderator(auth.uid())
);
-- Ride Submissions: Users can insert their own submissions
CREATE POLICY "ride_submissions_insert_own"
ON public.ride_submissions
FOR INSERT
TO authenticated
WITH CHECK (
EXISTS (
SELECT 1 FROM content_submissions cs
WHERE cs.id = submission_id
AND cs.user_id = auth.uid()
)
);
-- Ride Submissions: Moderators can insert any submissions
CREATE POLICY "ride_submissions_insert_moderators"
ON public.ride_submissions
FOR INSERT
TO authenticated
WITH CHECK (
is_moderator(auth.uid())
);
-- Company Submissions: Users can insert their own submissions
CREATE POLICY "company_submissions_insert_own"
ON public.company_submissions
FOR INSERT
TO authenticated
WITH CHECK (
EXISTS (
SELECT 1 FROM content_submissions cs
WHERE cs.id = submission_id
AND cs.user_id = auth.uid()
)
);
-- Company Submissions: Moderators can insert any submissions
CREATE POLICY "company_submissions_insert_moderators"
ON public.company_submissions
FOR INSERT
TO authenticated
WITH CHECK (
is_moderator(auth.uid())
);
-- Ride Model Submissions: Users can insert their own submissions
CREATE POLICY "ride_model_submissions_insert_own"
ON public.ride_model_submissions
FOR INSERT
TO authenticated
WITH CHECK (
EXISTS (
SELECT 1 FROM content_submissions cs
WHERE cs.id = submission_id
AND cs.user_id = auth.uid()
)
);
-- Ride Model Submissions: Moderators can insert any submissions
CREATE POLICY "ride_model_submissions_insert_moderators"
ON public.ride_model_submissions
FOR INSERT
TO authenticated
WITH CHECK (
is_moderator(auth.uid())
);
-- Photo Submissions: Users can insert their own submissions
CREATE POLICY "photo_submissions_insert_own"
ON public.photo_submissions
FOR INSERT
TO authenticated
WITH CHECK (
EXISTS (
SELECT 1 FROM content_submissions cs
WHERE cs.id = submission_id
AND cs.user_id = auth.uid()
)
);
-- Photo Submissions: Moderators can insert any submissions
CREATE POLICY "photo_submissions_insert_moderators"
ON public.photo_submissions
FOR INSERT
TO authenticated
WITH CHECK (
is_moderator(auth.uid())
);
-- ============================================================================
-- PART 2: Fix SQL Column Names (ride_type → category)
-- ============================================================================
DROP FUNCTION IF EXISTS process_approval_transaction(UUID, UUID[], UUID, UUID, TEXT, TEXT, 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,
p_trace_id TEXT DEFAULT NULL,
p_parent_span_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;
v_span_id TEXT;
BEGIN
v_start_time := clock_timestamp();
v_span_id := gen_random_uuid()::text;
-- Log span start with trace context
IF p_trace_id IS NOT NULL THEN
RAISE NOTICE 'SPAN: {"spanId": "%", "traceId": "%", "parentSpanId": "%", "name": "process_approval_transaction_rpc", "kind": "INTERNAL", "startTime": %, "attributes": {"submission.id": "%", "item_count": %}}',
v_span_id,
p_trace_id,
p_parent_span_id,
EXTRACT(EPOCH FROM v_start_time) * 1000,
p_submission_id,
array_length(p_item_ids, 1);
END IF;
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.category as ride_category,
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.category as ride_model_category,
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;
-- Log item processing span event
IF p_trace_id IS NOT NULL THEN
RAISE NOTICE 'SPAN_EVENT: {"traceId": "%", "parentSpanId": "%", "name": "process_item", "timestamp": %, "attributes": {"item.id": "%", "item.type": "%", "item.action": "%"}}',
p_trace_id,
v_span_id,
EXTRACT(EPOCH FROM clock_timestamp()) * 1000,
v_item.id,
v_item.item_type,
v_item.action_type;
END IF;
-- 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,
'category', v_item.ride_category,
'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 = 'company' 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,
'category', v_item.ride_model_category,
'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
);
ELSE
RAISE EXCEPTION 'Unknown item type: %', v_item.item_type;
END IF;
-- Resolve temporary references
v_resolved_refs := resolve_temp_references(v_item_data, p_submission_id);
-- Perform the action
IF v_item.action_type = 'create' THEN
v_entity_id := perform_create(v_item.item_type, v_resolved_refs, p_submitter_id, p_submission_id);
ELSIF v_item.action_type = 'update' THEN
IF v_item.entity_id IS NULL THEN
RAISE EXCEPTION 'Update action requires entity_id';
END IF;
PERFORM perform_update(v_item.item_type, v_item.entity_id, v_resolved_refs, p_submitter_id, p_submission_id);
v_entity_id := v_item.entity_id;
ELSE
RAISE EXCEPTION 'Unknown action type: %', v_item.action_type;
END IF;
-- Update submission_item with approved entity
UPDATE submission_items
SET approved_entity_id = v_entity_id,
approved_at = now(),
status = 'approved'
WHERE id = v_item.id;
-- Track approval results
v_approval_results := array_append(v_approval_results, jsonb_build_object(
'item_id', v_item.id,
'status', 'approved',
'entity_id', v_entity_id
));
v_some_approved := TRUE;
EXCEPTION
WHEN OTHERS THEN
-- Log the error
RAISE WARNING 'Failed to process item %: % - %', v_item.id, SQLERRM, SQLSTATE;
-- Track failure
v_approval_results := array_append(v_approval_results, jsonb_build_object(
'item_id', v_item.id,
'status', 'failed',
'error', SQLERRM
));
v_all_approved := FALSE;
-- Re-raise to rollback transaction
RAISE;
END;
END LOOP;
-- ========================================================================
-- STEP 4: Update submission status
-- ========================================================================
IF v_all_approved THEN
v_final_status := 'approved';
ELSIF v_some_approved THEN
v_final_status := 'partially_approved';
ELSE
v_final_status := 'rejected';
END IF;
UPDATE content_submissions
SET status = v_final_status,
resolved_at = CASE WHEN v_all_approved THEN now() ELSE NULL END,
reviewer_id = p_moderator_id,
reviewed_at = now()
WHERE id = p_submission_id;
-- Log span end
IF p_trace_id IS NOT NULL THEN
RAISE NOTICE 'SPAN: {"spanId": "%", "traceId": "%", "name": "process_approval_transaction_rpc", "kind": "INTERNAL", "endTime": %, "attributes": {"items_processed": %, "final_status": "%"}}',
v_span_id,
p_trace_id,
EXTRACT(EPOCH FROM clock_timestamp()) * 1000,
v_items_processed,
v_final_status;
END IF;
-- Return result
RETURN jsonb_build_object(
'success', v_all_approved,
'status', v_final_status,
'items_processed', v_items_processed,
'results', v_approval_results,
'duration_ms', EXTRACT(EPOCH FROM (clock_timestamp() - v_start_time)) * 1000
);
END;
$$;