Refactor queries.py to improve query selection logic

server/Flask/queries.py

@@ -7,10 +7,10 @@ def get_query(node, dataType, MAC, questionID, replies):
     query = f"SELECT * FROM Measurement WHERE Type = '{dataType}'"
  elif MAC:
     query = f"SELECT * FROM Node WHERE MAC = '{MAC}'"
+ elif replies and questionID:
+    query = f"SELECT * FROM Reply WHERE QuestionID = '{questionID}'"
  elif questionID:
     query = f"SELECT * FROM Question"
- elif replies:
-    query = f"SELECT * FROM Reply WHERE QuestionID = '{questionID}'"
  else:
     query = "SELECT * FROM `Measurement`"
  return query