Merge branch 'main' of github.com:solidtime-io/solidtime

app/Http/Controllers/Api/V1/ClientController.php

@@ -40,7 +40,7 @@ public function index(Organization $organization): ClientCollection
         $clients = Client::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc')
-            ->paginate();
+            ->paginate(config('app.pagination_per_page_default'));
 
         return new ClientCollection($clients);
     }

app/Http/Controllers/Api/V1/InvitationController.php

@@ -40,7 +40,7 @@ public function index(Organization $organization, InvitationIndexRequest $reques
         $this->checkPermission($organization, 'invitations:view');
 
         $invitations = $organization->teamInvitations()
-            ->paginate();
+            ->paginate(config('app.pagination_per_page_default'));
 
         return InvitationCollection::make($invitations);
     }

app/Http/Controllers/Api/V1/MemberController.php

@@ -45,7 +45,7 @@ public function index(Organization $organization, MemberIndexRequest $request):
         $this->checkPermission($organization, 'members:view');
 
         $members = $organization->users()
-            ->paginate();
+            ->paginate(config('app.pagination_per_page_default'));
 
         return MemberCollection::make($members);
     }

app/Http/Controllers/Api/V1/ProjectController.php

@@ -5,6 +5,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\EntityStillInUseApiException;
+use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
 use App\Http\Requests\V1\Project\ProjectUpdateRequest;
 use App\Http\Resources\V1\Project\ProjectCollection;
@@ -38,7 +39,7 @@ protected function checkPermission(Organization $organization, string $permissio
      *
      * @operationId getProjects
      */
-    public function index(Organization $organization): ProjectCollection
+    public function index(Organization $organization, ProjectIndexRequest $request): ProjectCollection
     {
         $this->checkPermission($organization, 'projects:view');
         $canViewAllProjects = $this->hasPermission($organization, 'projects:view:all');
@@ -52,7 +53,7 @@ public function index(Organization $organization): ProjectCollection
             $projectsQuery->visibleByUser($user);
         }
 
-        $projects = $projectsQuery->paginate();
+        $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
         return new ProjectCollection($projects);
     }

app/Http/Controllers/Api/V1/ProjectMemberController.php

@@ -46,7 +46,7 @@ public function index(Organization $organization, Project $project): ProjectMemb
 
         $projectMembers = ProjectMember::query()
             ->whereBelongsTo($project, 'project')
-            ->paginate();
+            ->paginate(config('app.pagination_per_page_default'));
 
         return new ProjectMemberCollection($projectMembers);
     }

app/Http/Controllers/Api/V1/TagController.php

@@ -41,7 +41,7 @@ public function index(Organization $organization): TagCollection
         $tags = Tag::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc')
-            ->paginate();
+            ->paginate(config('app.pagination_per_page_default'));
 
         return new TagCollection($tags);
     }

app/Http/Controllers/Api/V1/TaskController.php

@@ -62,7 +62,7 @@ public function index(Organization $organization, TaskIndexRequest $request): Ta
             });
         }
 
-        $tasks = $query->paginate();
+        $tasks = $query->paginate(config('app.pagination_per_page_default'));
 
         return new TaskCollection($tasks);
     }

app/Http/Requests/V1/Project/ProjectIndexRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Project;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProjectIndexRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'page' => [
+                'integer',
+                'min:1',
+            ],
+        ];
+    }
+}

config/app.php

@@ -115,6 +115,8 @@
 
     'faker_locale' => 'en_US',
 
+    'pagination_per_page_default' => (int) env('PAGINATION_PER_PAGE_DEFAULT', 15),
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -191,5 +193,4 @@
     'aliases' => Facade::defaultAliases()->merge([
         // 'Example' => App\Facades\Example::class,
     ])->toArray(),
-
 ];