fixed sql

Author: benmross

client/src/cyber-forensics-platform/scripts/build-hook.js

@@ -11,7 +11,14 @@ async function buildHook() {
   // Only initialize database if DATABASE_URL is present (production)
   if (process.env.DATABASE_URL) {
     console.log('🗄️  Initializing production database...');
-    await initializeDatabase();
+    try {
+      await initializeDatabase();
+      console.log('✅ Database initialization successful');
+    } catch (error) {
+      console.error('❌ Database initialization failed:', error);
+      // Don't exit - let the build continue, database might already be initialized
+      console.log('⚠️  Continuing with build despite database error');
+    }
   } else {
     console.log('⚠️  DATABASE_URL not found, skipping database initialization');
   }

client/src/cyber-forensics-platform/scripts/init-db-postgres.js

@@ -3,6 +3,11 @@ const fs = require('fs').promises;
 const path = require('path');
 
 async function initializeDatabase() {
+  if (!process.env.DATABASE_URL) {
+    console.error('❌ DATABASE_URL environment variable is not set');
+    throw new Error('DATABASE_URL is required for PostgreSQL initialization');
+  }
+
   const pool = new Pool({
     connectionString: process.env.DATABASE_URL,
     ssl: process.env.NODE_ENV === 'production' ? { rejectUnauthorized: false } : false
@@ -11,13 +16,18 @@ async function initializeDatabase() {
   try {
     console.log('🚀 Initializing PostgreSQL database...');
 
+    // Test connection first
+    await pool.query('SELECT NOW()');
+    console.log('✅ Database connection successful');
+    
     // Read and execute the schema file
     const schemaPath = path.join(__dirname, '../database_schema_postgres.sql');
     const schema = await fs.readFile(schemaPath, 'utf8');
 
+    console.log('📄 Executing database schema...');
     await pool.query(schema);
 
-    console.log('✅ PostgreSQL database initialized successfully');
+    console.log('✅ PostgreSQL database schema applied successfully');
 
     // Create a default competition if none exists
     const existingCompetitions = await pool.query('SELECT COUNT(*) as count FROM competitions');
@@ -31,11 +41,13 @@ async function initializeDatabase() {
         JSON.stringify({ theme: 'default', difficulty: 'mixed' })
       ]);
       console.log('✅ Default competition created');
+    } else {
+      console.log('ℹ️  Database already contains competitions, skipping default creation');
     }
 
   } catch (error) {
     console.error('❌ Error initializing database:', error);
-    process.exit(1);
+    throw error; // Re-throw to let caller handle
   } finally {
     await pool.end();
   }

client/src/cyber-forensics-platform/src/app/api/challenges/generate/route.ts

@@ -43,7 +43,14 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: 'Description and competition ID are required' }, { status: 400 });
     }
 
+    console.log('🔗 Environment:', {
+      NODE_ENV: process.env.NODE_ENV,
+      DATABASE_URL: process.env.DATABASE_URL ? 'Present' : 'Missing',
+      OPENAI_API_KEY: process.env.OPENAI_API_KEY ? 'Present' : 'Missing'
+    });
+    
     const db = getDatabase();
+    console.log('📊 Database instance created:', db.constructor.name);
     await db.connect();
 
     // Build context for intelligent linking
@@ -438,7 +445,7 @@ Create complete, professional websites with realistic business content.`
     if (linkToPrevious && previousChallengeData) {
       // Find the previous challenge's node
       const previousNodes = await db.query(
-        'SELECT * FROM nodes WHERE challenge_id = (SELECT id FROM challenges WHERE id = ?)',
+        'SELECT * FROM nodes WHERE challenge_id = $1',
         [previousChallengeData.id]
       );
 
@@ -474,11 +481,21 @@ Create complete, professional websites with realistic business content.`
   } catch (error) {
     console.group(`❌ [${requestId}] Challenge Generation Error`);
     console.error('Error:', error);
+    console.error('Error stack:', error instanceof Error ? error.stack : 'No stack trace');
     console.groupEnd();
 
+    // Close database connection if it was opened
+    try {
+      const db = getDatabase();
+      await db.close();
+    } catch (closeError) {
+      console.error('Error closing database:', closeError);
+    }
+    
     return NextResponse.json({ 
       error: 'Internal server error',
       details: error instanceof Error ? error.message : String(error),
+      stack: error instanceof Error ? error.stack : undefined,
       requestId 
     }, { status: 500 });
   }

client/src/cyber-forensics-platform/src/app/api/competitions/[id]/edges/route.ts

@@ -57,7 +57,7 @@ export async function POST(
     });
 
     // Return the created edge
-    const edge = await db.query('SELECT * FROM edges WHERE id = ?', [edgeId]);
+    const edge = await db.query('SELECT * FROM edges WHERE id = $1', [edgeId]);
 
     await db.close();
     return NextResponse.json(edge[0], { status: 201 });

client/src/cyber-forensics-platform/src/lib/database-postgres.js

@@ -19,11 +19,12 @@ class PostgresDatabaseManager {
     }
   }
 
-  // Close database connection
+  // Close database connection - for PostgreSQL with connection pooling, we don't actually close
   async close() {
     try {
-      await this.pool.end();
-      console.log('📊 Database connection closed');
+      // Don't close the pool as it's shared across requests
+      // await this.pool.end();
+      console.log('📊 Database connection closed (pool maintained)');
     } catch (err) {
       console.error('Database close error:', err);
     }
@@ -51,7 +52,7 @@ class PostgresDatabaseManager {
     try {
       const result = await this.pool.query(sql, params);
       return { 
-        id: result.rows[0]?.id || null,
+        id: result.rows[0]?.id || result.insertId || null,
         changes: result.rowCount 
       };
     } catch (err) {

client/src/cyber-forensics-platform/src/lib/database.js

@@ -2,8 +2,14 @@ const sqlite3 = require('sqlite3').verbose();
 const path = require('path');
 
 // Import PostgreSQL manager for production
-const PostgresDatabaseManager = process.env.NODE_ENV === 'production' ? 
-  require('./database-postgres') : null;
+let PostgresDatabaseManager = null;
+if (process.env.NODE_ENV === 'production' && process.env.DATABASE_URL) {
+  try {
+    PostgresDatabaseManager = require('./database-postgres');
+  } catch (error) {
+    console.error('Failed to load PostgreSQL manager:', error);
+  }
+}
 
 class DatabaseManager {
   constructor() {