Apply offset only if not null

baobabsoluciones · Aug 22, 2023 · 11eccdc · 11eccdc
1 parent f37fee1
commit 11eccdc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cornflow-server/cornflow/models/meta_models.py b/cornflow-server/cornflow/models/meta_models.py
@@ -154,7 +154,9 @@ def get_all_objects(
         """
         if "user" in kwargs:
             kwargs.pop("user")
-        query = cls.query.filter_by(**kwargs).offset(offset)
+        query = cls.query.filter_by(**kwargs)
+        if offset:
+            query = query.offset(offset)
         if limit:
             query = query.limit(limit)
         return query
@@ -300,7 +302,8 @@ def get_all_objects(
         if creation_date_lte:
             query = query.filter(cls.created_at <= creation_date_lte)
 
-        query = query.offset(offset)
+        if offset:
+            query = query.offset(offset)
         if limit:
             query = query.limit(limit)
         return query