Merge branch 'dev' into 'features/searchUser'

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

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,