From f90571afc33c86359458c6083d4a52a85a401426 Mon Sep 17 00:00:00 2001
From: marcsello <punkosdmarcell@rocketmail.com>
Date: Wed, 11 Aug 2021 12:56:56 +0200
Subject: [PATCH] Fixed stuff

---
 src/resources.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/resources.py b/src/resources.py
index f77ce4d..654191c 100644
--- a/src/resources.py
+++ b/src/resources.py
@@ -159,36 +159,40 @@ class SampleResource(Resource):
             filters = []
             try:
                 first = int(request.args.get('first'))
+            except (ValueError, TypeError):
+                first = None
+            else:
                 filters.append(
                     SampleMetadata.id >= first
                 )
-            except ValueError:
-                first = None
 
             try:
                 after = datetime.fromisoformat(request.args.get('after'))
+            except (ValueError, TypeError):
+                after = None
+            else:
                 filters.append(
                     SampleMetadata.timestamp > after
                 )
-            except ValueError:
-                after = None
 
             try:
                 before = datetime.fromisoformat(request.args.get('after'))
+            except (ValueError, TypeError):
+                before = None
+            else:
                 filters.append(
                     SampleMetadata.timestamp < before
                 )
-            except ValueError:
-                before = None
 
             if filters:
                 query = query.filter(db.and_(*filters))
 
             try:
                 limit = int(request.args.get('limit'))
-                query = query.limit(limit)
-            except ValueError:
+            except (ValueError, TypeError):
                 limit = None
+            else:
+                query = query.limit(limit)
 
         ## Run query ##
         count = "count" in request.args.get