Merge branch 'dev' into 'main'

Dev

See merge request sae-but2/2025-26/gestion-benevoles-association/backend!21

.env.example

@@ -79,4 +79,4 @@ VITE_APP_NAME="${APP_NAME}"
 SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,localhost:8000
 
 TYPESENSE_CONNECTION=typesense
-TYPESENSE_API_KEY=y^sB$f%qlhfHSy%&jknAXabWNkZcvguCyARRqW5rE%%QG6H8ehA2ehVlhPWS555D
+TYPESENSE_API_KEY=xyz

app/Http/Controllers/SearchController.php

@@ -153,6 +153,9 @@ class SearchController extends Controller
                 // ignore si la collection n'existe pas
             }
 
+
+            $this->createUsersCollection();
+
             $this->indexUsers();
             $query = $request->input('query', '');
 

app/Http/Controllers/UserController.php

@@ -58,7 +58,6 @@ class UserController extends Controller
     }
 
     public function delete(Request $request): JsonResponse {
-
         try {
             $user = User::find($request->user()->id);
             $user->delete();
@@ -69,6 +68,19 @@ class UserController extends Controller
         }
     }
 
+    public function getUser(Request $request, int $id): JsonResponse {
+
+        try {
+            return response()->json(UserService::getData($id));
+        } catch (ModelNotFoundException $e) {
+            return response()->json(['message' => 'Utilisateur non trouvé'], 404);
+        } catch (\Exception $e) {
+            Log::info($e->getMessage());
+            return response()->json(['message' => "Server error"], 500);
+        }
+
+    }
+
     public function deleteById(Request $request, int $id): JsonResponse {
 
         if(Gate::denies('deleteOther', $request->user())){
@@ -86,10 +98,17 @@ class UserController extends Controller
         }
     }
 
-    public function getUser(Request $request, int $id): JsonResponse {
+    public function deactivate(Request $request, int $id): JsonResponse {
+        $userToDeactivate = User::findOrFail($id);
+
+        if(Gate::denies('deactivate', $userToDeactivate)){
+            return response()->json(["message" => "Can't delete this user"], 403);
+        }
 
         try {
-            return response()->json(UserService::getData($id));
+            $userToDeactivate->update(['validate' => 0]);
+
+            return response()->json(['message' => 'User deactivated successfully']);
         } catch (ModelNotFoundException $e) {
             return response()->json(['message' => 'Utilisateur non trouvé'], 404);
         } catch (\Exception $e) {

app/Policies/UsersPolicy.php

@@ -9,7 +9,14 @@ class UsersPolicy
 {
     public function deleteOther(User $user): bool
     {
-        return $user->role === 1;
+        return $user->role === 1 || $user->role === 2;
+    }
+
+    public function deactivate(User $user, User $userToDeactivate): bool
+    {
+        return in_array($user->role, [1, 2])
+            && $user->role < $userToDeactivate->role
+            && $user->id !== $userToDeactivate->id;
     }
 
     public function validate(User $user): bool

app/Services/UserService.php

@@ -15,7 +15,7 @@ class UserService
             "lastname" => $user->lastname,
             "email" => $user->email,
             "role" => GetRole::getRole($user->role),
-            "isAdmin" => $user->role === 1,
+            "isAdmin" => ($user->role === 1 || $user->role === 2),
             "phone" => $user->phone,
             "created_at" => $user->created_at,
             "updated_at" => $user->updated_at,

docker/docker-compose.yml

@@ -46,8 +46,8 @@ services:
       - "8108:8108"
     volumes:
       - typesense-data:/data
-    command: '--data-dir /data --api-key= --enable-cors'
+    command: '--data-dir /data --api-key=xyz --enable-cors'
-  
+
   backup:
     build:
       context: .

routes/users.php

@@ -13,6 +13,9 @@ Route::middleware(['web', 'auth:sanctum'])->delete('/users', [UserController::cl
 Route::middleware(['web', 'auth:sanctum'])->delete('/users/{id}', [UserController::class, "deleteById"])
     ->whereNumber('id');
 
+Route::middleware(['web', 'auth:sanctum'])->post('/users/{id}/deactivate', [UserController::class, "deactivate"])
+    ->whereNumber('id');
+
 Route::middleware(['web', 'auth:sanctum'])->get('/users/{id}', [UserController::class, "getUser"])
     ->whereNumber('id');