From 30b8ff9166f17aba3450fbbafc6caaf4a58c380d Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Fri, 3 Nov 2023 17:47:52 +0000
Subject: [PATCH] Add pagination to listByGroup to fix infinite loop problem

---
 src/Appwrite/Platform/Workers/Deletes.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index b699ba9e17..b91ddb901a 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -921,17 +921,28 @@ class Deletes extends Action
         $count = 0;
         $chunk = 0;
         $limit = 50;
+        $results = [];
         $sum = $limit;
+        $cursor = null;
 
         $executionStart = \microtime(true);
 
         while ($sum === $limit) {
             $chunk++;
 
-            $results = $database->find($collection, \array_merge([Query::limit($limit)], $queries));
+            $mergedQueries = \array_merge([Query::limit($limit)], $queries);
+            if ($cursor instanceof Document) {
+                $mergedQueries[] = Query::cursorAfter($cursor);
+            }
+
+            $results = $database->find($collection, $mergedQueries);
 
             $sum = count($results);
 
+            if ($sum > 0) {
+                $cursor = $results[$sum - 1];
+            }
+
             foreach ($results as $document) {
                 if (is_callable($callback)) {
                     $callback($document);