Refactor getData function and fix query bug

server/Flask/main.py

@@ -49,9 +49,9 @@ def loginDB():
         )
         return mydb
 
-def getData(node, dataType, MAC, dateStart, dateEnd):
+def getData(node, dataType, MAC, dateStart, dateEnd, type):
         mydb = loginDB()
-        query = get_query(node, dataType, MAC, False, False, dateStart, dateEnd)
+        query = get_query(node, dataType, MAC, dateStart, dateEnd, type)
         cursor = mydb.cursor(dictionary=True)  # Enable dictionary output
         cursor.execute(query)
         result = cursor.fetchall()  # Fetch the results

server/Flask/queries.py

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