#27 - separate fields for name and surname (#29)

* #27 - separate fields for name and surname

* #27 -cr fix

app/Http/Controllers/UserController.php

@@ -20,7 +20,8 @@ class UserController extends Controller
         $users = User::query()
             ->withTrashed()
             ->search($request->query("search"))
-            ->latest()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
             ->paginate()
             ->withQueryString();
 

app/Http/Controllers/VacationLimitController.php

@@ -14,8 +14,14 @@ class VacationLimitController extends Controller
 {
     public function edit(): Response
     {
+        $limits = VacationLimit::query()
+            ->with("user")
+            ->orderByUserField("last_name")
+            ->orderByUserField("first_name")
+            ->get();
+
         return inertia("VacationLimits", [
-            "limits" => VacationLimitResource::collection(VacationLimit::query()->with("user")->get()),
+            "limits" => VacationLimitResource::collection($limits),
         ]);
     }
 

app/Http/Requests/UserRequest.php

@@ -14,7 +14,8 @@ class UserRequest extends FormRequest
     public function rules(): array
     {
         return [
-            "name" => ["required", "min:3", "max: 150"],
+            "firstName" => ["required", "min:3", "max:80"],
+            "lastName" => ["required", "min:3", "max:80"],
             "email" => ["required", "email", Rule::unique("users", "email")->ignore($this->user)],
             "employmentForm" => ["required", new Enum(EmploymentForm::class)],
             "employmentDate" => ["required", "date"],
@@ -24,7 +25,8 @@ class UserRequest extends FormRequest
     public function data(): array
     {
         return [
-            "name" => $this->get("name"),
+            "first_name" => $this->get("firstName"),
+            "last_name" => $this->get("lastName"),
             "email" => $this->get("email"),
             "employment_form" => $this->get("employmentForm"),
             "employment_date" => $this->get("employmentDate"),

app/Http/Resources/UserFormDataResource.php

@@ -14,7 +14,8 @@ class UserFormDataResource extends JsonResource
     {
         return [
             "id" => $this->id,
-            "name" => $this->name,
+            "firstName" => $this->first_name,
+            "lastName" => $this->last_name,
             "email" => $this->email,
             "employmentForm" => $this->employment_form,
             "employmentDate" => $this->employment_date,

app/Http/Resources/UserResource.php

@@ -14,7 +14,7 @@ class UserResource extends JsonResource
     {
         return [
             "id" => $this->id,
-            "name" => $this->name,
+            "name" => $this->fullName,
             "email" => $this->email,
             "role" => "Human Resources Manager",
             "avatar" => asset($this->avatar),