From 44a2d1e5c6897c4bb62aeb0992511863b49f3eb1 Mon Sep 17 00:00:00 2001
From: sietse jonker <sietse.jonker@hva.nl>
Date: Tue, 26 Mar 2024 22:25:07 +0100
Subject: [PATCH] Refactor getNodeInfo function to store node information in
 separate arrays

---
 server/data.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/server/data.py b/server/data.py
index 891fd8f..e6acb5d 100644
--- a/server/data.py
+++ b/server/data.py
@@ -54,8 +54,10 @@ async def receive_data():
             while True:
                 data = await websocket.recv()
                 print(f"Received data: {data}")
+
                 processedData = json.loads(data)
                 macAdress = processedData['node']
+
                 if processedData["Temp"]:
                     type = 'sensor'
                 else:
@@ -64,9 +66,11 @@ async def receive_data():
                 await getNodeInfo('sensor')
                 await getNodeInfo('enquete')
 
-                if macAdress in sensorNodeArray:
+                print(str(sensorNodeArray))
+                
+                if str(macAdress) in sensorNodeArray:
                     await processSensorNodeData(data)
-                elif macAdress in enqueteNodeArray:
+                elif str(macAdress) in enqueteNodeArray:
                     await processEnqueteNodeData(data)
                 else: 
                     await newNode(macAdress, type)
@@ -96,17 +100,31 @@ def dbLogin():
     return mydb
 
 async def getNodeInfo(type):
+    nodeInfoArray = []
+
     id = (type,)
     mydb = dbLogin()
     cursor = mydb.cursor()
-    cursor.execute("""SELECT * FROM Node WHERE Type = %s""", id)
+    cursor.execute("""SELECT MAC FROM Node WHERE Type = %s""", id)
     nodeInfo = cursor.fetchall()
-    print(nodeInfo)
-    if nodeInfo != None:
-        if type == 'sensor':
-            sensorNodeArray.append(nodeInfo[])
-        elif type == 'enquete':
-            enqueteNodeArray.append(nodeInfo)
+
+    for tuples in nodeInfo:
+        for item in tuples:
+            nodeInfoArray.append(item)
+    print(nodeInfoArray)
+    
+    if type == 'sensor':
+        sensorNodeArray = nodeInfoArray
+        print(sensorNodeArray)
+        return sensorNodeArray
+
+    elif type == 'enquete':
+        enqueteNodeArray = nodeInfoArray
+        return enqueteNodeArray
+
+
+
+
 
 async def newNode(mac, type):
     id = (mac, type,)