Hope it would work (#16)

* Typescript api initialzed

* Update README

* Add license file

* Task in progress

* Project task completed

* Task in progress

* Auth management + basic seed task completed

* Add middleware with roles guard

* Update README file

* Update tsconfig

* Reproduced entities

* improved package.json

* just changed name for more flexibility

* Fixed datasource to run migrations

* Added services

* Added class-validator and Dtos

* Added controller

* Added routes

* Pushed router to index.ts

* Added and tested seeder

* Testing swagger integration

* Merging local devs to master (#4)

* Dev (#2)

* Typescript api initialzed

* Update README

* Add license file

* Task in progress

* Project task completed

* Task in progress

* Auth management + basic seed task completed

* Add middleware with roles guard

* Update README file

* Update tsconfig

---------

Co-authored-by: mbradiouf14 <[email protected]>
Co-authored-by: bradlab <[email protected]>

* Reproduced entities

* improved package.json

* just changed name for more flexibility

* Fixed datasource to run migrations

* Added services

* Added class-validator and Dtos

* Added controller

* Added routes

* Pushed router to index.ts

* Added and tested seeder

* Testing swagger integration

---------

Co-authored-by: KARBOU Aristide <[email protected]>
Co-authored-by: mbradiouf14 <[email protected]>
Co-authored-by: bradlab <[email protected]>

* Reproduced entities

* improved package.json

* just changed name for more flexibility

# Conflicts:
#	src/config/data-source.ts
#	src/controllers/auth.controller.ts
#	src/controllers/user.controllers.ts
#	src/dto/user.dto.ts
#	src/index.ts
#	src/middleware/authorization.ts
#	src/routes/user.routes.ts
dd

* Added services

* Added class-validator and Dtos

* Added controller

* Added routes

* Pushed router to index.ts

* Added and tested seeder

* Init

* Merged completely with devmain

* User entity rename file

* User entity removed

* Rename Subject to Course + Add auth and users swagger doc

* Add swagger for all models and routes

* Add DTO validator on Auth and User routes

* Fixed env variables

* Added vercel support

* Mind delete yarn

* Delete yarn.lock

* Adapting ts

* Testing in local

* Fixed vercel.json

* servless ready

* Testing gpt fix

* Desparate fix

* Desparate fix

* servless ready

---------

Co-authored-by: mbradiouf14 <[email protected]>
Co-authored-by: bradlab <[email protected]>
Co-authored-by: KARBOU Aristide <[email protected]>

Author: 4 people

.example.env

@@ -1,6 +1,6 @@
 PORT = 19200
-DB_HOST = localhost
-DB_PORT = 5432
+DATABASE_URL = localhost
+POSTGRES_URL = 5432
 DB_USERNAME = postgres
 DB_PASSWORD = 123456789
 DB_DATABASE = step

.gitignore

@@ -1,9 +1,24 @@
-.idea/
-.vscode/
+# Node
 node_modules/
+npm-debug.log*
+
+# Build output
 build/
-tmp/
-temp/
 
 # Env
 .env
+.env.*.local
+
+# Vercel
+.vercel/
+
+# Logs
+logs/
+*.log
+
+# MacOS
+.DS_Store
+
+# IDE
+.vscode/
+.idea/

package-lock.json

@@ -5,10 +5,10 @@
    "type": "commonjs",
    "scripts": {
       "watch": "tsc -w",
-      "dev": "nodemon",
-      "start:dev": "concurrently \"tsc -w\" \"nodemon build/index.js\"",
       "build": "tsc",
-      "start": "ts-node src/index.ts",
+      "vercel-build": "npm run build",
+      "dev": "ts-node src/index.ts",
+      "start": "node build/index.js",
       "typeorm": "typeorm-ts-node-commonjs",
       "migration:create": "typeorm migration:create src/migration/MigrationName -- -d src/config/data-source.ts",
       "migration:generate": "npm run typeorm migration:generate src/migration/generated -- -d src/config/data-source.ts",
@@ -25,7 +25,7 @@
       "concurrently": "^9.1.2",
       "nodemon": "^3.1.8",
       "ts-node": "10.7.0",
-      "typescript": "4.5.2"
+      "typescript": "^5.8.3"
    },
    "dependencies": {
       "@types/cors": "^2.8.15",

package.json

@@ -2,14 +2,14 @@
 ' *************** Entités de la structure de l'organisation ***************
 
 class Organisation {
-  - nom : String
+  - name : String
   - universites : List<Universite>
 }
 
 class Universite {
-  - nom : String
+  - name : String
   - departements : List<Departement>
-  - responsableUniversite : User
+  - responsable : User
 }
 
 class User {
@@ -19,26 +19,27 @@ class User {
   - email : String
   - password : String
   - role : String "USER, ADMIN, TEACHER, DELEGATE, SUPERVISOR"
-  - subjects : List<Subject>
+  - subjects : List<Course>
   - programme : Programme
 }
 
 class Departement {
-  - nom : String
-  - programmes : List<Programme>
+  - name : String
+  - programs : List<Programme>
 }
 
 class Programme {
-  - nom : String
-  - subjects : List<Subject>
+  - name : String
+  - subjects : List<Course>
 }
 
 class AcademicYear {
   - periode : String  "ex: 2024-2025"
 }
 
-class Subject {
-  - nom : String
+' **** Cours ou Matière ****
+class Course {
+  - name : String
   - volumeHoraire : int
 }
 
@@ -49,7 +50,7 @@ class ClassSession {
   - heureDebut : Time
   - heureFin : Time
   - academicYear : AcademicYear
-  - subject : Subject
+  - subject : Course
   - professor : User
   - classRepresentative : User
 }
@@ -58,15 +59,15 @@ class ClassSession {
 
 class Emargement {
   - id : String
-  - timestamp : DateTime
+  - createdAt : DateTime
   - status : String  "En attente, Présent, Signalé absent"
   - classSession : ClassSession
   - professor : User
 }
 
 class Notification {
   - id : String
-  - timestamp : DateTime
+  - createdAt : DateTime
   - message : String
   - status : String  "Envoyée, Confirmée"
   - emargement : Emargement
@@ -78,11 +79,11 @@ class Notification {
 Organisation "1" -- "1..*" Universite : contient
 Universite "1" -- "1..*" Departement : comprend
 Departement "1" -- "1..*" Programme : offre
-Programme "1" -- "1..*" Subject : propose
+Programme "1" -- "1..*" Course : propose
 Universite "1" -- "1" User : gérée_par
 
 ClassSession "1" -- "1" AcademicYear : planifiée_dans
-ClassSession "1" -- "1" Subject : concerne
+ClassSession "1" -- "1" Course : concerne
 ClassSession "1" -- "1" User : donné_par
 ClassSession "1" -- "1" User : validée_par
 

resources/schema.puml

@@ -1,33 +1,41 @@
 import "reflect-metadata"
-import { DataSource } from "typeorm"
+import { DataSource } from "typeorm";
 import * as dotenv from "dotenv";
-import {AcademicYear} from "../entity/AcademicYear.entity";
-import {Organisation} from "../entity/Organisation.entity";
-import {Universite} from "../entity/Universite.entity";
-import {Departement} from "../entity/Departement.entity";
-import {Programme} from "../entity/Programme.entity";
-import {ClassSession} from "../entity/ClassSession.entity";
-import {Subject} from "../entity/Subject.entity";
-import {Emargement} from "../entity/Emargement.entity";
-import {Notification} from "../entity/Notification.entity";
-import { User } from "../entity/User.entity"
+import { AcademicYear } from "../entity/AcademicYear.entity";
+import { Organisation } from "../entity/Organisation.entity";
+import { Universite } from "../entity/Universite.entity";
+import { Departement } from "../entity/Departement.entity";
+import { Programme } from "../entity/Programme.entity";
+import { ClassSession } from "../entity/ClassSession.entity";
+import { Course } from "../entity/Course.entity";
+import { Emargement } from "../entity/Emargement.entity";
+import { Notification } from "../entity/Notification.entity";
+import { User } from "../entity/User.entity";
 
-dotenv.config();
+dotenv.config()
+
+const isDev = process.env.NODE_ENV === "dev"
 
-const { DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_DATABASE, NODE_ENV } =
-  process.env;
 
 export const AppDataSource = new DataSource({
   type: "postgres",
-  host: DB_HOST,
-  port: parseInt(DB_PORT || "5432"),
-  username: DB_USERNAME,
-  password: DB_PASSWORD,
-  database: DB_DATABASE,
-  synchronize: NODE_ENV === "dev" ? true : false,
-  logging: NODE_ENV === "dev" ? false : false,
-  entities: [Organisation, Universite,Departement,Programme,AcademicYear, ClassSession, Subject,Emargement, Notification, User],
-  migrations: ["src/migration/*.ts"],
+  url: process.env.DATABASE_URL || process.env.POSTGRES_URL,
+  synchronize: isDev,
+  logging: isDev,
+  ssl: !isDev ? { rejectUnauthorized: false } : false, // important pour Neon
+  entities: [
+    Organisation,
+    Universite,
+    Departement,
+    Programme,
+    AcademicYear,
+    ClassSession,
+    Course,
+    Emargement,
+    Notification,
+    User,
+  ],
+  migrations: [__dirname + "/migration/*.ts"],
   subscribers: [],
 });
 
@@ -38,4 +46,4 @@ export const connectDB = async () => {
   } catch (error) {
     console.error("Database connection failed:", error);
   }
-};
+};

src/config/data-source.ts

@@ -0,0 +1,51 @@
+import { Request, Response } from "express";
+import { CourseService } from "../services/course.service";
+
+const courseService = new CourseService();
+
+export const createCourse = async (req: Request, res: Response) => {
+    try {
+        const course = await courseService.createCourse(req.body);
+        res.status(201).json(course);
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la création de la matière", error });
+    }
+};
+
+export const getCourseById = async (req: Request, res: Response) => {
+    try {
+        const course = await courseService.getCourseById(req.params.id);
+        if (!course) return res.status(404).json({ message: "Matière non trouvée" });
+        res.json(course);
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la récupération de la matière", error });
+    }
+};
+
+export const getAllCourses = async (req: Request, res: Response) => {
+    try {
+        const courses = await courseService.getAllCourses();
+        res.json(courses);
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la récupération des matières", error });
+    }
+};
+
+export const updateCourse = async (req: Request, res: Response) => {
+    try {
+        const course = await courseService.updateCourse(req.params.id, req.body);
+        if (!course) return res.status(404).json({ message: "Matière non trouvée" });
+        res.json(course);
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la mise à jour de la matière", error });
+    }
+};
+
+export const deleteCourse = async (req: Request, res: Response) => {
+    try {
+        await courseService.deleteCourse(req.params.id);
+        res.status(204).send();
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la suppression de la matière", error });
+    }
+};

src/controllers/course.controller.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from "express";
 import { EmargementService } from "../services/emargement.service";
+import { EmargementStatus } from "../entity/Emargement.entity";
 
 const emargementService = new EmargementService();
 
@@ -41,6 +42,16 @@ export const updateEmargement = async (req: Request, res: Response) => {
     }
 };
 
+export const setEmargementState = async (req: Request, res: Response) => {
+    try {
+        const emargement = await emargementService.setStatus(req.params.id, req.params.status as EmargementStatus);
+        if (!emargement) return res.status(404).json({ message: "Émargement non trouvé" });
+        res.json(emargement);
+    } catch (error) {
+        res.status(500).json({ message: "Erreur lors de la mise à jour de l'état de l'émargement", error });
+    }
+};
+
 export const deleteEmargement = async (req: Request, res: Response) => {
     try {
         await emargementService.deleteEmargement(req.params.id);

src/controllers/emargement.controller.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import * as cache from "memory-cache";
 import { UserService } from "../services/user.service";
 import { CreateUserDto } from "../dto/user.dto";
-import {User} from "../entity/User.entity";
+import { UserFactory } from "../factory/user.factory";
 
 const userService = new UserService();
 
@@ -14,7 +14,7 @@ export const createUser = async (req: Request, res: Response) => {
     if (existingUser) {
       return res.status(409).json({ message: "Email already exists!" });
     }
-    const userData: Partial<User> = {
+    const userData: CreateUserDto = {
       name: data.name,
       email: data.email,
       phone: data.phone,
@@ -25,7 +25,7 @@ export const createUser = async (req: Request, res: Response) => {
     // Créer l'utilisateur
     const user = await userService.createUser(userData);
     // Renvoie l'utilisateur créé sans le mot de passe
-    return res.status(201).json({ ...user, password: undefined });
+    return res.status(201).json(UserFactory.getUser(user));
   } catch (error) {
     return res.status(500).json({ message: "Erreur lors de la création de l'utilisateur", error });
   }
@@ -35,7 +35,7 @@ export const getUserById = async (req: Request, res: Response) => {
   try {
     const user = await userService.getUserById(req.params.id);
     if (!user) return res.status(404).json({ message: "Utilisateur non trouvé" });
-    return res.json(user);
+    return res.json(UserFactory.getUserDeeply(user));
   } catch (error) {
     return res.status(500).json({ message: "Erreur lors de la récupération de l'utilisateur", error });
   }
@@ -53,7 +53,7 @@ export const getAllUsers = async (req: Request, res: Response) => {
     const users = await userService.getAllUsers();
     // Stocke les utilisateurs en cache pour 6000 ms (6 secondes)
     cache.put(cacheKey, users, 6000);
-    return res.status(200).json(users);
+    return res.status(200).json(UserFactory.getUsers(users));
   } catch (error) {
     return res.status(500).json({ message: "Erreur lors de la récupération des utilisateurs", error });
   }
@@ -78,7 +78,7 @@ export const updateUser = async (req: Request, res: Response) => {
     const updatedUser = await userService.updateUser(id, req.body);
     // Vider le cache pour forcer l'actualisation
     cache.del("users-list");
-    return res.status(200).json(updatedUser);
+    return res.status(200).json(UserFactory.getUser(updatedUser));
   } catch (error) {
     return res.status(500).json({ message: "Erreur lors de la mise à jour de l'utilisateur", error });
   }
@@ -105,7 +105,7 @@ export const getUserByEmail = async (req: Request, res: Response) => {
   try {
     const user = await userService.getUserByEmail(req.params.email);
     if (!user) return res.status(404).json({ message: "Utilisateur non trouvé" });
-    return res.json(user);
+    return res.json(UserFactory.getUser(user));
   } catch (error) {
     return res.status(500).json({ message: "Erreur lors de la récupération de l'utilisateur", error });
   }