From c35028f3546ef78cc53ad45608b871031f817984 Mon Sep 17 00:00:00 2001
From: caliskan <bcaliskan11.bc@gmail.com>
Date: Wed, 10 May 2023 21:58:11 +0200
Subject: [PATCH] FIXED Backend functions

---
 software/backend/backend_database.db | Bin 16384 -> 16384 bytes
 software/backend/data_functions.py   |  27 ++++++++++++++++++---------
 software/backend/plantdatabase.py    |   4 ++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/software/backend/backend_database.db b/software/backend/backend_database.db
index b38b3c6c66a2b61c1c80fb98626efe92b16f1ecb..f8ce5be04e4d95d1b32a1877de2bd4b37081e8e3 100644
GIT binary patch
delta 404
zcmZo@U~Fh$oFL68K2gS*Rh&UDnQ>#v0)8Gw{%;KY-}vA0zu~{JSy13Kzaf{nQ)W(L
z4g&*&h<IXgN@6jP#lXNJTv(pU!N|-Y?wy*On8V9|kAaE*5(EDw{ue-P$M{{i7?~v*
z3vv?kN{ZQl>bW>`Qxl6z#h9248NsZg)ZEm(lK8U3oYK@{c3z+oc76#4{`>p~`RDW3
z@yGC6@k;<rV&bn?VCP^kW&{Bv10!Qy15;f?0|i5KD`QJ5Qwug8AW&e#slvbnqJkBN
z3NtHHa~6;p@+=?~oEWwkWf}vOu!3x1#%_j@0ni;F1w1lLU^6&5IgwpzW@Tb&Wn{uE
U&j^$SS%BgXGb;n20#lH70DM(T4FCWD

delta 64
wcmZo@U~Fh$oFL7}GEv5vm4!hs+-qaX0)8e2fz5&fr}!sMFks_l00LZG00VFjkpKVy

diff --git a/software/backend/data_functions.py b/software/backend/data_functions.py
index d3943f2..d7d28f1 100644
--- a/software/backend/data_functions.py
+++ b/software/backend/data_functions.py
@@ -9,6 +9,7 @@ from plantdatabase import PlantDataBase
 from software.defines import Topics, MAX_PLANT_COUNT
 import json
 import uuid
+from typing import Union
 
 
 # Robot Channel Reactions
@@ -66,13 +67,16 @@ def action_getbattery(client: mqtt.Client, userdata, message: mqtt.MQTTMessage,
     client.publish(Topics['ROBOT_ACTION_GETBATTERY'])
 
 
-def action_getalldata(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, mydatabase: PlantDataBase):
-    plant_names = json.loads(message.payload.decode("UTF-8"))
-    print(plant_names)
+def action_getalldata(client: mqtt.Client, userdata, message: Union[mqtt.MQTTMessage, list], mydatabase: PlantDataBase):
+    plant_names = mydatabase.get_plant_names()
+    print(type(plant_names))
     alldata = []
     for i in plant_names:
-        alldata.append(mydatabase.get_latest_data(plant_name=i))
+        print("I Type: " + str(type(i)))
+        print("I: " + i[0])
+        alldata.append(mydatabase.get_latest_data(plant_name=i[0]))
     client.publish(Topics['BACKEND_DATA_SENSORDATAALL'], json.dumps(alldata))
+    print("BACKEND_DATA_SENSORDATAALL SEND DATA:" + str(alldata))
 
 
 def action_newplant(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, mydatabase: PlantDataBase):
@@ -84,29 +88,34 @@ def action_newplant(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, my
                                        sensordata_soil_moisture=plant_data["SoilMoisture"],
                                        sensordata_brightness=plant_data["Brightness"])
     print("BACKEND_ACTION_NEWPLANT RECEIVED DATA: " + str(plant_data))
+    print(mydatabase.get_plant_names())
+    action_getalldata(client, userdata, message, mydatabase)
 
 
 def action_configureplant(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, mydatabase: PlantDataBase):
     plant_data = json.loads(message.payload.decode("UTF-8"))
-    mydatabase.configure_plant(plant_id=plant_data["plant_ID"], plantname=plant_data["PlantName"])
+    mydatabase.configure_plant(plant_id=plant_data["PlantID"], plantname=plant_data["PlantName"])
     mydatabase.insert_measurement_data(plant_id=plant_data["PlantID"],
                                        sensordata_temp=plant_data["AirTemperature"],
                                        sensordata_humidity=plant_data["AirHumidity"],
                                        sensordata_soil_moisture=plant_data["SoilMoisture"],
                                        sensordata_brightness=plant_data["Brightness"])
     print("BACKEND_ACTION_CONFIGUREPLANT RECEIVED DATA: " + str(plant_data))
+    action_getalldata(client, userdata, message, mydatabase)
 
 
 def action_deleteplant(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, mydatabase: PlantDataBase):
     delete_plant = json.loads(message.payload.decode("UTF-8"))
-    mydatabase.delete_plant(plant_id=delete_plant["PlantID"])
+    mydatabase.delete_plant(plant_id=delete_plant)
     print("BACKEND_ACTION_DELETEPLANT RECEIVED DATA: " + str(delete_plant))
+    action_getalldata(client, userdata, message, mydatabase)
 
 
 def action_countplants(client: mqtt.Client, userdata, message: mqtt.MQTTMessage, mydatabase: PlantDataBase):
+    count = mydatabase.plant_count()
     count_payload = {
-        "CurrentCount": mydatabase.plant_count(),
+        "CurrentCount": count,
         "MaxCount": MAX_PLANT_COUNT
     }
-    print(type(json.dumps(count_payload)))
-    client.publish(Topics["BACKEND_ACTION_PLANTCOUNT"], json.dumps(count_payload))
+    client.publish(Topics["BACKEND_DATA_PLANTCOUNT"], json.dumps(count_payload))
+    print("BACKEND_DATA_PLANTCOUNT SEND DATA: " + str(count_payload))
diff --git a/software/backend/plantdatabase.py b/software/backend/plantdatabase.py
index 4a30a1b..a2de15d 100644
--- a/software/backend/plantdatabase.py
+++ b/software/backend/plantdatabase.py
@@ -126,5 +126,9 @@ class PlantDataBase:
         self.cur.execute("SELECT COUNT(*) FROM plants")
         return self.cur.fetchone()[0]
 
+    def get_plant_names(self) -> list:
+        self.cur.execute("SELECT PlantName FROM plants")
+        return self.cur.fetchall()
+
     def __del__(self):
         self.conn.close()