Merge pull request #132 from R0m1k3/claude/fix-notes-sync-issue-01AMeEdrKQErsM7bvhKkqEEF

feat: restore PostgreSQL as primary database configuration
This commit is contained in:
LogiFlow authored and GitHub committed 2025-11-28 06:28:29 +01:00
commit 4a66286fc6
3 files changed
+766 -766

No files matched your search

-365
View File
@@ -1,365 +0,0 @@
// Configuration et initialisation de la base de données PostgreSQL
const { Pool, types } = require('pg');
const bcrypt = require('bcrypt');
const logger = require('./logger');
const timezoneLogger = require('../services/timezone-logger');
// IMPORTANT: Parser personnalisé pour TIMESTAMPTZ
// DOIT être appelé AVANT le Pool pour être pris en compte !
// Types TIMESTAMP(TZ) PostgreSQL :
// - 1082 = DATE
// - 1114 = TIMESTAMP WITHOUT TIME ZONE
// - 1184 = TIMESTAMP WITH TIME ZONE (TIMESTAMPTZ)
// Parser pour TIMESTAMPTZ (1184)
types.setTypeParser(1184, function (stringValue) {
if (!stringValue) return null;
const originalValue = stringValue;
let result;
// Si déjà au format ISO avec Z ou timezone (+HH:MM ou +HH)
if (stringValue.includes('Z') || stringValue.match(/[+-]\d{2}(:\d{2})?$/)) {
result = new Date(stringValue).toISOString();
timezoneLogger.log('PARSER', `[1184 TIMESTAMPTZ] Input avec TZ: "${originalValue}" → Output: "${result}"`);
} else {
// Si format "YYYY-MM-DD HH:MM:SS" sans timezone
// Avec timezone=UTC, on sait que c'est en UTC
const isoString = stringValue.replace(' ', 'T') + 'Z';
result = new Date(isoString).toISOString();
timezoneLogger.log('PARSER', `[1184 TIMESTAMPTZ] Input sans TZ: "${originalValue}" → ISO+Z: "${isoString}" → Output: "${result}"`);
}
return result;
});
// Parser pour TIMESTAMP WITHOUT TIME ZONE (1114)
// IMPORTANT: Les valeurs TIMESTAMP sont stockées en heure locale (Europe/Paris)
// mais PostgreSQL les retourne sans fuseau horaire.
// Exemple: Google envoie "2025-11-17T10:20:00+01:00" → PG stocke "2025-11-17 10:20:00"
// On doit interpréter cette heure comme UTC (car PG a converti lors de l'insertion)
types.setTypeParser(1114, function (stringValue) {
if (!stringValue) return null;
// PostgreSQL retourne "YYYY-MM-DD HH:MM:SS" sans fuseau horaire
// Cette valeur doit être traitée comme UTC car PostgreSQL stocke en UTC en interne
const isoString = stringValue.replace(' ', 'T') + 'Z';
const result = new Date(isoString).toISOString();
timezoneLogger.log('PARSER', `[1114 TIMESTAMP] Input: "${stringValue}" → Output: "${result}"`);
return result;
});
// Configuration PostgreSQL depuis DATABASE_URL ou variables d'environnement
const DATABASE_URL = process.env.DATABASE_URL ||
`postgresql://${process.env.PGUSER || 'noteflow'}:${process.env.PGPASSWORD || 'noteflow_secure_password_change_me'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5499'}/${process.env.PGDATABASE || 'noteflow'}`;
// Créer le pool de connexions PostgreSQL
const pool = new Pool({
connectionString: DATABASE_URL,
max: 20, // Maximum de connexions dans le pool
idleTimeoutMillis: 30000,
connectionTimeoutMillis: 2000,
// IMPORTANT: Forcer le timezone à UTC pour toutes les connexions
// Cela garantit que PostgreSQL renvoie toujours les dates en UTC
options: '-c timezone=UTC'
});
// Gestion des erreurs du pool
pool.on('error', (err) => {
logger.error('Erreur PostgreSQL pool:', err);
});
// Test de connexion
pool.connect((err, client, release) => {
if (err) {
logger.error('Erreur lors de la connexion à PostgreSQL:', err);
process.exit(1);
}
release();
logger.info(`✓ PostgreSQL connecté: ${DATABASE_URL.replace(/:[^:]*@/, ':***@')}`);
});
/**
* Initialiser la base de données avec les tables nécessaires
*/
async function initDatabase() {
const client = await pool.connect();
try {
await client.query('BEGIN');
// Table users
await client.query(`
CREATE TABLE IF NOT EXISTS users (
id SERIAL PRIMARY KEY,
username VARCHAR(255) UNIQUE NOT NULL,
password_hash VARCHAR(255) NOT NULL,
is_admin BOOLEAN DEFAULT FALSE,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table notes
await client.query(`
CREATE TABLE IF NOT EXISTS notes (
id SERIAL PRIMARY KEY,
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
title TEXT NOT NULL,
content TEXT,
image_filename TEXT,
archived BOOLEAN DEFAULT FALSE,
archived_at TIMESTAMP,
priority INTEGER DEFAULT 0,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table note_todos
await client.query(`
CREATE TABLE IF NOT EXISTS note_todos (
id SERIAL PRIMARY KEY,
note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
text TEXT NOT NULL,
completed BOOLEAN DEFAULT FALSE,
priority BOOLEAN DEFAULT FALSE,
position INTEGER DEFAULT 0,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
completed_at TIMESTAMP
)
`);
// Table global_todos
await client.query(`
CREATE TABLE IF NOT EXISTS global_todos (
id SERIAL PRIMARY KEY,
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
text TEXT NOT NULL,
completed BOOLEAN DEFAULT FALSE,
priority BOOLEAN DEFAULT FALSE,
in_progress INTEGER DEFAULT 0,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
completed_at TIMESTAMP
)
`);
// Table note_images
await client.query(`
CREATE TABLE IF NOT EXISTS note_images (
id SERIAL PRIMARY KEY,
note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
filename TEXT NOT NULL,
original_name TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table note_files
await client.query(`
CREATE TABLE IF NOT EXISTS note_files (
id SERIAL PRIMARY KEY,
note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
filename TEXT NOT NULL,
original_name TEXT NOT NULL,
file_size INTEGER,
mime_type TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table settings
await client.query(`
CREATE TABLE IF NOT EXISTS settings (
id SERIAL PRIMARY KEY,
key VARCHAR(255) UNIQUE NOT NULL,
value TEXT,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table rss_feeds
await client.query(`
CREATE TABLE IF NOT EXISTS rss_feeds (
id SERIAL PRIMARY KEY,
url TEXT UNIQUE NOT NULL,
title TEXT,
description TEXT,
enabled BOOLEAN DEFAULT TRUE,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
last_fetched_at TIMESTAMP
)
`);
// Table rss_articles
await client.query(`
CREATE TABLE IF NOT EXISTS rss_articles (
id SERIAL PRIMARY KEY,
feed_id INTEGER NOT NULL REFERENCES rss_feeds(id) ON DELETE CASCADE,
title TEXT NOT NULL,
link TEXT UNIQUE NOT NULL,
description TEXT,
pub_date TIMESTAMP,
content TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table rss_summaries
await client.query(`
CREATE TABLE IF NOT EXISTS rss_summaries (
id SERIAL PRIMARY KEY,
summary TEXT NOT NULL,
model TEXT,
articles_count INTEGER DEFAULT 0,
feed_title TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table calendar_events
await client.query(`
CREATE TABLE IF NOT EXISTS calendar_events (
id SERIAL PRIMARY KEY,
google_event_id VARCHAR(255) UNIQUE NOT NULL,
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
title TEXT NOT NULL,
description TEXT,
start_time TIMESTAMPTZ NOT NULL,
end_time TIMESTAMPTZ NOT NULL,
location TEXT,
color_id TEXT,
html_link TEXT,
all_day BOOLEAN DEFAULT FALSE,
synced_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Table note_tags
await client.query(`
CREATE TABLE IF NOT EXISTS note_tags (
id SERIAL PRIMARY KEY,
note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
tag VARCHAR(255) NOT NULL,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UNIQUE(note_id, tag)
)
`);
// Table google_oauth_tokens
await client.query(`
CREATE TABLE IF NOT EXISTS google_oauth_tokens (
id SERIAL PRIMARY KEY,
user_id INTEGER NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,
access_token TEXT NOT NULL,
refresh_token TEXT,
token_type VARCHAR(50) DEFAULT 'Bearer',
expiry_date BIGINT,
scope TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Créer les index pour la performance
await client.query('CREATE INDEX IF NOT EXISTS idx_notes_user ON notes(user_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_notes_priority ON notes(priority DESC, updated_at DESC)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_todos ON note_todos(note_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_global_todos_user ON global_todos(user_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_images ON note_images(note_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_files ON note_files(note_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_tags ON note_tags(note_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_tags_tag ON note_tags(tag)');
await client.query('CREATE INDEX IF NOT EXISTS idx_settings_key ON settings(key)');
await client.query('CREATE INDEX IF NOT EXISTS idx_rss_articles_feed ON rss_articles(feed_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_rss_articles_date ON rss_articles(pub_date DESC)');
await client.query('CREATE INDEX IF NOT EXISTS idx_calendar_events_user ON calendar_events(user_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_calendar_events_start ON calendar_events(start_time)');
logger.info('✓ Tables PostgreSQL créées avec succès');
// Créer l'utilisateur admin par défaut si la table est vide
const usersCount = await client.query('SELECT COUNT(*) as count FROM users');
if (usersCount.rows[0].count === '0') {
const defaultPassword = 'admin';
const passwordHash = await bcrypt.hash(defaultPassword, 12);
await client.query(
'INSERT INTO users (username, password_hash, is_admin) VALUES ($1, $2, $3)',
['admin', passwordHash, true]
);
logger.info('✓ Utilisateur admin créé (username: admin, password: admin)');
logger.warn('⚠️ IMPORTANT: Changez le mot de passe admin en production!');
} else {
logger.info('✓ Base de données déjà initialisée');
}
await client.query('COMMIT');
} catch (error) {
await client.query('ROLLBACK');
logger.error('Erreur lors de l\'initialisation de la base de données:', error);
throw error;
} finally {
client.release();
}
}
/**
* Exécuter une requête avec promesse
*/
async function runQuery(sql, params = []) {
const client = await pool.connect();
try {
const result = await client.query(sql, params);
return {
id: result.rows[0]?.id || result.rowCount,
changes: result.rowCount
};
} catch (error) {
logger.error('Erreur runQuery:', error);
throw error;
} finally {
client.release();
}
}
/**
* Récupérer une seule ligne
*/
async function getOne(sql, params = []) {
const client = await pool.connect();
try {
const result = await client.query(sql, params);
return result.rows[0] || null;
} catch (error) {
logger.error('Erreur getOne:', error);
throw error;
} finally {
client.release();
}
}
/**
* Récupérer toutes les lignes
*/
async function getAll(sql, params = []) {
const client = await pool.connect();
try {
const result = await client.query(sql, params);
return result.rows;
} catch (error) {
logger.error('Erreur getAll:', error);
throw error;
} finally {
client.release();
}
}
module.exports = {
pool,
initDatabase,
runQuery,
getOne,
getAll
};
+401
View File
@@ -0,0 +1,401 @@
// Configuration et initialisation de la base de données SQLite
const sqlite3 = require('sqlite3').verbose();
const path = require('path');
const bcrypt = require('bcrypt');
const logger = require('./logger');
const DB_PATH = process.env.DB_PATH || path.join(__dirname, '../data/notes.db');
// Créer une connexion à la base de données
const db = new sqlite3.Database(DB_PATH, (err) => {
if (err) {
logger.error('Erreur lors de la connexion à la base de données:', err);
process.exit(1);
}
logger.info(`Base de données connectée: ${DB_PATH}`);
});
// Activer les clés étrangères
db.run('PRAGMA foreign_keys = ON');
/**
* Initialiser la base de données avec les tables nécessaires
*/
function initDatabase() {
return new Promise((resolve, reject) => {
db.serialize(async () => {
try {
// Table users
db.run(`
CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
username TEXT UNIQUE NOT NULL,
password_hash TEXT NOT NULL,
is_admin BOOLEAN DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
)
`);
// Table notes
db.run(`
CREATE TABLE IF NOT EXISTS notes (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
title TEXT NOT NULL,
content TEXT,
image_filename TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
)
`);
// Table note_todos (todos dans les notes)
db.run(`
CREATE TABLE IF NOT EXISTS note_todos (
id INTEGER PRIMARY KEY AUTOINCREMENT,
note_id INTEGER NOT NULL,
text TEXT NOT NULL,
completed BOOLEAN DEFAULT 0,
position INTEGER DEFAULT 0,
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE
)
`);
// Table global_todos (sidebar permanente)
db.run(`
CREATE TABLE IF NOT EXISTS global_todos (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
text TEXT NOT NULL,
completed BOOLEAN DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
)
`);
// Table note_images (images attachées aux notes)
db.run(`
CREATE TABLE IF NOT EXISTS note_images (
id INTEGER PRIMARY KEY AUTOINCREMENT,
note_id INTEGER NOT NULL,
filename TEXT NOT NULL,
original_name TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE
)
`);
// Table note_files (fichiers attachés aux notes)
db.run(`
CREATE TABLE IF NOT EXISTS note_files (
id INTEGER PRIMARY KEY AUTOINCREMENT,
note_id INTEGER NOT NULL,
filename TEXT NOT NULL,
original_name TEXT NOT NULL,
file_size INTEGER,
mime_type TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE
)
`);
// Table settings (paramètres globaux)
db.run(`
CREATE TABLE IF NOT EXISTS settings (
id INTEGER PRIMARY KEY AUTOINCREMENT,
key TEXT UNIQUE NOT NULL,
value TEXT,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
)
`);
// Table rss_feeds (flux RSS)
db.run(`
CREATE TABLE IF NOT EXISTS rss_feeds (
id INTEGER PRIMARY KEY AUTOINCREMENT,
url TEXT UNIQUE NOT NULL,
title TEXT,
description TEXT,
enabled BOOLEAN DEFAULT 1,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
last_fetched_at DATETIME
)
`);
// Table rss_articles (articles des flux RSS)
db.run(`
CREATE TABLE IF NOT EXISTS rss_articles (
id INTEGER PRIMARY KEY AUTOINCREMENT,
feed_id INTEGER NOT NULL,
title TEXT NOT NULL,
link TEXT UNIQUE NOT NULL,
description TEXT,
pub_date DATETIME,
content TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (feed_id) REFERENCES rss_feeds(id) ON DELETE CASCADE
)
`);
// Table rss_summaries (résumés générés)
db.run(`
CREATE TABLE IF NOT EXISTS rss_summaries (
id INTEGER PRIMARY KEY AUTOINCREMENT,
summary TEXT NOT NULL,
model TEXT,
articles_count INTEGER DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
)
`);
// Table calendar_events (événements Google Calendar)
db.run(`
CREATE TABLE IF NOT EXISTS calendar_events (
id INTEGER PRIMARY KEY AUTOINCREMENT,
google_event_id TEXT UNIQUE NOT NULL,
user_id INTEGER NOT NULL,
title TEXT NOT NULL,
description TEXT,
start_time DATETIME NOT NULL,
end_time DATETIME NOT NULL,
location TEXT,
color_id TEXT,
html_link TEXT,
synced_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
)
`);
// Table note_tags (tags pour les notes)
db.run(`
CREATE TABLE IF NOT EXISTS note_tags (
id INTEGER PRIMARY KEY AUTOINCREMENT,
note_id INTEGER NOT NULL,
tag TEXT NOT NULL,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE,
UNIQUE(note_id, tag)
)
`);
// Table google_oauth_tokens (tokens OAuth pour Google Calendar)
db.run(`
CREATE TABLE IF NOT EXISTS google_oauth_tokens (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
access_token TEXT NOT NULL,
refresh_token TEXT,
token_type TEXT DEFAULT 'Bearer',
expiry_date INTEGER,
scope TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(user_id)
)
`);
// Créer les index pour la performance
db.run('CREATE INDEX IF NOT EXISTS idx_notes_user ON notes(user_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_note_todos ON note_todos(note_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_global_todos_user ON global_todos(user_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_note_images ON note_images(note_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_note_files ON note_files(note_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_note_tags ON note_tags(note_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_note_tags_tag ON note_tags(tag)');
db.run('CREATE INDEX IF NOT EXISTS idx_settings_key ON settings(key)');
db.run('CREATE INDEX IF NOT EXISTS idx_rss_articles_feed ON rss_articles(feed_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_rss_articles_date ON rss_articles(pub_date)');
db.run('CREATE INDEX IF NOT EXISTS idx_calendar_events_user ON calendar_events(user_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_calendar_events_start ON calendar_events(start_time)');
logger.info('✓ Tables de base de données créées avec succès');
// Migrations automatiques
// Migration pour rss_summaries - ajouter feed_title
db.all("PRAGMA table_info(rss_summaries)", (err, columns) => {
if (err) {
logger.error('Erreur lors de la vérification de la structure de la table rss_summaries:', err);
return;
}
const hasFeedTitle = columns.some(col => col.name === 'feed_title');
if (!hasFeedTitle) {
logger.info('Migration: Ajout de la colonne feed_title à rss_summaries...');
db.run('ALTER TABLE rss_summaries ADD COLUMN feed_title TEXT', (err) => {
if (err) {
logger.error('Erreur lors de l\'ajout de la colonne feed_title:', err);
} else {
logger.info('✓ Colonne feed_title ajoutée avec succès');
}
});
}
});
db.all("PRAGMA table_info(notes)", (err, columns) => {
if (err) {
logger.error('Erreur lors de la vérification de la structure de la table notes:', err);
return;
}
const hasImageFilename = columns.some(col => col.name === 'image_filename');
const hasArchived = columns.some(col => col.name === 'archived');
const hasPriority = columns.some(col => col.name === 'priority');
if (!hasImageFilename) {
logger.info('Migration: Ajout de la colonne image_filename...');
db.run('ALTER TABLE notes ADD COLUMN image_filename TEXT', (err) => {
if (err) {
logger.error('Erreur lors de l\'ajout de la colonne image_filename:', err);
} else {
logger.info('✓ Colonne image_filename ajoutée avec succès');
}
});
}
if (!hasArchived) {
logger.info('Migration: Ajout de la colonne archived...');
db.run('ALTER TABLE notes ADD COLUMN archived BOOLEAN DEFAULT 0', (err) => {
if (err) {
logger.error('Erreur lors de l\'ajout de la colonne archived:', err);
} else {
logger.info('✓ Colonne archived ajoutée avec succès');
}
});
}
if (!hasPriority) {
logger.info('Migration: Ajout de la colonne priority...');
db.run('ALTER TABLE notes ADD COLUMN priority INTEGER DEFAULT 0', (err) => {
if (err) {
logger.error('Erreur lors de l\'ajout de la colonne priority:', err);
} else {
logger.info('✓ Colonne priority ajoutée avec succès');
// Créer l'index pour la performance
db.run('CREATE INDEX IF NOT EXISTS idx_notes_priority ON notes(priority DESC, updated_at DESC)', (indexErr) => {
if (indexErr) {
logger.error('Erreur lors de la création de l\'index priority:', indexErr);
} else {
logger.info('✓ Index priority créé avec succès');
}
});
}
});
}
});
// Migration pour calendar_events - ajouter all_day
db.all("PRAGMA table_info(calendar_events)", (err, columns) => {
if (err) {
logger.error('Erreur lors de la vérification de la structure de la table calendar_events:', err);
return;
}
const hasAllDay = columns.some(col => col.name === 'all_day');
if (!hasAllDay) {
logger.info('Migration: Ajout de la colonne all_day à calendar_events...');
db.run('ALTER TABLE calendar_events ADD COLUMN all_day BOOLEAN DEFAULT 0', (err) => {
if (err) {
logger.error('Erreur lors de l\'ajout de la colonne all_day:', err);
} else {
logger.info('✓ Colonne all_day ajoutée avec succès');
}
});
}
});
// Créer l'utilisateur admin par défaut si la table est vide
db.get('SELECT COUNT(*) as count FROM users', async (err, row) => {
if (err) {
logger.error('Erreur lors de la vérification des utilisateurs:', err);
reject(err);
return;
}
if (row.count === 0) {
// Créer l'utilisateur admin par défaut
const defaultPassword = 'admin';
const passwordHash = await bcrypt.hash(defaultPassword, 12);
db.run(
'INSERT INTO users (username, password_hash, is_admin) VALUES (?, ?, ?)',
['admin', passwordHash, 1],
(err) => {
if (err) {
logger.error('Erreur lors de la création de l\'utilisateur admin:', err);
reject(err);
} else {
logger.info('✓ Utilisateur admin créé (username: admin, password: admin)');
logger.warn('⚠️ IMPORTANT: Changez le mot de passe admin en production!');
resolve();
}
}
);
} else {
logger.info('✓ Base de données déjà initialisée');
resolve();
}
});
} catch (error) {
logger.error('Erreur lors de l\'initialisation de la base de données:', error);
reject(error);
}
});
});
}
/**
* Exécuter une requête avec promesse
*/
function runQuery(sql, params = []) {
return new Promise((resolve, reject) => {
db.run(sql, params, function(err) {
if (err) {
reject(err);
} else {
resolve({ id: this.lastID, changes: this.changes });
}
});
});
}
/**
* Récupérer une seule ligne
*/
function getOne(sql, params = []) {
return new Promise((resolve, reject) => {
db.get(sql, params, (err, row) => {
if (err) {
reject(err);
} else {
resolve(row);
}
});
});
}
/**
* Récupérer toutes les lignes
*/
function getAll(sql, params = []) {
return new Promise((resolve, reject) => {
db.all(sql, params, (err, rows) => {
if (err) {
reject(err);
} else {
resolve(rows);
}
});
});
}
module.exports = {
db,
initDatabase,
runQuery,
getOne,
getAll
};
+365 -401
View File
@@ -1,401 +1,365 @@
// Configuration et initialisation de la base de données SQLite // Configuration et initialisation de la base de données PostgreSQL
const sqlite3 = require('sqlite3').verbose(); const { Pool, types } = require('pg');
const path = require('path'); const bcrypt = require('bcrypt');
const bcrypt = require('bcrypt'); const logger = require('./logger');
const logger = require('./logger'); const timezoneLogger = require('../services/timezone-logger');
const DB_PATH = process.env.DB_PATH || path.join(__dirname, '../data/notes.db'); // IMPORTANT: Parser personnalisé pour TIMESTAMPTZ
// DOIT être appelé AVANT le Pool pour être pris en compte !
// Créer une connexion à la base de données // Types TIMESTAMP(TZ) PostgreSQL :
const db = new sqlite3.Database(DB_PATH, (err) => { // - 1082 = DATE
if (err) { // - 1114 = TIMESTAMP WITHOUT TIME ZONE
logger.error('Erreur lors de la connexion à la base de données:', err); // - 1184 = TIMESTAMP WITH TIME ZONE (TIMESTAMPTZ)
process.exit(1);
} // Parser pour TIMESTAMPTZ (1184)
logger.info(`Base de données connectée: ${DB_PATH}`); types.setTypeParser(1184, function (stringValue) {
}); if (!stringValue) return null;
// Activer les clés étrangères const originalValue = stringValue;
db.run('PRAGMA foreign_keys = ON'); let result;
/** // Si déjà au format ISO avec Z ou timezone (+HH:MM ou +HH)
* Initialiser la base de données avec les tables nécessaires if (stringValue.includes('Z') || stringValue.match(/[+-]\d{2}(:\d{2})?$/)) {
*/ result = new Date(stringValue).toISOString();
function initDatabase() { timezoneLogger.log('PARSER', `[1184 TIMESTAMPTZ] Input avec TZ: "${originalValue}" → Output: "${result}"`);
return new Promise((resolve, reject) => { } else {
db.serialize(async () => { // Si format "YYYY-MM-DD HH:MM:SS" sans timezone
try { // Avec timezone=UTC, on sait que c'est en UTC
// Table users const isoString = stringValue.replace(' ', 'T') + 'Z';
db.run(` result = new Date(isoString).toISOString();
CREATE TABLE IF NOT EXISTS users ( timezoneLogger.log('PARSER', `[1184 TIMESTAMPTZ] Input sans TZ: "${originalValue}" → ISO+Z: "${isoString}" → Output: "${result}"`);
id INTEGER PRIMARY KEY AUTOINCREMENT, }
username TEXT UNIQUE NOT NULL,
password_hash TEXT NOT NULL, return result;
is_admin BOOLEAN DEFAULT 0, });
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
) // Parser pour TIMESTAMP WITHOUT TIME ZONE (1114)
`); // IMPORTANT: Les valeurs TIMESTAMP sont stockées en heure locale (Europe/Paris)
// mais PostgreSQL les retourne sans fuseau horaire.
// Table notes // Exemple: Google envoie "2025-11-17T10:20:00+01:00" → PG stocke "2025-11-17 10:20:00"
db.run(` // On doit interpréter cette heure comme UTC (car PG a converti lors de l'insertion)
CREATE TABLE IF NOT EXISTS notes ( types.setTypeParser(1114, function (stringValue) {
id INTEGER PRIMARY KEY AUTOINCREMENT, if (!stringValue) return null;
user_id INTEGER NOT NULL,
title TEXT NOT NULL, // PostgreSQL retourne "YYYY-MM-DD HH:MM:SS" sans fuseau horaire
content TEXT, // Cette valeur doit être traitée comme UTC car PostgreSQL stocke en UTC en interne
image_filename TEXT, const isoString = stringValue.replace(' ', 'T') + 'Z';
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, const result = new Date(isoString).toISOString();
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP, timezoneLogger.log('PARSER', `[1114 TIMESTAMP] Input: "${stringValue}" → Output: "${result}"`);
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE return result;
) });
`);
// Configuration PostgreSQL depuis DATABASE_URL ou variables d'environnement
// Table note_todos (todos dans les notes) const DATABASE_URL = process.env.DATABASE_URL ||
db.run(` `postgresql://${process.env.PGUSER || 'noteflow'}:${process.env.PGPASSWORD || 'noteflow_secure_password_change_me'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5499'}/${process.env.PGDATABASE || 'noteflow'}`;
CREATE TABLE IF NOT EXISTS note_todos (
id INTEGER PRIMARY KEY AUTOINCREMENT, // Créer le pool de connexions PostgreSQL
note_id INTEGER NOT NULL, const pool = new Pool({
text TEXT NOT NULL, connectionString: DATABASE_URL,
completed BOOLEAN DEFAULT 0, max: 20, // Maximum de connexions dans le pool
position INTEGER DEFAULT 0, idleTimeoutMillis: 30000,
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE connectionTimeoutMillis: 2000,
) // IMPORTANT: Forcer le timezone à UTC pour toutes les connexions
`); // Cela garantit que PostgreSQL renvoie toujours les dates en UTC
options: '-c timezone=UTC'
// Table global_todos (sidebar permanente) });
db.run(`
CREATE TABLE IF NOT EXISTS global_todos ( // Gestion des erreurs du pool
id INTEGER PRIMARY KEY AUTOINCREMENT, pool.on('error', (err) => {
user_id INTEGER NOT NULL, logger.error('Erreur PostgreSQL pool:', err);
text TEXT NOT NULL, });
completed BOOLEAN DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, // Test de connexion
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE pool.connect((err, client, release) => {
) if (err) {
`); logger.error('Erreur lors de la connexion à PostgreSQL:', err);
process.exit(1);
// Table note_images (images attachées aux notes) }
db.run(` release();
CREATE TABLE IF NOT EXISTS note_images ( logger.info(`✓ PostgreSQL connecté: ${DATABASE_URL.replace(/:[^:]*@/, ':***@')}`);
id INTEGER PRIMARY KEY AUTOINCREMENT, });
note_id INTEGER NOT NULL,
filename TEXT NOT NULL, /**
original_name TEXT, * Initialiser la base de données avec les tables nécessaires
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, */
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE async function initDatabase() {
) const client = await pool.connect();
`);
try {
// Table note_files (fichiers attachés aux notes) await client.query('BEGIN');
db.run(`
CREATE TABLE IF NOT EXISTS note_files ( // Table users
id INTEGER PRIMARY KEY AUTOINCREMENT, await client.query(`
note_id INTEGER NOT NULL, CREATE TABLE IF NOT EXISTS users (
filename TEXT NOT NULL, id SERIAL PRIMARY KEY,
original_name TEXT NOT NULL, username VARCHAR(255) UNIQUE NOT NULL,
file_size INTEGER, password_hash VARCHAR(255) NOT NULL,
mime_type TEXT, is_admin BOOLEAN DEFAULT FALSE,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE )
) `);
`);
// Table notes
// Table settings (paramètres globaux) await client.query(`
db.run(` CREATE TABLE IF NOT EXISTS notes (
CREATE TABLE IF NOT EXISTS settings ( id SERIAL PRIMARY KEY,
id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
key TEXT UNIQUE NOT NULL, title TEXT NOT NULL,
value TEXT, content TEXT,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP image_filename TEXT,
) archived BOOLEAN DEFAULT FALSE,
`); archived_at TIMESTAMP,
priority INTEGER DEFAULT 0,
// Table rss_feeds (flux RSS) created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
db.run(` updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
CREATE TABLE IF NOT EXISTS rss_feeds ( )
id INTEGER PRIMARY KEY AUTOINCREMENT, `);
url TEXT UNIQUE NOT NULL,
title TEXT, // Table note_todos
description TEXT, await client.query(`
enabled BOOLEAN DEFAULT 1, CREATE TABLE IF NOT EXISTS note_todos (
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, id SERIAL PRIMARY KEY,
last_fetched_at DATETIME note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
) text TEXT NOT NULL,
`); completed BOOLEAN DEFAULT FALSE,
priority BOOLEAN DEFAULT FALSE,
// Table rss_articles (articles des flux RSS) position INTEGER DEFAULT 0,
db.run(` created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
CREATE TABLE IF NOT EXISTS rss_articles ( completed_at TIMESTAMP
id INTEGER PRIMARY KEY AUTOINCREMENT, )
feed_id INTEGER NOT NULL, `);
title TEXT NOT NULL,
link TEXT UNIQUE NOT NULL, // Table global_todos
description TEXT, await client.query(`
pub_date DATETIME, CREATE TABLE IF NOT EXISTS global_todos (
content TEXT, id SERIAL PRIMARY KEY,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
FOREIGN KEY (feed_id) REFERENCES rss_feeds(id) ON DELETE CASCADE text TEXT NOT NULL,
) completed BOOLEAN DEFAULT FALSE,
`); priority BOOLEAN DEFAULT FALSE,
in_progress INTEGER DEFAULT 0,
// Table rss_summaries (résumés générés) created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
db.run(` completed_at TIMESTAMP
CREATE TABLE IF NOT EXISTS rss_summaries ( )
id INTEGER PRIMARY KEY AUTOINCREMENT, `);
summary TEXT NOT NULL,
model TEXT, // Table note_images
articles_count INTEGER DEFAULT 0, await client.query(`
created_at DATETIME DEFAULT CURRENT_TIMESTAMP CREATE TABLE IF NOT EXISTS note_images (
) id SERIAL PRIMARY KEY,
`); note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
filename TEXT NOT NULL,
// Table calendar_events (événements Google Calendar) original_name TEXT,
db.run(` created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
CREATE TABLE IF NOT EXISTS calendar_events ( )
id INTEGER PRIMARY KEY AUTOINCREMENT, `);
google_event_id TEXT UNIQUE NOT NULL,
user_id INTEGER NOT NULL, // Table note_files
title TEXT NOT NULL, await client.query(`
description TEXT, CREATE TABLE IF NOT EXISTS note_files (
start_time DATETIME NOT NULL, id SERIAL PRIMARY KEY,
end_time DATETIME NOT NULL, note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
location TEXT, filename TEXT NOT NULL,
color_id TEXT, original_name TEXT NOT NULL,
html_link TEXT, file_size INTEGER,
synced_at DATETIME DEFAULT CURRENT_TIMESTAMP, mime_type TEXT,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
) )
`); `);
// Table note_tags (tags pour les notes) // Table settings
db.run(` await client.query(`
CREATE TABLE IF NOT EXISTS note_tags ( CREATE TABLE IF NOT EXISTS settings (
id INTEGER PRIMARY KEY AUTOINCREMENT, id SERIAL PRIMARY KEY,
note_id INTEGER NOT NULL, key VARCHAR(255) UNIQUE NOT NULL,
tag TEXT NOT NULL, value TEXT,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE, )
UNIQUE(note_id, tag) `);
)
`); // Table rss_feeds
await client.query(`
// Table google_oauth_tokens (tokens OAuth pour Google Calendar) CREATE TABLE IF NOT EXISTS rss_feeds (
db.run(` id SERIAL PRIMARY KEY,
CREATE TABLE IF NOT EXISTS google_oauth_tokens ( url TEXT UNIQUE NOT NULL,
id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT,
user_id INTEGER NOT NULL, description TEXT,
access_token TEXT NOT NULL, enabled BOOLEAN DEFAULT TRUE,
refresh_token TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
token_type TEXT DEFAULT 'Bearer', last_fetched_at TIMESTAMP
expiry_date INTEGER, )
scope TEXT, `);
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP, // Table rss_articles
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, await client.query(`
UNIQUE(user_id) CREATE TABLE IF NOT EXISTS rss_articles (
) id SERIAL PRIMARY KEY,
`); feed_id INTEGER NOT NULL REFERENCES rss_feeds(id) ON DELETE CASCADE,
title TEXT NOT NULL,
// Créer les index pour la performance link TEXT UNIQUE NOT NULL,
db.run('CREATE INDEX IF NOT EXISTS idx_notes_user ON notes(user_id)'); description TEXT,
db.run('CREATE INDEX IF NOT EXISTS idx_note_todos ON note_todos(note_id)'); pub_date TIMESTAMP,
db.run('CREATE INDEX IF NOT EXISTS idx_global_todos_user ON global_todos(user_id)'); content TEXT,
db.run('CREATE INDEX IF NOT EXISTS idx_note_images ON note_images(note_id)'); created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
db.run('CREATE INDEX IF NOT EXISTS idx_note_files ON note_files(note_id)'); )
db.run('CREATE INDEX IF NOT EXISTS idx_note_tags ON note_tags(note_id)'); `);
db.run('CREATE INDEX IF NOT EXISTS idx_note_tags_tag ON note_tags(tag)');
db.run('CREATE INDEX IF NOT EXISTS idx_settings_key ON settings(key)'); // Table rss_summaries
db.run('CREATE INDEX IF NOT EXISTS idx_rss_articles_feed ON rss_articles(feed_id)'); await client.query(`
db.run('CREATE INDEX IF NOT EXISTS idx_rss_articles_date ON rss_articles(pub_date)'); CREATE TABLE IF NOT EXISTS rss_summaries (
db.run('CREATE INDEX IF NOT EXISTS idx_calendar_events_user ON calendar_events(user_id)'); id SERIAL PRIMARY KEY,
db.run('CREATE INDEX IF NOT EXISTS idx_calendar_events_start ON calendar_events(start_time)'); summary TEXT NOT NULL,
model TEXT,
logger.info('✓ Tables de base de données créées avec succès'); articles_count INTEGER DEFAULT 0,
feed_title TEXT,
// Migrations automatiques created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
// Migration pour rss_summaries - ajouter feed_title )
db.all("PRAGMA table_info(rss_summaries)", (err, columns) => { `);
if (err) {
logger.error('Erreur lors de la vérification de la structure de la table rss_summaries:', err); // Table calendar_events
return; await client.query(`
} CREATE TABLE IF NOT EXISTS calendar_events (
id SERIAL PRIMARY KEY,
const hasFeedTitle = columns.some(col => col.name === 'feed_title'); google_event_id VARCHAR(255) UNIQUE NOT NULL,
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
if (!hasFeedTitle) { title TEXT NOT NULL,
logger.info('Migration: Ajout de la colonne feed_title à rss_summaries...'); description TEXT,
db.run('ALTER TABLE rss_summaries ADD COLUMN feed_title TEXT', (err) => { start_time TIMESTAMPTZ NOT NULL,
if (err) { end_time TIMESTAMPTZ NOT NULL,
logger.error('Erreur lors de l\'ajout de la colonne feed_title:', err); location TEXT,
} else { color_id TEXT,
logger.info('✓ Colonne feed_title ajoutée avec succès'); html_link TEXT,
} all_day BOOLEAN DEFAULT FALSE,
}); synced_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
} )
}); `);
db.all("PRAGMA table_info(notes)", (err, columns) => { // Table note_tags
if (err) { await client.query(`
logger.error('Erreur lors de la vérification de la structure de la table notes:', err); CREATE TABLE IF NOT EXISTS note_tags (
return; id SERIAL PRIMARY KEY,
} note_id INTEGER NOT NULL REFERENCES notes(id) ON DELETE CASCADE,
tag VARCHAR(255) NOT NULL,
const hasImageFilename = columns.some(col => col.name === 'image_filename'); created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
const hasArchived = columns.some(col => col.name === 'archived'); UNIQUE(note_id, tag)
const hasPriority = columns.some(col => col.name === 'priority'); )
`);
if (!hasImageFilename) {
logger.info('Migration: Ajout de la colonne image_filename...'); // Table google_oauth_tokens
db.run('ALTER TABLE notes ADD COLUMN image_filename TEXT', (err) => { await client.query(`
if (err) { CREATE TABLE IF NOT EXISTS google_oauth_tokens (
logger.error('Erreur lors de l\'ajout de la colonne image_filename:', err); id SERIAL PRIMARY KEY,
} else { user_id INTEGER NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,
logger.info('✓ Colonne image_filename ajoutée avec succès'); access_token TEXT NOT NULL,
} refresh_token TEXT,
}); token_type VARCHAR(50) DEFAULT 'Bearer',
} expiry_date BIGINT,
scope TEXT,
if (!hasArchived) { created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
logger.info('Migration: Ajout de la colonne archived...'); updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
db.run('ALTER TABLE notes ADD COLUMN archived BOOLEAN DEFAULT 0', (err) => { )
if (err) { `);
logger.error('Erreur lors de l\'ajout de la colonne archived:', err);
} else { // Créer les index pour la performance
logger.info('✓ Colonne archived ajoutée avec succès'); await client.query('CREATE INDEX IF NOT EXISTS idx_notes_user ON notes(user_id)');
} await client.query('CREATE INDEX IF NOT EXISTS idx_notes_priority ON notes(priority DESC, updated_at DESC)');
}); await client.query('CREATE INDEX IF NOT EXISTS idx_note_todos ON note_todos(note_id)');
} await client.query('CREATE INDEX IF NOT EXISTS idx_global_todos_user ON global_todos(user_id)');
await client.query('CREATE INDEX IF NOT EXISTS idx_note_images ON note_images(note_id)');
if (!hasPriority) { await client.query('CREATE INDEX IF NOT EXISTS idx_note_files ON note_files(note_id)');
logger.info('Migration: Ajout de la colonne priority...'); await client.query('CREATE INDEX IF NOT EXISTS idx_note_tags ON note_tags(note_id)');
db.run('ALTER TABLE notes ADD COLUMN priority INTEGER DEFAULT 0', (err) => { await client.query('CREATE INDEX IF NOT EXISTS idx_note_tags_tag ON note_tags(tag)');
if (err) { await client.query('CREATE INDEX IF NOT EXISTS idx_settings_key ON settings(key)');
logger.error('Erreur lors de l\'ajout de la colonne priority:', err); await client.query('CREATE INDEX IF NOT EXISTS idx_rss_articles_feed ON rss_articles(feed_id)');
} else { await client.query('CREATE INDEX IF NOT EXISTS idx_rss_articles_date ON rss_articles(pub_date DESC)');
logger.info('✓ Colonne priority ajoutée avec succès'); await client.query('CREATE INDEX IF NOT EXISTS idx_calendar_events_user ON calendar_events(user_id)');
// Créer l'index pour la performance await client.query('CREATE INDEX IF NOT EXISTS idx_calendar_events_start ON calendar_events(start_time)');
db.run('CREATE INDEX IF NOT EXISTS idx_notes_priority ON notes(priority DESC, updated_at DESC)', (indexErr) => {
if (indexErr) { logger.info('✓ Tables PostgreSQL créées avec succès');
logger.error('Erreur lors de la création de l\'index priority:', indexErr);
} else { // Créer l'utilisateur admin par défaut si la table est vide
logger.info('✓ Index priority créé avec succès'); const usersCount = await client.query('SELECT COUNT(*) as count FROM users');
}
}); if (usersCount.rows[0].count === '0') {
} const defaultPassword = 'admin';
}); const passwordHash = await bcrypt.hash(defaultPassword, 12);
}
}); await client.query(
'INSERT INTO users (username, password_hash, is_admin) VALUES ($1, $2, $3)',
// Migration pour calendar_events - ajouter all_day ['admin', passwordHash, true]
db.all("PRAGMA table_info(calendar_events)", (err, columns) => { );
if (err) {
logger.error('Erreur lors de la vérification de la structure de la table calendar_events:', err); logger.info('✓ Utilisateur admin créé (username: admin, password: admin)');
return; logger.warn('⚠️ IMPORTANT: Changez le mot de passe admin en production!');
} } else {
logger.info('✓ Base de données déjà initialisée');
const hasAllDay = columns.some(col => col.name === 'all_day'); }
if (!hasAllDay) { await client.query('COMMIT');
logger.info('Migration: Ajout de la colonne all_day à calendar_events...'); } catch (error) {
db.run('ALTER TABLE calendar_events ADD COLUMN all_day BOOLEAN DEFAULT 0', (err) => { await client.query('ROLLBACK');
if (err) { logger.error('Erreur lors de l\'initialisation de la base de données:', error);
logger.error('Erreur lors de l\'ajout de la colonne all_day:', err); throw error;
} else { } finally {
logger.info('✓ Colonne all_day ajoutée avec succès'); client.release();
} }
}); }
}
}); /**
* Exécuter une requête avec promesse
// Créer l'utilisateur admin par défaut si la table est vide */
db.get('SELECT COUNT(*) as count FROM users', async (err, row) => { async function runQuery(sql, params = []) {
if (err) { const client = await pool.connect();
logger.error('Erreur lors de la vérification des utilisateurs:', err); try {
reject(err); const result = await client.query(sql, params);
return; return {
} id: result.rows[0]?.id || result.rowCount,
changes: result.rowCount
if (row.count === 0) { };
// Créer l'utilisateur admin par défaut } catch (error) {
const defaultPassword = 'admin'; logger.error('Erreur runQuery:', error);
const passwordHash = await bcrypt.hash(defaultPassword, 12); throw error;
} finally {
db.run( client.release();
'INSERT INTO users (username, password_hash, is_admin) VALUES (?, ?, ?)', }
['admin', passwordHash, 1], }
(err) => {
if (err) { /**
logger.error('Erreur lors de la création de l\'utilisateur admin:', err); * Récupérer une seule ligne
reject(err); */
} else { async function getOne(sql, params = []) {
logger.info('✓ Utilisateur admin créé (username: admin, password: admin)'); const client = await pool.connect();
logger.warn('⚠️ IMPORTANT: Changez le mot de passe admin en production!'); try {
resolve(); const result = await client.query(sql, params);
} return result.rows[0] || null;
} } catch (error) {
); logger.error('Erreur getOne:', error);
} else { throw error;
logger.info('✓ Base de données déjà initialisée'); } finally {
resolve(); client.release();
} }
}); }
} catch (error) {
logger.error('Erreur lors de l\'initialisation de la base de données:', error); /**
reject(error); * Récupérer toutes les lignes
} */
}); async function getAll(sql, params = []) {
}); const client = await pool.connect();
} try {
const result = await client.query(sql, params);
/** return result.rows;
* Exécuter une requête avec promesse } catch (error) {
*/ logger.error('Erreur getAll:', error);
function runQuery(sql, params = []) { throw error;
return new Promise((resolve, reject) => { } finally {
db.run(sql, params, function(err) { client.release();
if (err) { }
reject(err); }
} else {
resolve({ id: this.lastID, changes: this.changes }); module.exports = {
} pool,
}); initDatabase,
}); runQuery,
} getOne,
getAll
/** };
* Récupérer une seule ligne
*/
function getOne(sql, params = []) {
return new Promise((resolve, reject) => {
db.get(sql, params, (err, row) => {
if (err) {
reject(err);
} else {
resolve(row);
}
});
});
}
/**
* Récupérer toutes les lignes
*/
function getAll(sql, params = []) {
return new Promise((resolve, reject) => {
db.all(sql, params, (err, rows) => {
if (err) {
reject(err);
} else {
resolve(rows);
}
});
});
}
module.exports = {
db,
initDatabase,
runQuery,
getOne,
getAll
};