From 691491a0b0fc6c51f6528959c56a56091ad4cd34 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Wed, 15 Jun 2022 09:25:25 +0200 Subject: [PATCH] - transferred to models --- app/Eloquent/Models/Resume.php | 1 + app/Eloquent/Models/User.php | 1 + app/Eloquent/Models/VacationRequest.php | 1 + app/Infrastructure/Http/Controllers/ResumeController.php | 4 +--- app/Infrastructure/Http/Controllers/UserController.php | 4 +--- .../Http/Controllers/VacationRequestController.php | 6 ++---- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/Eloquent/Models/Resume.php b/app/Eloquent/Models/Resume.php index d809d76..bceb717 100644 --- a/app/Eloquent/Models/Resume.php +++ b/app/Eloquent/Models/Resume.php @@ -31,6 +31,7 @@ class Resume extends Model "technologies" => AsCollection::class, "projects" => AsCollection::class, ]; + protected $perPage = 50; public function user(): BelongsTo { diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index dcd3941..9139919 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -46,6 +46,7 @@ class User extends Authenticatable implements NotifiableInterface protected $with = [ "profile", ]; + protected $perPage = 50; public function profile(): HasOne { diff --git a/app/Eloquent/Models/VacationRequest.php b/app/Eloquent/Models/VacationRequest.php index cb77f1c..2cf41a0 100644 --- a/app/Eloquent/Models/VacationRequest.php +++ b/app/Eloquent/Models/VacationRequest.php @@ -49,6 +49,7 @@ class VacationRequest extends Model "to" => "date", "event_ids" => AsCollection::class, ]; + protected $perPage = 50; public function user(): BelongsTo { diff --git a/app/Infrastructure/Http/Controllers/ResumeController.php b/app/Infrastructure/Http/Controllers/ResumeController.php index 3a8342f..8708488 100644 --- a/app/Infrastructure/Http/Controllers/ResumeController.php +++ b/app/Infrastructure/Http/Controllers/ResumeController.php @@ -18,15 +18,13 @@ use Toby\Infrastructure\Http\Resources\SimpleUserResource; class ResumeController extends Controller { - const LIMIT_PER_PAGE = 50; - public function index(): Response { $this->authorize("manageResumes"); $resumes = Resume::query() ->latest("updated_at") - ->paginate(self::LIMIT_PER_PAGE); + ->paginate(); return inertia("Resumes/Index", [ "resumes" => ResumeResource::collection($resumes), diff --git a/app/Infrastructure/Http/Controllers/UserController.php b/app/Infrastructure/Http/Controllers/UserController.php index c24a042..654c0c7 100644 --- a/app/Infrastructure/Http/Controllers/UserController.php +++ b/app/Infrastructure/Http/Controllers/UserController.php @@ -19,8 +19,6 @@ use Toby\Infrastructure\Http\Resources\UserResource; class UserController extends Controller { - const LIMIT_PER_PAGE = 50; - /** * @throws AuthorizationException */ @@ -33,7 +31,7 @@ class UserController extends Controller ->search($request->query("search")) ->orderByProfileField("last_name") ->orderByProfileField("first_name") - ->paginate(self::LIMIT_PER_PAGE) + ->paginate() ->withQueryString(); return inertia("Users/Index", [ diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 035d570..fffc401 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -35,8 +35,6 @@ use Toby\Infrastructure\Http\Resources\VacationRequestResource; class VacationRequestController extends Controller { - const LIMIT_PER_PAGE = 50; - public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse { if ($request->user()->can("listAll", VacationRequest::class)) { @@ -51,7 +49,7 @@ class VacationRequestController extends Controller ->whereBelongsTo($yearPeriodRetriever->selected()) ->latest() ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user())) - ->paginate(self::LIMIT_PER_PAGE); + ->paginate(); $pending = $request->user() ->vacationRequests() @@ -105,7 +103,7 @@ class VacationRequestController extends Controller ->when($type !== null, fn(Builder $query): Builder => $query->where("type", $type)) ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user())) ->latest() - ->paginate(self::LIMIT_PER_PAGE); + ->paginate(); $users = User::query() ->orderByProfileField("last_name")