Fix unnecessary request in sync pagination

ramsayleung · May 22, 2024 · 31f6723 · 31f6723
1 parent fade9d9
commit 31f6723
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/clients/pagination/iter.rs b/src/clients/pagination/iter.rs
@@ -55,13 +55,17 @@ where
         }
 
         match (self.req)(self.page_size, self.offset) {
-            Ok(page) if page.items.is_empty() => {
-                self.done = true;
-                None
-            }
             Ok(page) => {
-                self.offset += page.items.len() as u32;
-                Some(Ok(page))
+                if page.next.is_none() {
+                    self.done = true;
+                }
+
+                if page.items.is_empty() {
+                    None
+                } else {
+                    self.offset += page.items.len() as u32;
+                    Some(Ok(page))
+                }
             }
             Err(e) => Some(Err(e)),
         }