perf: homepage

This commit is contained in:
Julien Froidefond
2025-08-25 21:30:35 +02:00
parent a440c0729f
commit 5e1e06be47
3 changed files with 66 additions and 67 deletions

View File

@@ -7,6 +7,15 @@ const dbConfig = {
database: process.env.DB_NAME || "peakskills", database: process.env.DB_NAME || "peakskills",
user: process.env.DB_USER || "peakskills_user", user: process.env.DB_USER || "peakskills_user",
password: process.env.DB_PASSWORD || "peakskills_password", password: process.env.DB_PASSWORD || "peakskills_password",
// ✅ AJOUT : Configuration optimisée du pool
max: 20, // Connexions max
min: 2, // Connexions min
idleTimeoutMillis: 30000, // 30s
connectionTimeoutMillis: 2000, // 2s
acquireTimeoutMillis: 10000, // 10s
// Optimisations supplémentaires
allowExitOnIdle: true,
maxUses: 7500, // Recycler les connexions après 7500 utilisations
}; };
// Pool de connexions global // Pool de connexions global

View File

@@ -207,44 +207,50 @@ export class EvaluationService {
userEvaluationId: number, userEvaluationId: number,
catEval: CategoryEvaluation catEval: CategoryEvaluation
): Promise<void> { ): Promise<void> {
// Insérer les skills sélectionnées (sans évaluation) // ✅ SOLUTION : BULK INSERT pour éviter les requêtes N+1
const values = [];
const params = [];
let paramIndex = 1;
// Préparer toutes les valeurs pour les skills sélectionnées
for (const skillId of catEval.selectedSkillIds) { for (const skillId of catEval.selectedSkillIds) {
const isEvaluated = catEval.skills.some( const isEvaluated = catEval.skills.some(
(se) => se.skillId === skillId && se.level !== null (se) => se.skillId === skillId && se.level !== null
); );
if (!isEvaluated) { if (!isEvaluated) {
// Skill sélectionnée mais pas encore évaluée values.push(
await client.query( `($${paramIndex++}, $${paramIndex++}, 'never'::skill_level_enum, true, false, false)`
`
INSERT INTO skill_evaluations
(user_evaluation_id, skill_id, level, is_selected, can_mentor, wants_to_learn)
VALUES ($1, $2, 'never'::skill_level_enum, true, false, false)
`,
[userEvaluationId, skillId]
); );
params.push(userEvaluationId, skillId);
} }
} }
// Insérer les évaluations de skills // Préparer toutes les valeurs pour les évaluations de skills
for (const skillEval of catEval.skills) { for (const skillEval of catEval.skills) {
if (skillEval.level !== null) { if (skillEval.level !== null) {
await client.query( values.push(
` `($${paramIndex++}, $${paramIndex++}, $${paramIndex++}, true, $${paramIndex++}, $${paramIndex++})`
INSERT INTO skill_evaluations );
(user_evaluation_id, skill_id, level, is_selected, can_mentor, wants_to_learn) params.push(
VALUES ($1, $2, $3, true, $4, $5)
`,
[
userEvaluationId, userEvaluationId,
skillEval.skillId, skillEval.skillId,
skillEval.level, skillEval.level,
skillEval.canMentor || false, skillEval.canMentor || false,
skillEval.wantsToLearn || false, skillEval.wantsToLearn || false
]
); );
} }
} }
// Exécuter le BULK INSERT si on a des valeurs
if (values.length > 0) {
const bulkQuery = `
INSERT INTO skill_evaluations
(user_evaluation_id, skill_id, level, is_selected, can_mentor, wants_to_learn)
VALUES ${values.join(", ")}
`;
await client.query(bulkQuery, params);
}
} }
/** /**

View File

@@ -7,60 +7,44 @@ export class SkillsService {
*/ */
static async getSkillCategories(): Promise<SkillCategory[]> { static async getSkillCategories(): Promise<SkillCategory[]> {
const pool = getPool(); const pool = getPool();
// ✅ SOLUTION : Requête optimisée avec sous-requêtes
const query = ` const query = `
SELECT SELECT
sc.id as category_id, sc.id as category_id,
sc.name as category_name, sc.name as category_name,
sc.icon as category_icon, sc.icon as category_icon,
s.id as skill_id,
s.name as skill_name,
s.description as skill_description,
s.icon as skill_icon,
COALESCE( COALESCE(
json_agg( json_agg(
sl.url ORDER BY sl.id json_build_object(
) FILTER (WHERE sl.url IS NOT NULL), 'id', s.id,
'name', s.name,
'description', s.description,
'icon', s.icon,
'links', COALESCE(
(SELECT json_agg(sl.url ORDER BY sl.id)
FROM skill_links sl
WHERE sl.skill_id = s.id),
'[]'::json '[]'::json
) as skill_links )
) ORDER BY s.name
) FILTER (WHERE s.id IS NOT NULL),
'[]'::json
) as skills
FROM skill_categories sc FROM skill_categories sc
LEFT JOIN skills s ON sc.id = s.category_id LEFT JOIN skills s ON sc.id = s.category_id
LEFT JOIN skill_links sl ON s.id = sl.skill_id GROUP BY sc.id, sc.name, sc.icon
GROUP BY sc.id, sc.name, sc.icon, s.id, s.name, s.description, s.icon ORDER BY sc.name
ORDER BY sc.name, s.name
`; `;
try { try {
const result = await pool.query(query); const result = await pool.query(query);
return result.rows.map((row) => ({
// Group by category id: row.category_id,
const categoriesMap = new Map<string, SkillCategory>();
for (const row of result.rows) {
const categoryId = row.category_id;
if (!categoriesMap.has(categoryId)) {
categoriesMap.set(categoryId, {
id: categoryId,
name: row.category_name, name: row.category_name,
category: row.category_name, category: row.category_name,
icon: row.category_icon, icon: row.category_icon,
skills: [], skills: row.skills,
}); }));
}
if (row.skill_id) {
const category = categoriesMap.get(categoryId)!;
category.skills.push({
id: row.skill_id,
name: row.skill_name,
description: row.skill_description,
icon: row.skill_icon,
links: row.skill_links,
});
}
}
return Array.from(categoriesMap.values());
} catch (error) { } catch (error) {
console.error("Error fetching skill categories:", error); console.error("Error fetching skill categories:", error);
throw new Error("Failed to fetch skill categories"); throw new Error("Failed to fetch skill categories");