fix(files): Break when we have enough objects (and before loading the…

… next page) (#525)

* chore: Add tests for the list_bucket_objects

* fix(files): Break when we have enough objects (and before loading the next page)

hexa/files/api.py

@@ -173,7 +173,8 @@ def list_bucket_objects(
             res = _prefix_to_dict(bucket_name, prefix)
             if not ignore_hidden_files or not res["name"].startswith("."):
                 objects.append(res)
-        while len(objects) <= max_items:
+
+        while True:
             for obj in current_page:
                 if _is_dir(obj):
                     # We ignore objects that are directories (object with a size = 0 and ending with a /)
@@ -184,6 +185,11 @@ def list_bucket_objects(
                 if not ignore_hidden_files or not res["name"].startswith("."):
                     objects.append(res)
 
+            if len(objects) >= max_items:
+                # We have enough items, let's break
+                break
+
+            # Otherwise we load the next page and continue our loop
             current_page = next(pages)
 
         return ObjectsPage(

hexa/files/tests/test_api.py

@@ -137,3 +137,31 @@ def test_list_blobs_with_prefix(self):
                 "dir/readme.md",
             ],
         )
+
+    @backend.mock_storage
+    def test_list_blobs_pagination(self):
+        bucket = create_bucket("my_bucket")
+        for i in range(0, 12):
+            bucket.blob(
+                f"test_{i}.txt",
+                size=123 * i,
+                content_type="text/plain",
+            )
+
+        res = list_bucket_objects(bucket.name, page=1, per_page=10)
+        self.assertTrue(res.has_next_page)
+        self.assertFalse(res.has_previous_page)
+        self.assertEqual(res.page_number, 1)
+
+        res = list_bucket_objects(bucket.name, page=1, per_page=20)
+        self.assertFalse(res.has_next_page)
+
+        res = list_bucket_objects(bucket.name, page=2, per_page=10)
+        self.assertFalse(res.has_next_page)
+        self.assertTrue(res.has_previous_page)
+        self.assertEqual(res.page_number, 2)
+
+        res = list_bucket_objects(bucket.name, page=2, per_page=5)
+        self.assertTrue(res.has_next_page)
+        self.assertTrue(res.has_previous_page)
+        self.assertEqual(res.page_number, 2)