copying classes python to document

server/data.py

@@ -1,64 +1,19 @@
 import asyncio
 import websockets
-import mysql.connector
 import json
+from class_SensorNode import SensorNode
+from class_enqueteNode import EnqueteNode
+from classes_data import dbLogin
 
 sensorNodeArray = []
 enqueteNodeArray = []
 
-async def processSensorNodeData(data, nodeID):
-    try:
-        mydb = dbLogin()
-        cursor = mydb.cursor()
-
-        query = "INSERT INTO `Measurement` (NodeID, Type, Value) VALUES (%s, %s, %s)"
-        processedData = json.loads(data)
-
-        processedTemp = (processedData['Temp'])
-        processedHumi = (processedData['Humi'])
-        processedeCO2 = (processedData['eCO2'])
-        processedTVOC = (processedData['TVOC'])
-        processedMAC = (processedData['node'])
-
-        pushingDataArray = [(nodeID, "Temp", processedTemp), (nodeID, "Humi", processedHumi), (nodeID, "eCO2", processedeCO2), (nodeID, "TVOC", processedTVOC)]
-        for i in pushingDataArray:
-            print(query ,i)
-            cursor.execute(query, i)
-            mydb.commit()
-            
-    except mysql.connector.Error as err:
-        print("MySQL Error:", err)
-    finally:
-        cursor.close()
-        mydb.close()
-        
-async def processEnqueteNodeData(data, nodeID):
-    try:
-        mydb = dbLogin()
-        cursor = mydb.cursor()
-
-        query = "INSERT INTO `Reply` (Result, Node_NodeID, Question_QuestionID) VALUES (%s, %s, %s)"
-        processedData = json.loads(data)
-
-        processedQuestionID = (processedData['QuestionID'])
-        processedResponse = (processedData['Response'])
-
-        pushingDataArray = [(processedResponse, nodeID, processedQuestionID)]
-
-        for i in pushingDataArray:
-            cursor.execute(query, i)
-            mydb.commit()
-    except mysql.connector.Error as err:
-        print("MySQL Error:", err)
-    finally:
-        cursor.close()
-        mydb.close()
-
 async def receive_data():
     uri = "ws://145.92.8.114/ws"
     try:
         async with websockets.connect(uri) as websocket:
             while True:
+                print("true")
                 data = await websocket.recv()
                 print(f"Received data: {data}")
 
@@ -73,14 +28,13 @@ async def receive_data():
                 await getNodeInfo('sensor')
                 await getNodeInfo('enquete')
 
-                print(sensorNodeArray)
                 
                 if macAdress in sensorNodeArray:
                     nodeID = await getNodeID(macAdress)
-                    await processSensorNodeData(data, nodeID)
+                    await SensorNode.processSensorNodeData(data, nodeID)
                 elif macAdress in enqueteNodeArray:
                     nodeID = await getNodeID(macAdress)
-                    await processEnqueteNodeData(data, nodeID)
+                    await EnqueteNode.processEnqueteNodeData(data, nodeID)
                 else: 
                     await newNode(macAdress, type)
     except websockets.ConnectionClosedError as e:
@@ -89,17 +43,8 @@ async def receive_data():
 async def main():
     await receive_data()
 
-def dbLogin():
-    mydb = mysql.connector.connect(
-        host="localhost",
-        user="root",
-        password="Dingleberries69!",
-        database="NodeData" 
-    )
-
-    return mydb
-
 async def getNodeInfo(type):
+    print("getNodeINfo")
     global sensorNodeArray
     global enqueteNodeArray
 
@@ -114,14 +59,12 @@ async def getNodeInfo(type):
     for tuples in nodeInfo:
         for item in tuples:
             nodeInfoArray.append(item)
-    print(nodeInfoArray)
     
     cursor.close()
     mydb.close()
     
     if type == 'sensor':
         sensorNodeArray = nodeInfoArray
-        print(sensorNodeArray)
         return sensorNodeArray
 
     elif type == 'enquete':
@@ -143,7 +86,7 @@ async def getNodeID(macAdress):
     return nodeID
 
 async def newNode(mac, type):
-    id = (mac, type,)
+    id = (mac, type)
     mydb = dbLogin()
 
     cursor = mydb.cursor()