Separate Http Base Action and REST Classes

nguereza-tony · nguereza-tony · commit 218f5459b567 · 2026-02-14T08:20:46.000+01:00
diff --git a/src/Http/Action/BaseHttpAction.php b/src/Http/Action/BaseHttpAction.php
@@ -70,21 +70,27 @@ abstract class BaseHttpAction implements RequestHandlerInterface
 
     /**
      * The pagination limit
-     * @var int|null
+     * @var int
      */
-    protected ?int $limit = null;
+    protected int $limit;
 
     /**
-     * The pagination current page
-     * @var int|null
+     * The pagination max limit to fetch "all" record
+     * @var int
+     */
+    protected int $maxLimit = 0;
+
+    /**
+     * The pagination max per page
+     * @var int
      */
-    protected ?int $page = null;
+    protected int $maxPerPage = 0;
 
     /**
-     * Whether to query all list without pagination
-     * @var bool
+     * The pagination current page
+     * @var int
      */
-    protected bool $all = false;
+    protected int $page = 1;
 
     /**
      * The pagination instance
@@ -269,37 +275,35 @@ protected function setFilters(): void
     protected function setPagination(): void
     {
         $param = $this->param;
-        if ($param->get('all', null)) {
-            $this->all = true;
-            return;
-        }
-
-        $limit = $param->get('limit', null);
-        if ($limit !== null) {
-            $this->limit = (int) $limit;
-        }
-
-        $maxLimit = $this->config->get('pagination.max_limit', 1000);
-        if ($this->limit !== null && $this->limit > $maxLimit) {
-            $this->limit = $maxLimit;
-        }
+        $all = boolval($param->get('all', null));
+        $perPage = $this->config->get('pagination.item_per_page', 20);
 
+        $this->limit = (int) $param->get('limit', $perPage);
         $page = $param->get('page', null);
         if ($page) {
             $this->page = (int) $page;
         }
 
-        if ($limit > 0 || $page > 0) {
-            $this->all = false;
+        if ($this->maxLimit === 0) {
+            $this->maxLimit = $this->config->get('pagination.max_limit', 1000);
         }
 
-        if ($this->limit > 0) {
-            $this->pagination->setItemsPerPage($this->limit);
+        if ($this->maxPerPage === 0) {
+            $this->maxPerPage = $this->config->get('pagination.max_per_page', 100);
         }
 
-        $currentPage = $this->page ?? 1;
+        // Handle fetching all records
+        if ($all) {
+            $this->page = 1;
+            $this->limit = $this->maxLimit;
+        } else {
+            if ($this->limit > $this->maxPerPage) {
+                $this->limit = $this->maxPerPage;
+            }
+        }
 
-        $this->pagination->setCurrentPage($currentPage);
+        $this->pagination->setItemsPerPage($this->limit);
+        $this->pagination->setCurrentPage($this->page);
     }
 
     /**
diff --git a/src/Http/Action/RestBaseAction.php b/src/Http/Action/RestBaseAction.php
@@ -146,22 +146,20 @@ protected function handleRestPagination(
         string|array $sortFields = 'name',
         string $sortDir = 'ASC'
     ): void {
-        if ($this->all === false) {
-            $totalItems = $repository->filters($this->filters)
-                                     ->query()
-                                     ->count('id');
+        $totalItems = $repository->filters($this->filters)
+                                 ->query()
+                                 ->count('id');
 
-            $currentPage = (int) $this->param->get('page', 1);
+        $currentPage = (int) $this->param->get('page', 1);
 
-            $this->pagination->setTotalItems($totalItems)
-                             ->setCurrentPage($currentPage);
+        $this->pagination->setTotalItems($totalItems)
+                         ->setCurrentPage($currentPage);
 
-            $limit = $this->pagination->getItemsPerPage();
-            $offset = $this->pagination->getOffset();
+        $limit = $this->pagination->getItemsPerPage();
+        $offset = $this->pagination->getOffset();
 
-            $query = $query->limit($limit)
-                           ->offset($offset);
-        }
+        $query->limit($limit)
+              ->offset($offset);
 
         if (count($this->sorts) > 0) {
             foreach ($this->sorts as $column => $order) {
diff --git a/tests/Http/Action/BaseActionTest.php b/tests/Http/Action/BaseActionTest.php
@@ -122,6 +122,7 @@ protected function handle(bool $bypassPagination = false): void
         ]);
         $config = $this->getMockInstanceMap(Config::class, [
             'get' => [
+                ['pagination.max_per_page', 100, 100],
                 ['pagination.max_limit', 1000, 1000],
             ],
         ]);
@@ -144,20 +145,15 @@ protected function handle(bool $bypassPagination = false): void
         $this->assertEquals(200, $resp->getStatusCode());
 
         $this->assertEquals(
-            $bypassPagination ? null : 200,
+            $bypassPagination ? 1000 : 100,
             $this->getPropertyValue(BaseAction::class, $o, 'limit')
         );
         $this->assertEquals('foo_view', $this->getPropertyValue(BaseAction::class, $o, 'viewName'));
         $this->assertEquals(
-            $bypassPagination ? null : 1,
+            $bypassPagination ? 1 : 1,
             $this->getPropertyValue(BaseAction::class, $o, 'page')
         );
 
-        $this->assertEquals(
-            $bypassPagination ? true : false,
-            $this->getPropertyValue(BaseAction::class, $o, 'all')
-        );
-
         $this->assertEquals(
             ['permissions' => [5,7], 'status' => 'Y', 'multi' => [5, 7]],
             $this->getPropertyValue(BaseAction::class, $o, 'filters')
@@ -181,7 +177,15 @@ protected function redirectBackToOrigin(string $originId = '0', ?string $originR
                 ]]
             ],
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
+
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
             'routeHelper' => $routeHelper,
         ]);
diff --git a/tests/Http/Action/BaseConfigurationActionTest.php b/tests/Http/Action/BaseConfigurationActionTest.php
@@ -4,6 +4,7 @@
 
 namespace Platine\Test\Framework\Http\Action;
 
+use Platine\Config\Config;
 use Platine\Dev\PlatineTestCase;
 use Platine\Framework\Config\AppDatabaseConfig;
 use Platine\Framework\Config\DatabaseConfigLoader;
@@ -64,7 +65,15 @@ public function testRespondRequestMethodGet(): void
                 ['GET'],
             ],
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
+
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
         ]);
         $actionHelper = $this->createObject(ActionHelper::class);
@@ -77,8 +86,7 @@ public function testRespondRequestMethodGet(): void
         $this->assertEquals(200, $resp->getStatusCode());
 
         $this->assertEquals('', $this->getPropertyValue(BaseAction::class, $o, 'viewName'));
-        $this->assertEquals(null, $this->getPropertyValue(BaseAction::class, $o, 'page'));
-        $this->assertFalse($this->getPropertyValue(BaseAction::class, $o, 'all'));
+        $this->assertEquals(1, $this->getPropertyValue(BaseAction::class, $o, 'page'));
     }
 
     public function testRespondSaveFormValidationFailed(): void
@@ -100,7 +108,14 @@ public function testRespondSaveFormValidationFailed(): void
                 ['POST'],
             ],
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
             'context' => $viewContext,
         ]);
@@ -114,8 +129,7 @@ public function testRespondSaveFormValidationFailed(): void
         $this->assertInstanceOf(TemplateResponse::class, $resp);
         $this->assertEquals(200, $resp->getStatusCode());
         $this->assertEquals('', $this->getPropertyValue(BaseAction::class, $o, 'viewName'));
-        $this->assertEquals(null, $this->getPropertyValue(BaseAction::class, $o, 'page'));
-        $this->assertFalse($this->getPropertyValue(BaseAction::class, $o, 'all'));
+        $this->assertEquals(1, $this->getPropertyValue(BaseAction::class, $o, 'page'));
     }
 
     public function testRespondSaveSuccess(): void
@@ -151,7 +165,14 @@ public function testRespondSaveSuccess(): void
                 [['name' => 'foo', 'status' => 'bar']],
             ],
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
             'context' => $viewContext,
         ]);
@@ -168,7 +189,6 @@ public function testRespondSaveSuccess(): void
         $this->assertInstanceOf(RedirectResponse::class, $resp);
         $this->assertEquals(302, $resp->getStatusCode());
         $this->assertEquals('', $this->getPropertyValue(BaseAction::class, $o, 'viewName'));
-        $this->assertEquals(null, $this->getPropertyValue(BaseAction::class, $o, 'page'));
-        $this->assertFalse($this->getPropertyValue(BaseAction::class, $o, 'all'));
+        $this->assertEquals(1, $this->getPropertyValue(BaseAction::class, $o, 'page'));
     }
 }
diff --git a/tests/Http/Action/BaseResourceActionTest.php b/tests/Http/Action/BaseResourceActionTest.php
@@ -4,6 +4,7 @@
 
 namespace Platine\Test\Framework\Http\Action;
 
+use Platine\Config\Config;
 use Platine\Dev\PlatineTestCase;
 use Platine\Framework\Helper\ActionHelper;
 use Platine\Framework\Http\Exception\HttpNotFoundException;
@@ -22,7 +23,14 @@ public function testResponseNotFound(): void
         $request = $this->getMockInstance(ServerRequest::class, [
             'getAttribute' => $route,
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
         ]);
         $actionHelper = $this->createObject(ActionHelper::class);
@@ -40,7 +48,14 @@ public function testResponseSucess(): void
         $request = $this->getMockInstance(ServerRequest::class, [
             'getAttribute' => $route,
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
         ]);
         $actionHelper = $this->createObject(ActionHelper::class);
diff --git a/tests/Http/Action/RestBaseActionTest.php b/tests/Http/Action/RestBaseActionTest.php
@@ -69,7 +69,14 @@ private function handleRestPagination(bool $defaultSort = false): void
             'getTotalItems' => 16,
             'getInfo' => ['page' => 1],
         ]);
+        $config = $this->getMockInstanceMap(Config::class, [
+            'get' => [
+                ['pagination.max_per_page', 100, 100],
+                ['pagination.max_limit', 1000, 1000],
+            ],
+        ]);
         $this->setClassCreateObjectMaps(ActionHelper::class, [
+            'config' => $config,
             'logger' => $logger,
             'pagination' => $pagination,
         ]);
@@ -368,6 +375,7 @@ protected function handle(bool $bypassPagination = false): void
         ]);
         $config = $this->getMockInstanceMap(Config::class, [
             'get' => [
+                ['pagination.max_per_page', 100, 100],
                 ['pagination.max_limit', 1000, 1000],
             ],
         ]);
@@ -385,19 +393,14 @@ protected function handle(bool $bypassPagination = false): void
         $this->assertEquals(200, $resp->getStatusCode());
 
         $this->assertEquals(
-            $bypassPagination ? null : 101,
+            $bypassPagination ? 1000 : 100,
             $this->getPropertyValue(RestBaseAction::class, $o, 'limit')
         );
         $this->assertEquals(
-            $bypassPagination ? null : 1,
+            $bypassPagination ? 1 : 1,
             $this->getPropertyValue(RestBaseAction::class, $o, 'page')
         );
 
-        $this->assertEquals(
-            $bypassPagination ? true : false,
-            $this->getPropertyValue(RestBaseAction::class, $o, 'all')
-        );
-
         $this->assertEquals(
             ['name' => 'DESC', 'status' => 'ASC'],
             $this->getPropertyValue(RestBaseAction::class, $o, 'sorts')
