From 69ef7013bb55666810b21c9219c0d31e144aeefe Mon Sep 17 00:00:00 2001 From: sietse jonker Date: Mon, 1 Apr 2024 11:50:47 +0200 Subject: [PATCH] Refactor get_query function to handle additional conditions --- server/Flask/queries.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/Flask/queries.py b/server/Flask/queries.py index 65abfeb..2257b79 100644 --- a/server/Flask/queries.py +++ b/server/Flask/queries.py @@ -1,5 +1,13 @@ def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd): - if node and dataType: + if dateStart and dateEnd and node: + query = f'''SELECT * + FROM Measurement + WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}' AND NodeID = {node};''' + elif dateStart and dateEnd: + query = f'''SELECT * + FROM Measurement + WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';''' + elif node and dataType: query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'" elif node: query = f"SELECT * FROM Measurement WHERE NodeID = {node}" @@ -13,7 +21,7 @@ def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd): query = f"SELECT * FROM Question" elif replies: query = f"SELECT * FROM Reply" - elif dateStart and dateEnd: + elif dateStart and dateEnd and node: query = f'''SELECT * FROM Measurement WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';'''