Refactor database queries and update variable names

server/data.py

@@ -37,13 +37,13 @@ async def processEnqueteNodeData(data, nodeID):
         mydb = dbLogin()
         cursor = mydb.cursor()
 
-        query = "INSERT INTO `Response` (Node_NodeID, Question_QuestionID, Response) VALUES (%s, %s, %s)"
+        query = "INSERT INTO `Reply` (Result, Node_NodeID, Question_QuestionID) VALUES (%s, %s, %s)"
         processedData = json.loads(data)
 
         processedQuestionID = (processedData['QuestionID'])
         processedResponse = (processedData['Response'])
 
-        pushingDataArray = [(nodeID, processedQuestionID, processedResponse)]
+        pushingDataArray = [(processedResponse, nodeID, processedQuestionID)]
 
         for i in pushingDataArray:
             cursor.execute(query, i)
@@ -67,7 +67,10 @@ async def receive_data():
                 processedData = json.loads(data)
                 macAdress = processedData['node']
 
-                type = await getNodeType(macAdress)
+                if "Temp" in processedData:
+                    type = 'sensor'
+                else:
+                    type = 'enquete'
 
                 await getNodeInfo('sensor')
                 await getNodeInfo('enquete')
@@ -135,7 +138,9 @@ async def getNodeID(macAdress):
     cursor.execute("""SELECT nodeID FROM Node WHERE MAC = %s""", id)
     data = cursor.fetchall()
 
-    nodeID = data[0][0]
+    for tuples in data:
+        for item in tuples:
+            nodeID = item
 
     return nodeID
     
@@ -146,7 +151,9 @@ async def getNodeType(macAdress):
     cursor.execute("""SELECT Type FROM Node WHERE MAC = %s""", id)
     data = cursor.fetchall()
 
-    Type = data[0][0]
+    for tuples in data:
+        for item in tuples:
+            Type = item
             
     return Type