Refactor pagination in Profiles and Users Controllers

Author: Jeckerson

src/Controllers/ProfilesController.php

@@ -46,12 +46,9 @@ public function indexAction(): void
      */
     public function searchAction()
     {
-        $numberPage = 1;
         if ($this->request->isPost()) {
-            $query                          = Criteria::fromInput($this->di, 'Vokuro\Models\Profiles', $this->request->getPost());
+            $query = Criteria::fromInput($this->di, 'Vokuro\Models\Profiles', $this->request->getPost());
             $this->persistent->searchParams = $query->getParams();
-        } else {
-            $numberPage = $this->request->getQuery("page", "int");
         }
 
         $parameters = [];
@@ -69,9 +66,10 @@ public function searchAction()
         }
 
         $paginator = new Paginator([
-            "data"  => $profiles,
-            "limit" => 10,
-            "page"  => $numberPage,
+            'model'  => Profiles::class,
+            'parameters' => $parameters,
+            'limit' => 10,
+            'page'  => $this->request->getQuery('page', 'int', 1),
         ]);
 
         $this->view->setVar('page', $paginator->paginate());

src/Controllers/UsersController.php

@@ -13,7 +13,7 @@
 namespace Vokuro\Controllers;
 
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Paginator\Adapter\Model as Paginator;
+use Phalcon\Paginator\Adapter\QueryBuilder as Paginator;
 use Vokuro\Forms\ChangePasswordForm;
 use Vokuro\Forms\UsersForm;
 use Vokuro\Models\PasswordChanges;
@@ -41,23 +41,24 @@ public function indexAction(): void
     /**
      * Searches for users
      */
-    public function searchAction()
+    public function searchAction(): void
     {
-        $numberPage = $this->request->getQuery('page', 'int', 1);
-        $parameters = Criteria::fromInput($this->di, Users::class, $this->request->getQuery())->getParams();
+        $builder = Criteria::fromInput($this->di, Users::class, $this->request->getQuery());
 
-        $users = Users::find($parameters);
-        if (count($users) === 0) {
+        $count = Users::count($builder->getParams());
+        if ($count === 0) {
             $this->flash->notice('The search did not find any users');
-            return $this->dispatcher->forward([
+            $this->dispatcher->forward([
                 'action' => 'index',
             ]);
+
+            return;
         }
 
         $paginator = new Paginator([
-            'data'  => $users,
+            'builder'  => $builder->createBuilder(),
             'limit' => 10,
-            'page'  => $numberPage,
+            'page'  => $this->request->getQuery('page', 'int', 1),
         ]);
 
         $this->view->setVar('page', $paginator->paginate());

src/Models/Users.php

@@ -69,7 +69,7 @@ class Users extends Model
 
     public function initialize()
     {
-        $this->belongsTo('profilesId', Profiles::class, 'id', [
+        $this->hasOne('profilesId', Profiles::class, 'id', [
             'alias'    => 'profile',
             'reusable' => true,
         ]);