From 355cb43dc72b6958caf62f0833787cc2b03cca97 Mon Sep 17 00:00:00 2001 From: Manus Sandbox Date: Mon, 8 Dec 2025 03:38:14 -0500 Subject: [PATCH] =?UTF-8?q?Checkpoint:=20Historique,=20statistiques=20et?= =?UTF-8?q?=20r=C3=A9essai=20automatique=20des=20rappels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Nouvelles fonctionnalités** : 1. **Page d'historique des rappels** (`/admin/rappels/historique`) - Tableau complet de tous les rappels envoyés - Filtres avancés : date début/fin, séquence, statut (succès/échec), email - Recherche par email avec mise en surbrillance - Pagination (50 résultats par page) - Affichage du nombre de tentatives pour chaque rappel - Code couleur : vert pour succès, rouge pour échec 2. **Tableau de bord statistiques** (`/admin/rappels/statistiques`) - 4 cartes de statistiques globales : total envoyés, succès, échecs, taux de succès - Graphique d'évolution : nombre de rappels envoyés par jour (succès vs échecs) - Graphique du taux de succès par jour (barres) - Top 10 des emails problématiques avec nombre d'échecs - Visualisation interactive avec Recharts 3. **Système de réessai automatique** - Détection automatique des rappels échoués - Délai exponentiel : 1h après 1er échec, 4h après 2ème, 24h après 3ème - Limite de 3 tentatives maximum - Notification automatique à l'admin en cas d'abandon (3 échecs) - Mise à jour automatique du statut dans les logs - Vérification toutes les heures **Nouveaux champs dans logsRappels** : - `nbTentatives` : nombre de tentatives d'envoi (1 à 3) - `prochainEssai` : date du prochain essai en cas d'échec **Nouveaux fichiers** : - `client/src/pages/admin/AdminRappelsHistorique.tsx` : Page d'historique - `client/src/pages/admin/AdminRappelsStats.tsx` : Page de statistiques - `server/rappelRetry.ts` : Système de réessai automatique - `server/rappelDb.ts` : Fonctions étendues (filtres, stats, évolution) **Fichiers modifiés** : - `drizzle/schema.ts` : Ajout de nbTentatives et prochainEssai - `server/routers.ts` : Nouvelles procédures tRPC (historique, statistiques, évolution) - `client/src/App.tsx` : Routes pour historique et statistiques - `client/src/components/DashboardLayout.tsx` : Sous-menu Rappels - `server/_core/index.ts` : Initialisation du scheduler de retry **Bénéfices** : - ✅ Traçabilité complète de tous les rappels - ✅ Analyse des performances avec graphiques - ✅ Identification rapide des emails problématiques - ✅ Réessai automatique des échecs sans intervention manuelle - ✅ Notification en cas d'échec persistant - ✅ Optimisation de la délivrabilité des emails --- .manus/db/db-query-1765182715024.json | 9 + client/src/App.tsx | 4 + client/src/components/DashboardLayout.tsx | 5 +- .../pages/admin/AdminRappelsHistorique.tsx | 262 +++ client/src/pages/admin/AdminRappelsStats.tsx | 252 +++ drizzle/meta/0021_snapshot.json | 1738 +++++++++++++++++ drizzle/meta/_journal.json | 7 + drizzle/schema.ts | 4 + server/_core/index.ts | 4 + server/rappelDb.ts | 182 ++ server/rappelRetry.ts | 226 +++ server/routers.ts | 33 + todo.md | 29 + 13 files changed, 2754 insertions(+), 1 deletion(-) create mode 100644 .manus/db/db-query-1765182715024.json create mode 100644 client/src/pages/admin/AdminRappelsHistorique.tsx create mode 100644 client/src/pages/admin/AdminRappelsStats.tsx create mode 100644 drizzle/meta/0021_snapshot.json create mode 100644 server/rappelRetry.ts diff --git a/.manus/db/db-query-1765182715024.json b/.manus/db/db-query-1765182715024.json new file mode 100644 index 0000000..61a7560 --- /dev/null +++ b/.manus/db/db-query-1765182715024.json @@ -0,0 +1,9 @@ +{ + "query": "ALTER TABLE `logsRappels` \nADD COLUMN `nbTentatives` int NOT NULL DEFAULT 1,\nADD COLUMN `prochainEssai` timestamp NULL;", + "command": "mysql --batch --raw --column-names --default-character-set=utf8mb4 --host gateway02.us-east-1.prod.aws.tidbcloud.com --port 4000 --user 4CrrYuB5tme73Qo.root --database 7PAT67UmWoxv8vwp8Bbcv6 --execute ALTER TABLE `logsRappels` \nADD COLUMN `nbTentatives` int NOT NULL DEFAULT 1,\nADD COLUMN `prochainEssai` timestamp NULL;", + "rows": [], + "messages": [], + "stdout": "", + "stderr": "", + "execution_time_ms": 795 +} \ No newline at end of file diff --git a/client/src/App.tsx b/client/src/App.tsx index 150d27d..0dbf97c 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -25,6 +25,8 @@ import AdminQuestionnaires from "./pages/AdminQuestionnaires"; import AdminQuestionnaireEdit from "./pages/AdminQuestionnaireEdit"; import AdminQuestionnaireAnalyse from "./pages/AdminQuestionnaireAnalyse"; import AdminQuestionnaireSuivi from "./pages/AdminQuestionnaireSuivi"; +import AdminRappelsHistorique from "./pages/admin/AdminRappelsHistorique"; +import AdminRappelsStats from "./pages/admin/AdminRappelsStats"; import QuestionnaireReponse from "./pages/QuestionnaireReponse"; import Inscription from "./pages/Inscription"; import Login from "./pages/Login"; @@ -51,6 +53,8 @@ function Router() { + + diff --git a/client/src/components/DashboardLayout.tsx b/client/src/components/DashboardLayout.tsx index 69354bc..4ccffbb 100644 --- a/client/src/components/DashboardLayout.tsx +++ b/client/src/components/DashboardLayout.tsx @@ -48,7 +48,10 @@ const menuSections = [ items: [ { icon: UserCog, label: "Utilisateurs", path: "/admin/users" }, { icon: FileSpreadsheet, label: "Import Excel", path: "/admin/import-excel" }, - { icon: Bell, label: "Rappels", path: "/admin/rappels" }, + { icon: Bell, label: "Rappels", path: "/admin/rappels", subItems: [ + { label: "Historique", path: "/admin/rappels/historique" }, + { label: "Statistiques", path: "/admin/rappels/statistiques" }, + ] }, { icon: ClipboardList, label: "Questionnaires", path: "/admin/questionnaires" }, { icon: Mail, label: "Templates d'emails", path: "/admin/email-templates" }, { icon: Settings, label: "Configuration SMTP", path: "/admin/email-config" }, diff --git a/client/src/pages/admin/AdminRappelsHistorique.tsx b/client/src/pages/admin/AdminRappelsHistorique.tsx new file mode 100644 index 0000000..d8e69a5 --- /dev/null +++ b/client/src/pages/admin/AdminRappelsHistorique.tsx @@ -0,0 +1,262 @@ +import { useState } from "react"; +import DashboardLayout from "@/components/DashboardLayout"; +import { Button } from "@/components/ui/button"; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@/components/ui/select"; +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; +import { Badge } from "@/components/ui/badge"; +import { trpc } from "@/lib/trpc"; +import { History, Search, Filter, ChevronLeft, ChevronRight } from "lucide-react"; +import { format } from "date-fns"; +import { fr } from "date-fns/locale"; + +export default function AdminRappelsHistorique() { + const [filtres, setFiltres] = useState({ + dateDebut: "", + dateFin: "", + sequenceId: undefined as number | undefined, + statut: undefined as "success" | "failed" | undefined, + email: "", + limit: 50, + offset: 0, + }); + + const { data: logs, isLoading } = trpc.rappels.historique.useQuery(filtres); + const { data: sequences } = trpc.sequences.list.useQuery(); + + const handleFilterChange = (key: string, value: any) => { + setFiltres(prev => ({ + ...prev, + [key]: value, + offset: 0, // Reset pagination + })); + }; + + const handlePageChange = (direction: "prev" | "next") => { + setFiltres(prev => ({ + ...prev, + offset: direction === "next" ? prev.offset + prev.limit : Math.max(0, prev.offset - prev.limit), + })); + }; + + const resetFilters = () => { + setFiltres({ + dateDebut: "", + dateFin: "", + sequenceId: undefined, + statut: undefined, + email: "", + limit: 50, + offset: 0, + }); + }; + + return ( + +
+
+
+

Historique des Rappels

+

+ Consultez tous les rappels envoyés avec filtres avancés +

+
+ +
+ + {/* Filtres */} + + + + + Filtres + + Affinez votre recherche dans l'historique + + +
+
+ + handleFilterChange("dateDebut", e.target.value)} + /> +
+ +
+ + handleFilterChange("dateFin", e.target.value)} + /> +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + handleFilterChange("email", e.target.value)} + /> +
+
+ +
+ +
+
+ + + + {/* Tableau des logs */} + + + Logs des rappels + + {logs?.length || 0} résultat(s) trouvé(s) + + + + {isLoading ? ( +
+ Chargement... +
+ ) : !logs || logs.length === 0 ? ( +
+ Aucun log trouvé avec ces filtres +
+ ) : ( + <> +
+ + + + Date envoi + Email + Type + Statut + Tentatives + Erreur + + + + {logs.map((log) => ( + + + {format(new Date(log.dateEnvoi), "dd/MM/yyyy HH:mm", { locale: fr })} + + {log.emailDestinataire} + + + {log.typeRappel === "rappel" ? "J-7" : "J-1"} + + + + + {log.statut === "success" ? "Succès" : "Échec"} + + + + 1 ? "text-orange-600 font-medium" : ""}> + {log.nbTentatives} + + + + {log.messageErreur || "-"} + + + ))} + +
+
+ + {/* Pagination */} +
+
+ Affichage de {filtres.offset + 1} à {Math.min(filtres.offset + filtres.limit, filtres.offset + (logs?.length || 0))} +
+
+ + +
+
+ + )} + + +
+ + ); +} diff --git a/client/src/pages/admin/AdminRappelsStats.tsx b/client/src/pages/admin/AdminRappelsStats.tsx new file mode 100644 index 0000000..d1f3424 --- /dev/null +++ b/client/src/pages/admin/AdminRappelsStats.tsx @@ -0,0 +1,252 @@ +import DashboardLayout from "@/components/DashboardLayout"; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; +import { trpc } from "@/lib/trpc"; +import { BarChart, TrendingUp, AlertCircle, Mail, CheckCircle2, XCircle } from "lucide-react"; +import { + LineChart, + Line, + BarChart as RechartsBarChart, + Bar, + XAxis, + YAxis, + CartesianGrid, + Tooltip, + Legend, + ResponsiveContainer, +} from "recharts"; + +export default function AdminRappelsStats() { + const { data: stats, isLoading: statsLoading } = trpc.rappels.statistiques.useQuery(); + const { data: evolution, isLoading: evolutionLoading } = trpc.rappels.evolution.useQuery(); + + const formatPercentage = (value: number) => { + return `${value.toFixed(1)}%`; + }; + + return ( + +
+
+
+

Statistiques des Rappels

+

+ Analysez les performances du système de rappels +

+
+ +
+ + {/* Cartes de statistiques */} +
+ + + Total envoyés + + + +
+ {statsLoading ? "..." : stats?.totalEnvoyes || 0} +
+

+ Tous les rappels confondus +

+ + + + + + Succès + + + +
+ {statsLoading ? "..." : stats?.totalSucces || 0} +
+

+ Rappels envoyés avec succès +

+ + + + + + Échecs + + + +
+ {statsLoading ? "..." : stats?.totalEchecs || 0} +
+

+ Rappels en échec +

+ + + + + + Taux de succès + + + +
+ {statsLoading ? "..." : formatPercentage(stats?.tauxSucces || 0)} +
+

+ Ratio succès/total +

+ + +
+ + {/* Graphique d'évolution */} + + + Évolution des envois + Nombre de rappels envoyés par jour + + + {evolutionLoading ? ( +
+ Chargement... +
+ ) : !evolution || evolution.length === 0 ? ( +
+ Aucune donnée disponible +
+ ) : ( + + + + { + const date = new Date(value); + return `${date.getDate()}/${date.getMonth() + 1}`; + }} + /> + + { + const date = new Date(value as string); + return date.toLocaleDateString("fr-FR"); + }} + /> + + + + + + )} + + + + {/* Graphique du taux de succès */} + + + Taux de succès par jour + Pourcentage de rappels réussis + + + {evolutionLoading ? ( +
+ Chargement... +
+ ) : !evolution || evolution.length === 0 ? ( +
+ Aucune donnée disponible +
+ ) : ( + + ({ + ...e, + tauxSucces: e.nbEnvoyes > 0 ? (e.nbSucces / e.nbEnvoyes) * 100 : 0, + }))} + > + + { + const date = new Date(value); + return `${date.getDate()}/${date.getMonth() + 1}`; + }} + /> + `${value}%`} /> + { + const date = new Date(value as string); + return date.toLocaleDateString("fr-FR"); + }} + formatter={(value: any) => [`${value.toFixed(1)}%`, "Taux de succès"]} + /> + + + + )} + + + + {/* Emails problématiques */} + + + + + Emails problématiques + + + Top 10 des emails avec le plus d'échecs + + + + {statsLoading ? ( +
+ Chargement... +
+ ) : !stats?.emailsProblematiques || stats.emailsProblematiques.length === 0 ? ( +
+ Aucun email problématique détecté +
+ ) : ( +
+ + + + Email + Nombre d'échecs + + + + {stats.emailsProblematiques.map((item, index) => ( + + {item.email} + + + {item.nbEchecs} + + + + ))} + +
+
+ )} + + +
+ + ); +} diff --git a/drizzle/meta/0021_snapshot.json b/drizzle/meta/0021_snapshot.json new file mode 100644 index 0000000..ac9212b --- /dev/null +++ b/drizzle/meta/0021_snapshot.json @@ -0,0 +1,1738 @@ +{ + "version": "5", + "dialect": "mysql", + "id": "9bb0c846-ec7f-4969-82c8-44003c70b785", + "prevId": "b0931d4a-2633-4106-9117-33fa1cee6d16", + "tables": { + "alertes": { + "name": "alertes", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "type": { + "name": "type", + "type": "enum('taux_remplissage','seuil_inscriptions')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "condition": { + "name": "condition", + "type": "varchar(10)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "valeurSeuil": { + "name": "valeurSeuil", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "codeEtablissement": { + "name": "codeEtablissement", + "type": "varchar(50)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "emailsDestinataires": { + "name": "emailsDestinataires", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "actif": { + "name": "actif", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "derniereVerification": { + "name": "derniereVerification", + "type": "timestamp", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "dernierEnvoi": { + "name": "dernierEnvoi", + "type": "timestamp", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "alertes_id": { + "name": "alertes_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "apprenants": { + "name": "apprenants", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "prenom": { + "name": "prenom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "email": { + "name": "email", + "type": "varchar(320)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "codeEtablissement": { + "name": "codeEtablissement", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "fonction": { + "name": "fonction", + "type": "enum('directeur','chef_service','autre')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "apprenants_id": { + "name": "apprenants_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "apprenants_email_unique": { + "name": "apprenants_email_unique", + "columns": [ + "email" + ] + } + }, + "checkConstraint": {} + }, + "datesFormation": { + "name": "datesFormation", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateDebut": { + "name": "dateDebut", + "type": "datetime", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateFin": { + "name": "dateFin", + "type": "datetime", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "ordre": { + "name": "ordre", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "datesFormation_id": { + "name": "datesFormation_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "emailConfig": { + "name": "emailConfig", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "provider": { + "name": "provider", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'resend'" + }, + "apiKey": { + "name": "apiKey", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "fromEmail": { + "name": "fromEmail", + "type": "varchar(320)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "fromName": { + "name": "fromName", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'Formation Manager Itinova'" + }, + "mode": { + "name": "mode", + "type": "enum('simulation','production')", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'simulation'" + }, + "domainVerified": { + "name": "domainVerified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "active": { + "name": "active", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "smtpHost": { + "name": "smtpHost", + "type": "varchar(255)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "smtpPort": { + "name": "smtpPort", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "smtpSecure": { + "name": "smtpSecure", + "type": "enum('none','tls','ssl')", + "primaryKey": false, + "notNull": false, + "autoincrement": false, + "default": "'tls'" + }, + "smtpUser": { + "name": "smtpUser", + "type": "varchar(320)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "smtpPassword": { + "name": "smtpPassword", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "emailConfig_id": { + "name": "emailConfig_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "emailTemplates": { + "name": "emailTemplates", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "type": { + "name": "type", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "logoUrl": { + "name": "logoUrl", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "primaryColor": { + "name": "primaryColor", + "type": "varchar(7)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'#2563eb'" + }, + "headerBgColor": { + "name": "headerBgColor", + "type": "varchar(7)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'#2563eb'" + }, + "headerTextColor": { + "name": "headerTextColor", + "type": "varchar(7)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'#ffffff'" + }, + "headerTitle": { + "name": "headerTitle", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'Formation Manager Itinova'" + }, + "footerText": { + "name": "footerText", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "bodyContent": { + "name": "bodyContent", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "active": { + "name": "active", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "emailTemplates_id": { + "name": "emailTemplates_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "emailTemplates_type_unique": { + "name": "emailTemplates_type_unique", + "columns": [ + "type" + ] + } + }, + "checkConstraint": {} + }, + "envoisQuestionnaires": { + "name": "envoisQuestionnaires", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "questionnaireId": { + "name": "questionnaireId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "apprenantId": { + "name": "apprenantId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateEnvoi": { + "name": "dateEnvoi", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "token": { + "name": "token", + "type": "varchar(100)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateReponse": { + "name": "dateReponse", + "type": "timestamp", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "envoisQuestionnaires_id": { + "name": "envoisQuestionnaires_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "envoisQuestionnaires_token_unique": { + "name": "envoisQuestionnaires_token_unique", + "columns": [ + "token" + ] + } + }, + "checkConstraint": {} + }, + "formateurs": { + "name": "formateurs", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "formateurs_id": { + "name": "formateurs_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "formations": { + "name": "formations", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "lienUnique": { + "name": "lienUnique", + "type": "varchar(100)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "actif": { + "name": "actif", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "formations_id": { + "name": "formations_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "formations_lienUnique_unique": { + "name": "formations_lienUnique_unique", + "columns": [ + "lienUnique" + ] + } + }, + "checkConstraint": {} + }, + "inscriptions": { + "name": "inscriptions", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "apprenantId": { + "name": "apprenantId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "statut": { + "name": "statut", + "type": "enum('confirmee','liste_attente','annulee')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateInscription": { + "name": "dateInscription", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "inscriptions_id": { + "name": "inscriptions_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "logsRappels": { + "name": "logsRappels", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "rappelId": { + "name": "rappelId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "apprenantId": { + "name": "apprenantId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "emailDestinataire": { + "name": "emailDestinataire", + "type": "varchar(320)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "typeRappel": { + "name": "typeRappel", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateEnvoi": { + "name": "dateEnvoi", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "statut": { + "name": "statut", + "type": "enum('success','failed')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "messageErreur": { + "name": "messageErreur", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "dateSequence": { + "name": "dateSequence", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "nbTentatives": { + "name": "nbTentatives", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 1 + }, + "prochainEssai": { + "name": "prochainEssai", + "type": "timestamp", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "logsRappels_id": { + "name": "logsRappels_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "passwordResetTokens": { + "name": "passwordResetTokens", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "userId": { + "name": "userId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "token": { + "name": "token", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "expiresAt": { + "name": "expiresAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "used": { + "name": "used", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "passwordResetTokens_id": { + "name": "passwordResetTokens_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "passwordResetTokens_token_unique": { + "name": "passwordResetTokens_token_unique", + "columns": [ + "token" + ] + } + }, + "checkConstraint": {} + }, + "questionnaires": { + "name": "questionnaires", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "type": { + "name": "type", + "type": "enum('satisfaction','evaluation_pre','evaluation_post')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "formationId": { + "name": "formationId", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "actif": { + "name": "actif", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "envoiAutomatique": { + "name": "envoiAutomatique", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "delaiEnvoiJours": { + "name": "delaiEnvoiJours", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 1 + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "questionnaires_id": { + "name": "questionnaires_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "questions": { + "name": "questions", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "questionnaireId": { + "name": "questionnaireId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "ordre": { + "name": "ordre", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "texte": { + "name": "texte", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "typeQuestion": { + "name": "typeQuestion", + "type": "enum('choix_multiple','echelle','texte_libre','oui_non')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "options": { + "name": "options", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "echelleMin": { + "name": "echelleMin", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "echelleMax": { + "name": "echelleMax", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "echelleLabelMin": { + "name": "echelleLabelMin", + "type": "varchar(100)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "echelleLabelMax": { + "name": "echelleLabelMax", + "type": "varchar(100)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "obligatoire": { + "name": "obligatoire", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "questions_id": { + "name": "questions_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "rappels": { + "name": "rappels", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "templateType": { + "name": "templateType", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "joursAvant": { + "name": "joursAvant", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "heureEnvoi": { + "name": "heureEnvoi", + "type": "varchar(5)", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'09:00'" + }, + "actif": { + "name": "actif", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "derniereExecution": { + "name": "derniereExecution", + "type": "timestamp", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "rappels_id": { + "name": "rappels_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "reponsesQuestionnaires": { + "name": "reponsesQuestionnaires", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "questionnaireId": { + "name": "questionnaireId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "apprenantId": { + "name": "apprenantId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "dateReponse": { + "name": "dateReponse", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "complete": { + "name": "complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "reponsesQuestionnaires_id": { + "name": "reponsesQuestionnaires_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "reponsesQuestions": { + "name": "reponsesQuestions", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "reponseQuestionnaireId": { + "name": "reponseQuestionnaireId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "questionId": { + "name": "questionId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "reponseNumerique": { + "name": "reponseNumerique", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "reponseTexte": { + "name": "reponseTexte", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "reponsesQuestions_id": { + "name": "reponsesQuestions_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "sequences": { + "name": "sequences", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "formationId": { + "name": "formationId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "nom": { + "name": "nom", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "lieu": { + "name": "lieu", + "type": "varchar(500)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "publicCible": { + "name": "publicCible", + "type": "enum('directeur','chef_service','tous','autre')", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "formateurId": { + "name": "formateurId", + "type": "int", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "capaciteMax": { + "name": "capaciteMax", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 12 + }, + "dateBlocage": { + "name": "dateBlocage", + "type": "datetime", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "statut": { + "name": "statut", + "type": "enum('ouverte','bloquee','terminee')", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'ouverte'" + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sequences_id": { + "name": "sequences_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "supportsFormation": { + "name": "supportsFormation", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "sequenceId": { + "name": "sequenceId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "formateurId": { + "name": "formateurId", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "nomFichier": { + "name": "nomFichier", + "type": "varchar(255)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "typeFichier": { + "name": "typeFichier", + "type": "varchar(50)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "tailleFichier": { + "name": "tailleFichier", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "urlFichier": { + "name": "urlFichier", + "type": "varchar(500)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "s3Key": { + "name": "s3Key", + "type": "varchar(500)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "supportsFormation_id": { + "name": "supportsFormation_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": {}, + "checkConstraint": {} + }, + "users": { + "name": "users", + "columns": { + "id": { + "name": "id", + "type": "int", + "primaryKey": false, + "notNull": true, + "autoincrement": true + }, + "openId": { + "name": "openId", + "type": "varchar(64)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "email": { + "name": "email", + "type": "varchar(320)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "username": { + "name": "username", + "type": "varchar(100)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "password": { + "name": "password", + "type": "varchar(255)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "loginMethod": { + "name": "loginMethod", + "type": "varchar(64)", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "role": { + "name": "role", + "type": "enum('user','admin')", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'user'" + }, + "isActive": { + "name": "isActive", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "onUpdate": true, + "default": "(now())" + }, + "lastSignedIn": { + "name": "lastSignedIn", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "(now())" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "users_id": { + "name": "users_id", + "columns": [ + "id" + ] + } + }, + "uniqueConstraints": { + "users_openId_unique": { + "name": "users_openId_unique", + "columns": [ + "openId" + ] + }, + "users_username_unique": { + "name": "users_username_unique", + "columns": [ + "username" + ] + } + }, + "checkConstraint": {} + } + }, + "views": {}, + "_meta": { + "schemas": {}, + "tables": {}, + "columns": {} + }, + "internal": { + "tables": {}, + "indexes": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 59a0efb..16f11cc 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -148,6 +148,13 @@ "when": 1765180630803, "tag": "0020_large_rocket_raccoon", "breakpoints": true + }, + { + "idx": 21, + "version": "5", + "when": 1765183092631, + "tag": "0021_equal_the_fallen", + "breakpoints": true } ] } \ No newline at end of file diff --git a/drizzle/schema.ts b/drizzle/schema.ts index fea5559..c0ad2ee 100644 --- a/drizzle/schema.ts +++ b/drizzle/schema.ts @@ -471,6 +471,10 @@ export const logsRappels = mysqlTable("logsRappels", { messageErreur: text("messageErreur"), /** Date de la première date de la séquence (pour référence) */ dateSequence: timestamp("dateSequence").notNull(), + /** Nombre de tentatives d'envoi */ + nbTentatives: int("nbTentatives").default(1).notNull(), + /** Date du prochain essai en cas d'échec */ + prochainEssai: timestamp("prochainEssai"), createdAt: timestamp("createdAt").defaultNow().notNull(), }); diff --git a/server/_core/index.ts b/server/_core/index.ts index 45e7c2a..c9bf45e 100644 --- a/server/_core/index.ts +++ b/server/_core/index.ts @@ -9,6 +9,7 @@ import { createContext } from "./context"; import localAuthRouter from "./localAuth"; import { serveStatic, setupVite } from "./vite"; import { initRappelScheduler } from "../rappelScheduler"; +import { initRappelRetryScheduler } from "../rappelRetry"; function isPortAvailable(port: number): Promise { return new Promise(resolve => { @@ -66,6 +67,9 @@ async function startServer() { // Initialiser le scheduler de rappels automatiques initRappelScheduler(); + + // Initialiser le scheduler de réessai automatique + initRappelRetryScheduler(); }); } diff --git a/server/rappelDb.ts b/server/rappelDb.ts index 7cd1d41..1f7da15 100644 --- a/server/rappelDb.ts +++ b/server/rappelDb.ts @@ -144,3 +144,185 @@ export async function countRappelsEnvoyesSequence(sequenceId: number): Promise { + const db = await getDb(); + if (!db) return []; + + try { + let query = db.select().from(logsRappels); + + const conditions = []; + if (filters.sequenceId) { + conditions.push(eq(logsRappels.sequenceId, filters.sequenceId)); + } + if (filters.statut) { + conditions.push(eq(logsRappels.statut, filters.statut)); + } + if (filters.email) { + // Note: Drizzle ne supporte pas LIKE directement, on filtre en JS + } + + if (conditions.length > 0) { + query = query.where(and(...conditions)) as any; + } + + let logs = await query.orderBy(logsRappels.dateEnvoi).limit(filters.limit || 100).offset(filters.offset || 0); + + // Filtrer par email si nécessaire + if (filters.email) { + logs = logs.filter(log => log.emailDestinataire.toLowerCase().includes(filters.email!.toLowerCase())); + } + + // Filtrer par date si nécessaire + if (filters.dateDebut) { + logs = logs.filter(log => new Date(log.dateEnvoi) >= filters.dateDebut!); + } + if (filters.dateFin) { + logs = logs.filter(log => new Date(log.dateEnvoi) <= filters.dateFin!); + } + + return logs; + } catch (error) { + console.error("[LogsRappels] Erreur lors de la récupération avec filtres:", error); + return []; + } +} + +/** + * Calcule les statistiques des rappels + */ +export async function getStatsRappels(): Promise<{ + totalEnvoyes: number; + totalSucces: number; + totalEchecs: number; + tauxSucces: number; + emailsProblematiques: Array<{ email: string; nbEchecs: number }>; +}> { + const db = await getDb(); + if (!db) { + return { + totalEnvoyes: 0, + totalSucces: 0, + totalEchecs: 0, + tauxSucces: 0, + emailsProblematiques: [], + }; + } + + try { + const logs = await db.select().from(logsRappels); + + const totalEnvoyes = logs.length; + const totalSucces = logs.filter(l => l.statut === "success").length; + const totalEchecs = logs.filter(l => l.statut === "failed").length; + const tauxSucces = totalEnvoyes > 0 ? (totalSucces / totalEnvoyes) * 100 : 0; + + // Compter les échecs par email + const echecsParEmail = new Map(); + logs.filter(l => l.statut === "failed").forEach(log => { + const count = echecsParEmail.get(log.emailDestinataire) || 0; + echecsParEmail.set(log.emailDestinataire, count + 1); + }); + + const emailsProblematiques = Array.from(echecsParEmail.entries()) + .map(([email, nbEchecs]) => ({ email, nbEchecs })) + .sort((a, b) => b.nbEchecs - a.nbEchecs) + .slice(0, 10); // Top 10 + + return { + totalEnvoyes, + totalSucces, + totalEchecs, + tauxSucces, + emailsProblematiques, + }; + } catch (error) { + console.error("[LogsRappels] Erreur lors du calcul des statistiques:", error); + return { + totalEnvoyes: 0, + totalSucces: 0, + totalEchecs: 0, + tauxSucces: 0, + emailsProblematiques: [], + }; + } +} + +/** + * Récupère l'évolution des envois par jour + */ +export async function getEvolutionEnvois(): Promise> { + const db = await getDb(); + if (!db) return []; + + try { + const logs = await db.select().from(logsRappels).orderBy(logsRappels.dateEnvoi); + + // Grouper par jour + const parJour = new Map(); + + logs.forEach(log => { + const dateStr = new Date(log.dateEnvoi).toISOString().split('T')[0]; + const stats = parJour.get(dateStr) || { nbEnvoyes: 0, nbSucces: 0, nbEchecs: 0 }; + stats.nbEnvoyes++; + if (log.statut === "success") stats.nbSucces++; + else stats.nbEchecs++; + parJour.set(dateStr, stats); + }); + + return Array.from(parJour.entries()) + .map(([date, stats]) => ({ date, ...stats })) + .sort((a, b) => a.date.localeCompare(b.date)); + } catch (error) { + console.error("[LogsRappels] Erreur lors de la récupération de l'évolution:", error); + return []; + } +} + +/** + * Récupère les logs échoués à réessayer + */ +export async function getLogsAReessayer(): Promise { + const db = await getDb(); + if (!db) return []; + + try { + const maintenant = new Date(); + const logs = await db + .select() + .from(logsRappels) + .where( + and( + eq(logsRappels.statut, "failed"), + // Limiter à 3 tentatives maximum + ) + ); + + // Filtrer en JS pour les conditions complexes + return logs.filter(log => { + if (log.nbTentatives >= 3) return false; + if (!log.prochainEssai) return true; // Premier essai + return new Date(log.prochainEssai) <= maintenant; + }); + } catch (error) { + console.error("[LogsRappels] Erreur lors de la récupération des logs à réessayer:", error); + return []; + } +} diff --git a/server/rappelRetry.ts b/server/rappelRetry.ts new file mode 100644 index 0000000..63cd7da --- /dev/null +++ b/server/rappelRetry.ts @@ -0,0 +1,226 @@ +import { getDb } from "./db"; +import { logsRappels, sequences, inscriptions, apprenants, formations, datesFormation, rappels, formateurs } from "../drizzle/schema"; +import { eq, and } from "drizzle-orm"; +import { sendRappelJ7Email, sendRappelJ1Email } from "./emailService"; +import { getLogsAReessayer } from "./rappelDb"; +import { notifyOwner } from "./_core/notification"; + +/** + * Calcule le délai avant le prochain essai selon le nombre de tentatives + * Délai exponentiel : 1h, 4h, 24h + */ +function calculerProchainEssai(nbTentatives: number): Date { + const maintenant = new Date(); + let delaiHeures = 1; // 1 heure par défaut + + if (nbTentatives === 1) { + delaiHeures = 1; // 1ère tentative échouée → réessayer dans 1h + } else if (nbTentatives === 2) { + delaiHeures = 4; // 2ème tentative échouée → réessayer dans 4h + } else { + delaiHeures = 24; // 3ème tentative échouée → réessayer dans 24h (mais on arrête à 3) + } + + maintenant.setHours(maintenant.getHours() + delaiHeures); + return maintenant; +} + +/** + * Réessaye d'envoyer les rappels échoués + */ +export async function processRappelRetry() { + console.log("[Rappels Retry] Démarrage du processus de réessai"); + + const db = await getDb(); + if (!db) { + console.error("[Rappels Retry] Base de données non disponible"); + return; + } + + try { + // Récupérer les logs à réessayer + const logsAReessayer = await getLogsAReessayer(); + + if (logsAReessayer.length === 0) { + console.log("[Rappels Retry] Aucun rappel à réessayer"); + return; + } + + console.log(`[Rappels Retry] ${logsAReessayer.length} rappel(s) à réessayer`); + + let nbSucces = 0; + let nbEchecs = 0; + + for (const log of logsAReessayer) { + try { + // Récupérer les informations de la séquence + const sequence = await db + .select() + .from(sequences) + .where(eq(sequences.id, log.sequenceId)) + .limit(1); + + if (sequence.length === 0) { + console.warn(`[Rappels Retry] Séquence ${log.sequenceId} introuvable`); + continue; + } + + const seq = sequence[0]; + + // Récupérer la formation + const formation = await db + .select() + .from(formations) + .where(eq(formations.id, seq.formationId)) + .limit(1); + + if (formation.length === 0) { + console.warn(`[Rappels Retry] Formation ${seq.formationId} introuvable`); + continue; + } + + // Récupérer l'apprenant + const apprenant = await db + .select() + .from(apprenants) + .where(eq(apprenants.id, log.apprenantId)) + .limit(1); + + if (apprenant.length === 0 || !apprenant[0].email) { + console.warn(`[Rappels Retry] Apprenant ${log.apprenantId} introuvable ou sans email`); + continue; + } + + // Récupérer les dates de la séquence + const dates = await db + .select() + .from(datesFormation) + .where(eq(datesFormation.sequenceId, seq.id)) + .orderBy(datesFormation.ordre); + + // Récupérer le formateur si disponible + let formateurNom = ""; + if (seq.formateurId) { + const formateur = await db + .select() + .from(formateurs) + .where(eq(formateurs.id, seq.formateurId)) + .limit(1); + if (formateur.length > 0) { + formateurNom = formateur[0].nom; + } + } + + // Réessayer l'envoi + try { + if (log.typeRappel === "rappel") { + await sendRappelJ7Email({ + apprenantEmail: apprenant[0].email, + apprenantPrenom: apprenant[0].prenom, + apprenantNom: apprenant[0].nom, + apprenantFonction: apprenant[0].fonction, + formationNom: formation[0].nom, + sequenceNom: seq.nom, + dates: dates.map(d => ({ + dateDebut: d.dateDebut, + dateFin: d.dateFin, + ordre: d.ordre + })), + lieu: seq.lieu || "", + }); + } else if (log.typeRappel === "rappelJ1") { + await sendRappelJ1Email({ + apprenantEmail: apprenant[0].email, + apprenantPrenom: apprenant[0].prenom, + apprenantNom: apprenant[0].nom, + apprenantFonction: apprenant[0].fonction, + formationNom: formation[0].nom, + sequenceNom: seq.nom, + dates: dates.map(d => ({ + dateDebut: d.dateDebut, + dateFin: d.dateFin, + ordre: d.ordre + })), + lieu: seq.lieu || "", + }); + } + + // Succès : mettre à jour le log + await db + .update(logsRappels) + .set({ + statut: "success", + nbTentatives: log.nbTentatives + 1, + prochainEssai: null, + }) + .where(eq(logsRappels.id, log.id)); + + console.log(`[Rappels Retry] Succès pour ${apprenant[0].email} après ${log.nbTentatives + 1} tentative(s)`); + nbSucces++; + } catch (emailError: any) { + const messageErreur = emailError?.message || String(emailError); + const nouvelleTentative = log.nbTentatives + 1; + + if (nouvelleTentative >= 3) { + // Abandon après 3 tentatives + await db + .update(logsRappels) + .set({ + statut: "failed", + nbTentatives: nouvelleTentative, + messageErreur: `Abandon après 3 tentatives: ${messageErreur}`, + prochainEssai: null, + }) + .where(eq(logsRappels.id, log.id)); + + console.error(`[Rappels Retry] Abandon pour ${apprenant[0].email} après 3 tentatives`); + + // Notifier l'admin + await notifyOwner({ + title: `❌ Abandon d'envoi de rappel`, + content: `Le rappel pour ${apprenant[0].email} (${seq.nom}) a échoué 3 fois et a été abandonné.\\n\\nDernière erreur: ${messageErreur}`, + }); + } else { + // Planifier un nouvel essai + const prochainEssai = calculerProchainEssai(nouvelleTentative); + await db + .update(logsRappels) + .set({ + nbTentatives: nouvelleTentative, + messageErreur: messageErreur, + prochainEssai: prochainEssai, + }) + .where(eq(logsRappels.id, log.id)); + + console.log(`[Rappels Retry] Échec pour ${apprenant[0].email}, tentative ${nouvelleTentative}/3. Prochain essai: ${prochainEssai.toLocaleString()}`); + } + nbEchecs++; + } + } catch (error) { + console.error(`[Rappels Retry] Erreur lors du traitement du log ${log.id}:`, error); + } + } + + console.log(`[Rappels Retry] Traitement terminé: ${nbSucces} succès, ${nbEchecs} échecs`); + } catch (error) { + console.error("[Rappels Retry] Erreur lors du processus de retry:", error); + } +} + +/** + * Initialise le scheduler de retry + * Vérifie toutes les heures s'il y a des rappels à réessayer + */ +export function initRappelRetryScheduler() { + console.log("[Rappels Retry] Initialisation du scheduler de réessai automatique"); + + // Exécuter immédiatement au démarrage + processRappelRetry(); + + // Puis exécuter toutes les heures + setInterval(() => { + processRappelRetry(); + }, 60 * 60 * 1000); // 1 heure en millisecondes + + console.log("[Rappels Retry] Scheduler de réessai initialisé - vérification toutes les heures"); +} diff --git a/server/routers.ts b/server/routers.ts index 2983dde..83392b6 100644 --- a/server/routers.ts +++ b/server/routers.ts @@ -974,6 +974,39 @@ export const appRouter = router({ }); } }), + + historique: adminProcedure + .input(z.object({ + dateDebut: z.string().optional(), + dateFin: z.string().optional(), + sequenceId: z.number().optional(), + statut: z.enum(['success', 'failed']).optional(), + email: z.string().optional(), + limit: z.number().default(100), + offset: z.number().default(0), + })) + .query(async ({ input }) => { + const { getLogsRappelsWithFilters } = await import('./rappelDb'); + return getLogsRappelsWithFilters({ + dateDebut: input.dateDebut ? new Date(input.dateDebut) : undefined, + dateFin: input.dateFin ? new Date(input.dateFin) : undefined, + sequenceId: input.sequenceId, + statut: input.statut, + email: input.email, + limit: input.limit, + offset: input.offset, + }); + }), + + statistiques: adminProcedure.query(async () => { + const { getStatsRappels } = await import('./rappelDb'); + return getStatsRappels(); + }), + + evolution: adminProcedure.query(async () => { + const { getEvolutionEnvois } = await import('./rappelDb'); + return getEvolutionEnvois(); + }), }), emailConfig: router({ diff --git a/todo.md b/todo.md index eab3a22..b322b18 100644 --- a/todo.md +++ b/todo.md @@ -96,3 +96,32 @@ - [x] Créer la fonction de notification admin - [x] Intégrer les notifications dans le catch des erreurs d'envoi - [x] Ajouter un résumé des échecs dans les logs + +## Historique et statistiques des rappels + +### Backend +- [x] Créer les fonctions de récupération des logs avec filtres +- [x] Créer les fonctions de statistiques (taux succès, emails problématiques) +- [x] Ajouter les procédures tRPC pour l'historique +- [x] Ajouter les procédures tRPC pour les statistiques + +### Page d'historique +- [x] Créer AdminRappelsHistorique.tsx avec tableau des logs +- [x] Ajouter les filtres (date, séquence, statut, email) +- [x] Ajouter la recherche par email +- [x] Ajouter la pagination +- [x] Ajouter la route dans App.tsx + +### Tableau de bord statistiques +- [x] Créer AdminRappelsStats.tsx avec cartes de statistiques +- [x] Ajouter le graphique d'évolution des envois +- [x] Ajouter le graphique du taux de succès +- [x] Ajouter la liste des emails problématiques +- [x] Ajouter la route dans App.tsx + +### Système de réessai automatique +- [x] Ajouter le champ nbTentatives dans logsRappels +- [x] Ajouter le champ prochainEssai dans logsRappels +- [x] Créer la fonction de retry avec délai exponentiel +- [x] Intégrer le retry dans rappelScheduler +- [x] Limiter à 3 tentatives maximum