diff --git a/DatabaseObject/__pycache__/sensordata.cpython-310.pyc b/DatabaseObject/__pycache__/sensordata.cpython-310.pyc new file mode 100644 index 0000000..230e231 Binary files /dev/null and b/DatabaseObject/__pycache__/sensordata.cpython-310.pyc differ diff --git a/DatabaseObject/sensordata.py b/DatabaseObject/sensordata.py index 4e234aa..90821ed 100644 --- a/DatabaseObject/sensordata.py +++ b/DatabaseObject/sensordata.py @@ -6,5 +6,7 @@ -class sensor(): - \ No newline at end of file +class sensorData(): + def __init__(self, timestamp, moisture): + self.timestamp = timestamp + self.moisture = moisture diff --git a/SQLHandler/SQLconnect.py b/SQLHandler/SQLconnect.py index 3b8c283..a9d1a0e 100644 --- a/SQLHandler/SQLconnect.py +++ b/SQLHandler/SQLconnect.py @@ -1,10 +1,10 @@ # This file contains the function to connect to a secified database. import json import mysql.connector -from Util import configuration as decryption + # Open the config file and readout the data -with open('config.json', 'r') as file: +with open('C:\Users\Nico\Desktop\Gitea\PlantSensorAPI\SQLHandler\config.json', 'r') as file: data = file.read() config = json.loads(data) diff --git a/SQLHandler/__pycache__/SQLconnect.cpython-310.pyc b/SQLHandler/__pycache__/SQLconnect.cpython-310.pyc new file mode 100644 index 0000000..4f3588d Binary files /dev/null and b/SQLHandler/__pycache__/SQLconnect.cpython-310.pyc differ diff --git a/ServerNode/__pycache__/api.cpython-310.pyc b/ServerNode/__pycache__/api.cpython-310.pyc new file mode 100644 index 0000000..98c5c33 Binary files /dev/null and b/ServerNode/__pycache__/api.cpython-310.pyc differ diff --git a/ServerNode/api.py b/ServerNode/api.py index 8ed7dc3..aba8fab 100644 --- a/ServerNode/api.py +++ b/ServerNode/api.py @@ -1,7 +1,20 @@ from flask import Flask, jsonify, request +from DatabaseObject import sensordata +from SQLHandler import SQLconnect + app = Flask(__name__) +mydb = SQLconnect.createConnection("mysql") + +mycursor = mydb.cursor() + +@app.route('/') +def test(): + return "Hello Test" + + + @app.route('/sensordata') def get_sensordata(): @@ -12,7 +25,15 @@ def get_sensordata(): @app.route('/sensordata', methods=['POST']) def add_sensordata(): + timestamp = request.json['timestamp'] + moisture = request.json['moisture'] + + newdata = sensordata(timestamp, moisture) + + sql = "INSERT INTO sensordata (timestamp, moisture_earth) VALUES (%s, %s)" + + mycursor.execute(sql, newdata) - sensordata.append(request.get_json()) + mydb.commit() return '', 204 diff --git a/main.py b/main.py new file mode 100644 index 0000000..ff64ee4 --- /dev/null +++ b/main.py @@ -0,0 +1,7 @@ +from flask import Flask +from ServerNode import api + + + +if __name__== '__main__': + api.app.run(port=3564) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6ffd894 Binary files /dev/null and b/requirements.txt differ