diff --git a/src/routes/user/user.service.ts b/src/routes/user/user.service.ts
index eaa6e3b..f9739c2 100644
--- a/src/routes/user/user.service.ts
+++ b/src/routes/user/user.service.ts
@@ -1,34 +1,85 @@
-import { Injectable } from '@nestjs/common';
+import { ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { RoleType, Users } from "src/entities/users.entity";
+import { Repository } from "typeorm";
+import { CreateUserDto } from "./dto/create_user.dto";
+import * as bcrypt from 'bcrypt';
+import { UpdateUserDto } from "./dto/update_user.dto";
 
 @Injectable()
 export class UserService {
-    private users = [
-        { id: 1, email: 'alice@example.com' },
-        { id: 2, email: 'bob@example.com' },
-    ];
+    constructor(
+        @InjectRepository(Users)
+        private readonly usersRepository: Repository<Users>
+    ) { }
 
-    //Methode pour trouver tous les utilisateurs
-    findAll() {
-        return this.users;
+    //Creation utilisateur
+    async create(dto: CreateUserDto, currentUser?: Users): Promise<Users> {
+        //Securiser les roles
+        if (!currentUser || currentUser.role !== RoleType.SUPER_ADMIN) {
+            dto.role = RoleType.PARENT; //Forcer le role parent si pas super admin
+        }
+
+        //Hash mot de passe
+        const salt = await bcrypt.genSalt();
+        const password_hash = await bcrypt.hash(dto.password, salt);
+        const user = this.usersRepository.create({
+            email: dto.email,
+            password_hash,
+            first_name: dto.first_name,
+            last_name: dto.last_name,
+            role: dto.role,
+            status: dto.status,
+            gender: dto.gender,
+            phone: dto.phone,
+            address: dto.address,
+            photo_url: dto.photo_url,
+            consent_photo: dto.consent_photo ?? false,
+            consent_photo_at: dto.consent_photo_at ? new Date(dto.consent_photo_at) : undefined,
+            must_change_password: dto.must_change_password ?? false
+
+        })
+        return this.usersRepository.save(user);
     }
 
-    //Methode pour trouver un utilisateur par ID
-    findOneById(id: number) {
-        return this.users.find(user => user.id === id);
+    //Lister tous les utilisateurs
+    async findAll(): Promise<Users[]> {
+        return this.usersRepository.find();
     }
 
-    //Methode pour trouver un utilisateur par email
-    findOneByEmail(email: string) {
-        return this.users.find(user => user.email === email);
+    //Trouver utilisateur par ID
+    async findOne(id: string): Promise<Users> {
+        const user = await this.usersRepository.findOne({ where: { id } });
+        if (!user) {
+            throw new NotFoundException('Utilisateur introuvable');
+        }
+        return user;
     }
 
-    //Methode pour faire un utilisateur
-    createUser(createUserDto: {email: string}) {
-        const newUser = {
-            id: this.users.length + 1,
-            ...createUserDto,
-        };
-        this.users.push(newUser);
-        return newUser;
+    //Mettre a jour un utilisateur
+    async update(id: string, dto: UpdateUserDto, currentUser: Users): Promise<Users> {
+        const user = await this.findOne(id);
+
+        //Tant que pas super_admin interdir changement de role
+        if (dto.role && currentUser.role !== RoleType.SUPER_ADMIN) {
+            throw new ForbiddenException('Acces reserve aux super admins');
+        }
+
+        //Gestion de changement mot de passe
+        if (dto.password) {
+            const salt = await bcrypt.genSalt();
+            user.password_hash = await bcrypt.hash(dto.password, salt);
+            delete (dto as any).password;
+        }
+        Object.assign(user, dto);
+        return this.usersRepository.save(user);
     }
-}
+
+    //Supprimer un utilisateur
+    async remove(id: string): Promise<void> {
+        const result = await this.usersRepository.delete(id);
+        if (result.affected === 0) {
+            throw new NotFoundException('Utilisateur introuvable');
+        }
+    }
+}
\ No newline at end of file