Smikkelbakje/J1B3-Sensor-boxes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor get_query function to handle additional conditions

Browse Source
This commit is contained in:
sietse jonker
2024-04-01 11:50:47 +02:00
parent 5e2daa445a
commit 69ef7013bb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/Flask/queries.py
View File

@@ -1,5 +1,13 @@
def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd): 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}'" query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'"
elif node: elif node:
query = f"SELECT * FROM Measurement WHERE NodeID = {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" query = f"SELECT * FROM Question"
elif replies: elif replies:
query = f"SELECT * FROM Reply" query = f"SELECT * FROM Reply"
elif dateStart and dateEnd: elif dateStart and dateEnd and node:
query = f'''SELECT * query = f'''SELECT *
FROM Measurement FROM Measurement
WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';''' WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';'''