From f85bf8df5982be4ad1e4a2518054d4322b78f74d Mon Sep 17 00:00:00 2001 From: fcarraUniSa Date: Fri, 19 Dec 2025 08:52:55 +0100 Subject: [PATCH] Update server.js --- server.js | 194 +++++++++++++++++++----------------------------------- 1 file changed, 69 insertions(+), 125 deletions(-) diff --git a/server.js b/server.js index 720293a..7d1afcc 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,6 @@ import express from 'express'; import path from 'path'; import { fileURLToPath } from 'url'; import mysql from 'mysql2/promise'; -import pg from 'pg'; import cors from 'cors'; import dotenv from 'dotenv'; @@ -18,22 +17,20 @@ app.use(cors()); app.use(express.json()); app.use(express.static(path.join(__dirname, 'dist'))); -// DB Configuration -// Normalize DB_TYPE: allow 'postgres', 'postgresql', 'Postgres', etc. -const rawDbType = (process.env.DB_TYPE || 'mysql').toLowerCase().trim(); -const DB_TYPE = (rawDbType === 'postgres' || rawDbType === 'postgresql') ? 'postgres' : 'mysql'; - +// DB Configuration for internal MySQL const dbConfig = { - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.DB_NAME, - port: process.env.DB_PORT || (DB_TYPE === 'postgres' ? 5432 : 3306), + host: process.env.DB_HOST || 'localhost', + user: process.env.DB_USER || 'root', + password: process.env.DB_PASSWORD || 'password', + database: process.env.DB_NAME || 'email_templates', + port: process.env.DB_PORT || 3306, + waitForConnections: true, + connectionLimit: 10, + queueLimit: 0 }; // Debug Log: Print config to console (masking password) console.log('--- Database Configuration ---'); -console.log(`Type: ${DB_TYPE} (Input: ${process.env.DB_TYPE || 'default'})`); console.log(`Host: ${dbConfig.host}`); console.log(`User: ${dbConfig.user}`); console.log(`Database: ${dbConfig.database}`); @@ -46,57 +43,34 @@ let pool; // Initialize DB Connection const initDB = async () => { try { - if (!dbConfig.host || !dbConfig.user || !dbConfig.database) { - throw new Error("Missing required database environment variables (DB_HOST, DB_USER, or DB_NAME)."); - } - - if (DB_TYPE === 'postgres') { - const { Pool } = pg; - pool = new Pool(dbConfig); - - // Create table for Postgres - // Using JSONB for variables - await pool.query(` - CREATE TABLE IF NOT EXISTS email_templates ( - id VARCHAR(255) PRIMARY KEY, - template_key VARCHAR(255) UNIQUE NOT NULL, - name VARCHAR(255) NOT NULL, - description TEXT, - subject VARCHAR(255), - header_html TEXT, - body_html TEXT, - footer_html TEXT, - full_html TEXT, - required_variables JSONB, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ); - `); - } else { - // MySQL - pool = mysql.createPool(dbConfig); - - // Create table for MySQL - await pool.query(` - CREATE TABLE IF NOT EXISTS email_templates ( - id VARCHAR(255) PRIMARY KEY, - template_key VARCHAR(255) UNIQUE NOT NULL, - name VARCHAR(255) NOT NULL, - description TEXT, - subject VARCHAR(255), - header_html TEXT, - body_html TEXT, - footer_html TEXT, - full_html TEXT, - required_variables JSON, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP - ); - `); - } - console.log(`Connected to ${DB_TYPE} database successfully.`); + pool = mysql.createPool(dbConfig); + + // Test connection + const connection = await pool.getConnection(); + console.log('Connected to MySQL database successfully.'); + connection.release(); + + // Create table for MySQL + await pool.query(` + CREATE TABLE IF NOT EXISTS email_templates ( + id VARCHAR(255) PRIMARY KEY, + template_key VARCHAR(255) UNIQUE NOT NULL, + name VARCHAR(255) NOT NULL, + description TEXT, + subject VARCHAR(255), + header_html TEXT, + body_html TEXT, + footer_html TEXT, + full_html TEXT, + required_variables JSON, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP + ); + `); + + console.log('Email templates table ready.'); } catch (err) { - console.error('Database connection failed:', err); + console.error('Database initialization failed:', err); process.exit(1); } }; @@ -104,18 +78,10 @@ const initDB = async () => { initDB(); // API Routes - // GET All Templates app.get('/api/templates', async (req, res) => { try { - let rows; - if (DB_TYPE === 'postgres') { - const result = await pool.query('SELECT * FROM email_templates ORDER BY updated_at DESC'); - rows = result.rows; - } else { - const [result] = await pool.query('SELECT * FROM email_templates ORDER BY updated_at DESC'); - rows = result; - } + const [rows] = await pool.query('SELECT * FROM email_templates ORDER BY updated_at DESC'); // Map DB fields back to frontend types const templates = rows.map(row => ({ @@ -129,7 +95,7 @@ app.get('/api/templates', async (req, res) => { variables: typeof row.required_variables === 'string' ? JSON.parse(row.required_variables) : row.required_variables, updatedAt: row.updated_at })); - + res.json(templates); } catch (err) { console.error(err); @@ -140,64 +106,46 @@ app.get('/api/templates', async (req, res) => { // SAVE (Upsert) Template app.post('/api/templates', async (req, res) => { const t = req.body; - // Ensure default values to prevent undefined errors in Postgres + + // Ensure default values to prevent undefined errors const header = t.header || ''; const body = t.body || ''; const footer = t.footer || ''; const fullHtml = `${header}${body}${footer}`; const templateKey = (t.name || '').trim().toLowerCase().replace(/\s+/g, '_').replace(/[^a-z0-9_]/g, ''); const variablesJson = JSON.stringify(t.variables || []); - + const params = [ - t.id, - templateKey, - t.name, - t.description || '', - t.subject || '', - header, - body, - footer, - fullHtml, + t.id, + templateKey, + t.name, + t.description || '', + t.subject || '', + header, + body, + footer, + fullHtml, variablesJson ]; - + try { - if (DB_TYPE === 'postgres') { - // Postgres requires explicit casting for JSONB parameters when passed as strings ($10::jsonb) - const query = ` - INSERT INTO email_templates (id, template_key, name, description, subject, header_html, body_html, footer_html, full_html, required_variables, updated_at) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10::jsonb, NOW()) - ON CONFLICT (id) DO UPDATE SET - template_key = EXCLUDED.template_key, - name = EXCLUDED.name, - description = EXCLUDED.description, - subject = EXCLUDED.subject, - header_html = EXCLUDED.header_html, - body_html = EXCLUDED.body_html, - footer_html = EXCLUDED.footer_html, - full_html = EXCLUDED.full_html, - required_variables = EXCLUDED.required_variables, - updated_at = NOW(); - `; - await pool.query(query, params); - } else { - const query = ` - INSERT INTO email_templates (id, template_key, name, description, subject, header_html, body_html, footer_html, full_html, required_variables, updated_at) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW()) - ON DUPLICATE KEY UPDATE - template_key = VALUES(template_key), - name = VALUES(name), - description = VALUES(description), - subject = VALUES(subject), - header_html = VALUES(header_html), - body_html = VALUES(body_html), - footer_html = VALUES(footer_html), - full_html = VALUES(full_html), - required_variables = VALUES(required_variables), - updated_at = NOW(); - `; - await pool.query(query, params); - } + const query = ` + INSERT INTO email_templates (id, template_key, name, description, subject, header_html, body_html, footer_html, full_html, required_variables, updated_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW()) + ON DUPLICATE KEY UPDATE + template_key = VALUES(template_key), + name = VALUES(name), + description = VALUES(description), + subject = VALUES(subject), + header_html = VALUES(header_html), + body_html = VALUES(body_html), + footer_html = VALUES(footer_html), + full_html = VALUES(full_html), + required_variables = VALUES(required_variables), + updated_at = NOW(); + `; + + await pool.query(query, params); res.json({ success: true }); } catch (err) { console.error("Save Template Error:", err); @@ -209,11 +157,7 @@ app.post('/api/templates', async (req, res) => { // DELETE Template app.delete('/api/templates/:id', async (req, res) => { try { - if (DB_TYPE === 'postgres') { - await pool.query('DELETE FROM email_templates WHERE id = $1', [req.params.id]); - } else { - await pool.query('DELETE FROM email_templates WHERE id = ?', [req.params.id]); - } + await pool.query('DELETE FROM email_templates WHERE id = ?', [req.params.id]); res.json({ success: true }); } catch (err) { console.error(err);