Merge pull request #6948 from ProcessMaker/bugfix/FOUR-16632

Add query-based pagination to tasks controller
ProcessMaker · Jun 17, 2024 · f69e33b · f69e33b
2 parents 1d0240d + e9ca6aa
commit f69e33b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 60 deletions.
diff --git a/ProcessMaker/Http/Controllers/Api/TaskController.php b/ProcessMaker/Http/Controllers/Api/TaskController.php
@@ -122,47 +122,29 @@ public function index(Request $request, $getTotal = false, User $user = null)
 
         $this->applyForCurrentUser($query, $user);
 
-        try {
-            // Count up the total number of results, but
-            // watch for PMQL query exceptions and handle
-            // them if they occur
-            $totalResultCount = $query->count();
-        } catch (QueryException $e) {
-            return $this->handleQueryException($e);
-        }
-
-        // If only the total is being requested (by a Saved Search), send it now
-        if ($getTotal === true) {
-            return $totalResultCount;
-        }
-
         // Apply filter overdue
         $query->overdue($request->input('overdue'));
 
-        // If we should manually add pagination to the
-        // query in advance (also used by saved search)
-        if ($this->isPaginationEnabled()) {
-            $query->limit($request->input('per_page', 10));
+        // If only the total is being requested (by a Saved Search), send it now
+        if ($getTotal === true) {
+            return $query->count();
         }
 
         try {
-            $response = $query->get();
+            $response = $query->paginate($request->input('per_page', 10));
         } catch (QueryException $e) {
             return $this->handleQueryException($e);
         }
 
         $response = $this->applyUserFilter($response, $request, $user);
 
-        // Map each item through its resource
-        $response = $this->applyResource($response);
-
         $inOverdueQuery = ProcessRequestToken::query()
             ->whereIn('id', $response->pluck('id'))
             ->where('due_at', '<', Carbon::now());
 
         $response->inOverdue = $inOverdueQuery->count();
 
-        return new TaskCollection($response, $totalResultCount);
+        return new TaskCollection($response);
     }
 
     /**

diff --git a/ProcessMaker/Traits/TaskControllerIndexMethods.php b/ProcessMaker/Traits/TaskControllerIndexMethods.php
@@ -15,36 +15,6 @@
 
 trait TaskControllerIndexMethods
 {
-    /**
-     * Manually enable paginated results from the
-     * index method()
-     *
-     * @return void
-     */
-    public function enableIndexPagination(): void
-    {
-        static::$paginate = true;
-    }
-
-    /**
-     * Determine if pagination was manually set for the
-     * index() method results
-     *
-     * @return bool
-     */
-    public function isPaginationEnabled(): bool
-    {
-        return static::$paginate === true;
-    }
-
-    /**
-     * Used by saved search to paginate the results
-     * from the index() method
-     *
-     * @var bool
-     */
-    protected static bool $paginate = false;
-
     private function indexBaseQuery($request)
     {
         $query = ProcessRequestToken::with(['processRequest', 'user', 'draft']);
@@ -300,13 +270,6 @@ private function applyUserFilter($response, $request, $user)
         return $response;
     }
 
-    private function applyResource($response)
-    {
-        return $response->map(function ($processRequestToken) {
-            return new Resource($processRequestToken);
-        });
-    }
-
     private function applyForCurrentUser($query, $user)
     {
         if ($user->is_administrator) {