Merge branch 'master' into add-product-upload-page

inventory-server/src/server.js

@@ -3,7 +3,6 @@ const cors = require('cors');
 const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
-const mysql = require('mysql2/promise');
 const { corsMiddleware, corsErrorHandler } = require('./middleware/cors');
 const { initPool } = require('./utils/db');
 const productsRouter = require('./routes/products');
@@ -16,14 +15,12 @@ const configRouter = require('./routes/config');
 const metricsRouter = require('./routes/metrics');
 const vendorsRouter = require('./routes/vendors');
 const categoriesRouter = require('./routes/categories');
-const testConnectionRouter = require('./routes/test-connection');
 const importRouter = require('./routes/import');
 const aiValidationRouter = require('./routes/ai-validation');
 const templatesRouter = require('./routes/templates');
 
 // Get the absolute path to the .env file
-const envPath = path.resolve(process.cwd(), '.env');
-console.log('Current working directory:', process.cwd());
+const envPath = path.join(__dirname, '..', '.env');
 console.log('Looking for .env file at:', envPath);
 console.log('.env file exists:', fs.existsSync(envPath));
 
@@ -36,6 +33,10 @@ try {
     DB_HOST: process.env.DB_HOST || 'not set',
     DB_USER: process.env.DB_USER || 'not set',
     DB_NAME: process.env.DB_NAME || 'not set',
+    DB_PASSWORD: process.env.DB_PASSWORD ? '[password set]' : 'not set',
+    DB_PORT: process.env.DB_PORT || 'not set',
+    DB_SSL: process.env.DB_SSL || 'not set',
+    OPENAI_API_KEY: process.env.OPENAI_API_KEY ? '[key set]' : 'not set'
   });
 } catch (error) {
   console.error('Error loading .env file:', error);
@@ -71,13 +72,19 @@ app.use(express.urlencoded({ extended: true, limit: '10mb' }));
 // Initialize database pool and start server
 async function startServer() {
   try {
-    // Initialize database pool
+    // Initialize database pool with PostgreSQL configuration
     const pool = await initPool({
-      waitForConnections: true,
-      connectionLimit: process.env.NODE_ENV === 'production' ? 20 : 10,
-      queueLimit: 0,
-      enableKeepAlive: true,
-      keepAliveInitialDelay: 0
+      host: process.env.DB_HOST,
+      port: parseInt(process.env.DB_PORT || '5432', 10),
+      user: process.env.DB_USER,
+      password: process.env.DB_PASSWORD,
+      database: process.env.DB_NAME,
+      max: process.env.NODE_ENV === 'production' ? 20 : 10,
+      idleTimeoutMillis: 30000,
+      connectionTimeoutMillis: 2000,
+      ssl: process.env.DB_SSL === 'true' ? {
+        rejectUnauthorized: false
+      } : false
     });
 
     // Make pool available to routes
@@ -97,14 +104,14 @@ async function startServer() {
     app.use('/api/import', importRouter);
     app.use('/api/ai-validation', aiValidationRouter);
     app.use('/api/templates', templatesRouter);
-    app.use('/api', testConnectionRouter);
 
     // Basic health check route
     app.get('/health', (req, res) => {
       res.json({ 
         status: 'ok',
         timestamp: new Date().toISOString(),
-        environment: process.env.NODE_ENV
+        environment: process.env.NODE_ENV,
+        database: 'connected'
       });
     });