Merge branch 'dev' into 'features/searchUser'

# Conflicts:
#   tests/Users/Create user.bru
#   tests/collection.bru

.env.example

@@ -69,3 +69,5 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 VITE_APP_NAME="${APP_NAME}"
 
 SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,localhost:8000
+
+TYPESENSE_CONNECTION=typesense

app/Http/Controllers/UserController.php

@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use App\Services\GetRole;
 use App\Services\UserService;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class UserController extends Controller
 {
@@ -27,12 +28,21 @@ class UserController extends Controller
     }
 
     public function create(Request $request): JsonResponse {
+
+        $request->validate([
+            'phone' => ['required', 'phone:FR,national'],
+            'email' => ['required', 'email:strict,rfc', 'unique:users,email'],
+        ]);
+
+        $phone = new PhoneNumber($request["phone"], 'FR');
+
         User::create([
             "name" => $request["name"],
             "email" => $request["email"],
             "password" => Hash::make($request["password"]),
             "lastname" => $request["lastname"],
             "validate" => 0,
+            "phone" => $phone->formatInternational(),
         ]);
 
         return response()->json(['message' => 'User created successfully']);
@@ -108,6 +118,7 @@ class UserController extends Controller
             $user = User::find($id);
 
             $user->validate = 1;
+            $user->role = 3;
             $user->verified_at = now();
             $user->save();
 

app/Services/UserService.php

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

composer.json

@@ -13,7 +13,8 @@
         "laravel/framework": "^12.0",
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.10.1",
-        "typesense/typesense-php": "*"
+        "typesense/typesense-php": "*",
+        "propaganistas/laravel-phone": "^6.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",

tests/Users/Create user.bru

@@ -15,15 +15,17 @@ body:json {
     "name": "{{name}}",
     "lastname": "{{lastname}}",
     "email": "{{email}}",
-    "password": "{{password}}"
+    "password": "{{password}}",
+    "phone": "{{phone}}"
   }
 }
 
 vars:pre-request {
-  name: test
-  email: user@test.com
-  password: 1234
-  lastname: test
+  name: 
+  email: 
+  password: 
+  lastname: 
+  phone: 
 }
 
 assert {

tests/collection.bru

@@ -1,4 +1,4 @@
 headers {
   Accept: application/json
-  X-XSRF-TOKEN: eyJpdiI6IjdaZnJCMEI3c1VjZWpsMER3ZytxOHc9PSIsInZhbHVlIjoiQzVpd1k3dVFtTDNKYlNYQVVZckJVQ003dzR1REh5RHQ2MTlTOHpIWjQ2ZFhJWTR5YjFGSEpvK2RiRmFKRnQ5RkxNQmhKekdBbGJXeUo5bmNrUmhkR2RZN1RmOTUxV1NPUUM5WmpySUZwMzBRclBwOEVzRmU1RDBGeUgzL0NqMVciLCJtYWMiOiJjZDBlNzUyYmNlYzFjY2VkM2IzN2JkNDU4YmJmMDM3YjkzOGMwMjdlNWNlNTQ0YzkxZTQ5ZDNhN2ExMjE1MWE5IiwidGFnIjoiIn0=
+  X-XSRF-TOKEN: 
 }