Browse Source

Update v1.3

master
Evangelos Oulis 5 years ago
parent
commit
fb14b3ece4
  1. 5
      gatewayNode/data.json
  2. 7
      gatewayNode/parking.py
  3. BIN
      serverNode/__pycache__/serv.cpython-37.pyc
  4. 161
      serverNode/serv.py

5
gatewayNode/data.json

@ -1,4 +1,7 @@
{ {
"ip": "192.168.89.14", "ip": "192.168.89.14",
"port": "8080" "port": "8080",
"device": "1",
"username": "root",
"password": "root"
} }

7
gatewayNode/parking.py

@ -31,6 +31,11 @@ if json_data != "" and json_data != None:
ser.readline() ser.readline()
prev_status = "-1" prev_status = "-1"
device_session = requests.session()
data = """{"username" :""" + server_par['username'] + """, "password":""" + server_par['password'] + """, "device": """ + server_par['device'] + """}"""
s.post(url = API_ENDPOINT, data = data)
while 1: while 1:
park_status = ser.readline() park_status = ser.readline()
park_status_data = str(park_status).split("#") park_status_data = str(park_status).split("#")
@ -41,7 +46,7 @@ if json_data != "" and json_data != None:
try: try:
if parkingStatus != prev_status: if parkingStatus != prev_status:
data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}""" data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}"""
r = requests.post(url = API_ENDPOINT, data = data) r = s.post(url = API_ENDPOINT, data = data)
if parkingStatus == "0": if parkingStatus == "0":
print("parking reserved. RESPONSE :", r.status_code, "\n") print("parking reserved. RESPONSE :", r.status_code, "\n")
elif parkingStatus == "1": elif parkingStatus == "1":

BIN
serverNode/__pycache__/serv.cpython-37.pyc

Binary file not shown.

161
serverNode/serv.py

@ -7,6 +7,7 @@ from json import dumps
import json import json
from flask_cors import CORS from flask_cors import CORS
import mysql.connector import mysql.connector
import os
# ================================================================== # ==================================================================
# ================================================================== # ==================================================================
@ -15,6 +16,9 @@ import mysql.connector
app = Flask(__name__) app = Flask(__name__)
CORS(app) CORS(app)
# create the secret key for session
app.secret_key = os.urandom(24)
# creating an API object # creating an API object
api = Api(app) api = Api(app)
@ -33,17 +37,17 @@ myCursor = mydb.cursor()
# Define a function that gets the parking status # Define a function that gets the parking status
# for all parking codes. # for all parking codes.
def getParkings(): def getParkings():
parks = [] parks = []
myCursor.execute("SELECT * FROM PARKING") myCursor.execute("SELECT * FROM PARKING")
myRes = myCursor.fetchall() myRes = myCursor.fetchall()
for res in myRes: for res in myRes:
if res[1] == 1: if res[1] == 1:
parks.append({"no": res[0], "status": True}) parks.append({"no": res[0], "status": True})
else: else:
parks.append({"no": res[0], "status": False}) parks.append({"no": res[0], "status": False})
return parks return parks
def isMember(username, password): def isMember(username, password):
myCursor.execute("SELECT * FROM USERS") myCursor.execute("SELECT * FROM USERS")
@ -57,6 +61,12 @@ def isMember(username, password):
return isValid return isValid
def isAuthenticated():
if 'device_id' in session:
return True
else:
return False
# ================================================================== # ==================================================================
# making a class for a particular resource # making a class for a particular resource
@ -64,64 +74,95 @@ def isMember(username, password):
# they are automatically mapped by flask_restful. # they are automatically mapped by flask_restful.
# other methods include put, delete, etc. # other methods include put, delete, etc.
class Parking(Resource): class Parking(Resource):
def get(self): def get(self):
parks = getParkings() try:
return parks, 200 parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
class ParkingStatus(Resource): return parks, 200
def get(self):
return """<html>
<head><title>ERROR</title></head>
<body><h1>Not get at '/parkingStatus'.</h1></body>
</html>"""
def post(self):
# Gets the data into as a JSON Object from HTTP request.
data = json.loads(request.data)
# SQL get all Parking places status.
parks = getParkings()
currentParking = {}
for park in parks:
if park['no'] == data['no']:
currentParking = park
break;
thereIs = False
toUpdate = False
try:
if currentParking['status'] != data['status']:
toUpdate = True
thereIs = True
except IndexError:
# handle Index Error
thereIs = False
toUpdate = False
except KeyError:
# handle the KeyError
thereIs = False
toUpdate = False
if not thereIs:
# Make a new insert entry for a new Parking Code.
values = (int(data['no']), int(data['status']))
myCursor.execute("INSERT INTO PARKING (PARKING_CODE, PARKING_STATUS) VALUES (%s, %s)", values)
mydb.commit()
parks = getParkings()
elif toUpdate:
# Make an Update status for Parking Code that availability changed.
values = (int(data['status']), int(data['no']))
myCursor.execute("UPDATE PARKING SET PARKING_STATUS=%s WHERE PARKING_CODE=%s", values)
mydb.commit()
parks = getParkings()
return currentParking, 201
class ParkingStatus(Resource):
def get(self):
return """<html>
<head><title>ERROR</title></head>
<body><h1>Not get at '/parkingStatus'.</h1></body>
</html>"""
def post(self):
if isAuthenticated():
# Gets the data into as a JSON Object from HTTP request.
data = json.loads(request.data)
try:
# SQL get all Parking places status.
parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
currentParking = {}
for park in parks:
if park['no'] == data['no']:
currentParking = park
break;
thereIs = False
toUpdate = False
try:
if currentParking['status'] != data['status']:
toUpdate = True
thereIs = True
except IndexError:
# handle Index Error
thereIs = False
toUpdate = False
except KeyError:
# handle the KeyError
thereIs = False
toUpdate = False
try:
if not thereIs:
# Make a new insert entry for a new Parking Code.
values = (int(data['no']), int(data['status']))
myCursor.execute("INSERT INTO PARKING (PARKING_CODE, PARKING_STATUS) VALUES (%s, %s)", values)
mydb.commit()
parks = getParkings()
elif toUpdate:
# Make an Update status for Parking Code that availability changed.
values = (int(data['status']), int(data['no']))
myCursor.execute("UPDATE PARKING SET PARKING_STATUS=%s WHERE PARKING_CODE=%s", values)
mydb.commit()
parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
return currentParking, 201
else:
return "Error! You aren't authenticated. [POST] /authenticate first.", 403
class Authenticate(Resource):
def post(self):
try:
#Get the credencial from body of request.
data = json.loads(request.data)
if data['username'] != None and data['password'] != None and data['device'] != None:
isValid = isMember(data['username'], data['password'])
if isValid:
session['device_id'] = data['device']
else:
return "Not Authenticatiove device", 403
else:
return "Error authentication", 403
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
# ================================================================== # ==================================================================
# adding the defined resources along with their corresponding urls to REST APIs # adding the defined resources along with their corresponding urls to REST APIs
api.add_resource(Parking, '/') api.add_resource(Parking, '/')
api.add_resource(ParkingStatus, '/parkingStatus') api.add_resource(ParkingStatus, '/parkingStatus')
api.add_resource(Authenticate, '/authenticate')
# ================================================================== # ==================================================================
# driver function # driver function

Loading…
Cancel
Save