Merge pull request #9 from ungdev/prod

Update dev

Author: MaxouTigrou

backend/package-lock.json

@@ -19,11 +19,11 @@
   "description": "",
   "dependencies": {
     "@electric-sql/pglite": "^0.2.17",
+    "@types/multer": "^1.4.12",
     "axios": "^1.8.4",
     "bcryptjs": "^3.0.2",
     "big-integer": "^1.6.52",
     "cors": "^2.8.5",
-    "crypto": "^1.0.1",
     "dotenv": "^16.5.0",
     "drizzle-kit": "^0.30.6",
     "drizzle-orm": "^0.41.0",
@@ -34,16 +34,20 @@
     "handlebars": "^4.7.8",
     "jsdom": "^26.1.0",
     "jsonwebtoken": "^9.0.2",
+    "multer": "^1.4.5-lts.2",
     "nodemailer": "^6.10.1",
+    "papaparse": "^5.5.2",
     "pg": "^8.14.1",
     "pg-promise": "^11.13.0",
     "postgres": "^3.4.5",
+    "randombytes": "^2.1.0",
     "randomstring": "^1.3.1"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.1",
     "@types/node": "^22.14.1",
+    "@types/papaparse": "^5.3.15",
     "@types/pg": "^8.11.12",
     "nodemon": "^3.1.9",
     "ts-node": "^10.9.2",

backend/package.json

@@ -2,6 +2,10 @@ import { Request, Response } from "express";
 import * as permanence_service from "../services/permanence.service";
 import { Ok, Error } from "../utils/responses";
 
+interface MulterRequest extends Request {
+  file?: Express.Multer.File;
+}
+
 // Validation des données de permanence
 const validatePermanenceData = (start_at: string, end_at: string) => {
   const startDate = new Date(start_at);
@@ -295,4 +299,19 @@ export const removeUserToPermanence = async (req: Request, res: Response) => {
     }
 };
 
+export const uploadPermanencesCSV = async (req: MulterRequest, res: Response) => {
+  try {
+    const file = req.file;
+    if (!file) {
+      Error(res, { msg: "Fichier CSV manquant." });
+    }
+
+    await permanence_service.importPermanencesFromCSV(file.path);
+    Ok(res,{ msg: "Importation réalisée avec succès." });
+  } catch (error) {
+    console.error("Erreur import CSV :", error);
+    Error(res, { msg: "Échec de l'importation." });
+  }
+};
+
 

backend/src/controllers/permanence.controller.ts

@@ -19,7 +19,7 @@ export const createNewTeam = async (req: Request, res: Response) => {
             Error(res, { msg: "Il n'y a pas assez de membre dans l'équipe." });
             return;
         }
-        if(members.length >= 5){
+        if(members.length > 5){
             Error(res, { msg: "Il y a trop de membre dans l'équipe." });
             return;
         }

backend/src/controllers/team.controller.ts

@@ -34,10 +34,13 @@ export const getUsersByPermission = async (req: Request, res: Response) => {
 
 
 export const syncNewstudent = async (req: Request, res: Response) => {
+
+  const {date} = req.body;
+
   try {
 
       const token = await SIEP_Utils.getTokenUTTAPI();
-      const newStudents = await SIEP_Utils.getNewStudentsFromUTTAPI(token);
+      const newStudents = await SIEP_Utils.getNewStudentsFromUTTAPI(token, date);
       //const newStudentfiltered = newStudents.filter((student : any) => !noSyncEmails.includes(student.email));
 
       newStudents.forEach( async (element: any) => {

backend/src/controllers/user.controller.ts

@@ -1,6 +1,4 @@
 import { Request, Response, NextFunction } from 'express';
-import jwt from 'jsonwebtoken';
-import { jwtSecret } from '../utils/secret';
 import { Unauthorized } from '../utils/responses';
 
 // Middleware pour vérifier le rôle

backend/src/middlewares/user.middleware.ts

@@ -1,8 +1,10 @@
 import express from "express";
+import multer from "multer";
 import * as permanenceController from "../controllers/permanence.controller";
 import { checkRole } from "../middlewares/user.middleware";
 
 const permanenceRouter = express.Router();
+const upload = multer({ dest: "uploads/" });
 
 // Admin routes
 permanenceRouter.post("/admin/permanence", checkRole("Admin"), permanenceController.createPermanence);
@@ -14,6 +16,7 @@ permanenceRouter.get("/admin/permanences", checkRole("Admin"), permanenceControl
 permanenceRouter.get("/admin/users", checkRole("Admin"), permanenceController.getUsersInPermanence);
 permanenceRouter.post("/admin/add", checkRole("Admin"), permanenceController.addUserToPermanence);
 permanenceRouter.post("/admin/remove", checkRole("Admin"), permanenceController.removeUserToPermanence);
+permanenceRouter.post("/admin/importpermanences", upload.single("file"), permanenceController.uploadPermanencesCSV);
 
 
 // Student routes

backend/src/routes/permanences.routes.ts

@@ -1,7 +1,7 @@
 import { db } from '../database/db'
 import bcrypt from 'bcryptjs';
 import jwt from 'jsonwebtoken';
-import crypto from "crypto";
+import rdmb from "randombytes";
 import { JSDOM } from 'jsdom';
 import { cas_validate_url, jwtSecret, service_url } from '../utils/secret';
 import * as userservice from './user.service';
@@ -139,7 +139,7 @@ export const completeRegistration = async(token : string, password : string) =>
 }
 
 export const createRegistrationToken = async(userId: number) => {
-  const token = crypto.randomBytes(32).toString("hex"); // Jeton bien sécurisé
+  const token = rdmb.randomBytes(32).toString("hex"); // Jeton bien sécurisé
   const expiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 90); // 90Jours
 
   await db.insert(registrationSchema).values({

backend/src/services/auth.service.ts

@@ -1,9 +1,21 @@
+import fs from "fs";
+import Papa from "papaparse";
 import { and, count, eq, sql } from "drizzle-orm";
 import { userSchema } from "../schemas/Basic/user.schema";
 import { permanenceSchema } from "../schemas/Basic/permanence.schema";
 import { db } from "../database/db";
 import { userPermanenceSchema } from "../schemas/Relational/userpermanences.schema";
 
+type CsvPermanence = {
+  name: string;
+  description: string;
+  location: string;
+  start_at: string; // ISO string
+  end_at: string;
+  capacity: string;
+  is_open: string; // 'true' or 'false'
+};
+
 // Classes d'erreurs personnalisées
 class UnauthorizedError extends Error {}
 class AlreadyRegisteredError extends Error {}
@@ -250,4 +262,30 @@ export const getAllPermanencesWithUsers = async () => {
     );
 
     return results;
-  };
+};
+
+export const importPermanencesFromCSV = async (filePath: string): Promise<void> => {
+  const fileContent = fs.readFileSync(filePath, "utf8");
+
+  const { data, errors } = Papa.parse<CsvPermanence>(fileContent, {
+    header: true,
+    skipEmptyLines: true,
+  });
+
+  if (errors.length > 0) {
+    console.error("CSV parsing errors:", errors);
+    throw new Error("Erreur lors du parsing du CSV.");
+  }
+
+  const parsedData = data.map((r) => ({
+    name: r.name,
+    description: r.description,
+    location: r.location,
+    start_at: new Date(r.start_at),
+    end_at: new Date(r.end_at),
+    capacity: parseInt(r.capacity, 10),
+    is_open: r.is_open?.toLowerCase() === "true",
+  }));
+
+  await db.insert(permanenceSchema).values(parsedData);
+};

backend/src/services/permanence.service.ts

@@ -18,14 +18,14 @@ export const getTokenUTTAPI = async() => {
       }
 }
 
-export const getNewStudentsFromUTTAPI = async (token: string) => {
+export const getNewStudentsFromUTTAPI = async (token: string, date : string) => {
   const allNewStudents: any[] = [];
   let currentPage = 1;
   let hasNextPage = true;
 
   try {
     while (hasNextPage) {
-      const response = await axios.get(`${api_utt_admis_url_ismajor}?page=${currentPage}`, {
+      const response = await axios.get(api_utt_admis_url_ismajor+date+"?page="+currentPage, {
         headers: {
           Authorization: `Bearer ${token}`,
         },

backend/src/utils/siep.ts

@@ -40,7 +40,7 @@ const App: React.FC = () => {
         <Route path="/admin/teams" element={<AdminRoute><AdminPageTeam /></AdminRoute>} />
         <Route path="/admin/factions" element={<AdminRoute><AdminPageFaction /></AdminRoute>} />
         <Route path="/admin/shotgun" element={<AdminRoute><AdminPageShotgun /></AdminRoute>} />
-        <Route path="/admin/export" element={<AdminRoute><AdminPageExport /></AdminRoute>} />
+        <Route path="/admin/export-import" element={<AdminRoute><AdminPageExport /></AdminRoute>} />
         <Route path="/admin/permanences" element={<AdminRoute><AdminPagePerm /></AdminRoute>} />
         <Route path="/admin/challenge" element={<AdminRoute><AdminPageChall /></AdminRoute>} />
         <Route path="/admin/email" element={<AdminRoute><AdminPageEmail /></AdminRoute>} />