fix: 🐛 fixed driver and vehicle apis, swapped dbms to postgres and refactored project structure
This commit is contained in:
179
app.py
179
app.py
@@ -1,155 +1,204 @@
|
||||
from driverHandler import DriverHandler
|
||||
from gpxInterpreter import GPXHandler
|
||||
from vehicleHandler import VehicleHandler
|
||||
import sys
|
||||
import os
|
||||
import logging
|
||||
from flask import Flask, jsonify, send_from_directory, request
|
||||
from dotenv import load_dotenv
|
||||
from flask import Flask, app, send_from_directory, request
|
||||
from sqlalchemy import NullPool, create_engine
|
||||
from sqlalchemy.orm import sessionmaker, Session
|
||||
from geoObjects import createTables
|
||||
from modules.driverHandler import DriverHandler
|
||||
from modules.gpxInterpreter import GPXHandler
|
||||
from modules.vehicleHandler import VehicleHandler
|
||||
from modules.geoObjects import create_table, db_connect
|
||||
from flask_cors import CORS, cross_origin
|
||||
|
||||
__session: Session
|
||||
FlaskApp: app
|
||||
__gpxHandler: GPXHandler
|
||||
__driverHandler: DriverHandler
|
||||
__vehicleHandler: VehicleHandler
|
||||
root = logging.getLogger()
|
||||
root.setLevel(logging.DEBUG)
|
||||
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
handler.setLevel(logging.DEBUG)
|
||||
formatter = logging.Formatter(
|
||||
'%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||
handler.setFormatter(formatter)
|
||||
root.addHandler(handler)
|
||||
|
||||
print("load environment")
|
||||
load_dotenv()
|
||||
|
||||
|
||||
def entryPoint():
|
||||
print("load environment")
|
||||
load_dotenv()
|
||||
print("create flask application")
|
||||
app = Flask(__name__, static_folder='web/dist')
|
||||
cors = CORS(app) # allow CORS for all domains on all routes.
|
||||
app.config['CORS_HEADERS'] = 'Content-Type'
|
||||
app.logger.setLevel(logging.DEBUG)
|
||||
|
||||
print("create flask application")
|
||||
FlaskApp = Flask(__name__, static_folder='web/dist')
|
||||
print("initialize database")
|
||||
engine = db_connect()
|
||||
SessionFactory = sessionmaker(bind=engine)
|
||||
session = SessionFactory()
|
||||
create_table(engine)
|
||||
|
||||
def db_connect(connectionPath):
|
||||
return create_engine(connectionPath, poolclass=NullPool)
|
||||
|
||||
__session = sessionmaker(bind=db_connect())()
|
||||
|
||||
# handler classes
|
||||
# handles parsing files and interacting with database
|
||||
__gpxHandler = GPXHandler(__session)
|
||||
__driverHandler = DriverHandler(__session)
|
||||
__vehicleHandler = VehicleHandler(__session)
|
||||
|
||||
# creating tables
|
||||
createTables(__session)
|
||||
|
||||
app.run(debug=True)
|
||||
|
||||
# TODO: move functional parts out to api package if not handled by other classes
|
||||
print("initialize handlers")
|
||||
gpxHandler = GPXHandler(session)
|
||||
driverHandler = DriverHandler(session)
|
||||
vehicleHandler = VehicleHandler(session)
|
||||
|
||||
|
||||
@FlaskApp.route('/')
|
||||
@app.route('/')
|
||||
@cross_origin()
|
||||
def serve_vue_app():
|
||||
return send_from_directory(FlaskApp.static_folder, 'index.html')
|
||||
return send_from_directory(app.static_folder, 'index.html')
|
||||
|
||||
@FlaskApp.route("/track", method=['GET'])
|
||||
|
||||
@app.route("/track", methods=['GET'])
|
||||
@cross_origin()
|
||||
def getTrack():
|
||||
|
||||
|
||||
if "start" in request.args and "end" in request.args or "track" in request.args:
|
||||
if "start" in request.args and "end" in request.args:
|
||||
# get tracks by filter
|
||||
start = request.args["start"]
|
||||
end = request.args["end"]
|
||||
try:
|
||||
return __gpxHandler.getTracksInTime(request.args["start"], request.args["end"]), 200
|
||||
return gpxHandler.getTracksInTime(start, request.args["end"]), 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"failed to search tracks error {
|
||||
e} values: start={start}, end={end}")
|
||||
return f"error {e}", 500
|
||||
|
||||
|
||||
elif "track" in request.args:
|
||||
# get track by id
|
||||
track = int(request.args["track"])
|
||||
try:
|
||||
return __gpxHandler.getTrack(int(request.args["track"])), 200
|
||||
return gpxHandler.getTrack(track), 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"fetching track {
|
||||
track} failed with error {e}")
|
||||
return f"error {e}", 500
|
||||
|
||||
|
||||
pass
|
||||
else:
|
||||
# gets all tracks as list
|
||||
return __gpxHandler.getTracks()
|
||||
try:
|
||||
# gets all tracks as list
|
||||
return gpxHandler.getTracks()
|
||||
except Exception as e:
|
||||
app.logger.debug(f"fetching all tracks failed with error {e}")
|
||||
return f"error {e}", 500
|
||||
|
||||
@FlaskApp.route("/driver", methods=['GET', 'POST'])
|
||||
|
||||
@app.route("/driver", methods=['GET', 'POST'])
|
||||
@cross_origin()
|
||||
def handleDriverRoute():
|
||||
|
||||
if request.method == "GET":
|
||||
if 'driver' in request.args:
|
||||
|
||||
try:
|
||||
__driverHandler.getVehicle(int(request.args["driver"]))
|
||||
# return drivers, 200
|
||||
driver = driverHandler.getDriver(int(request.args["driver"]))
|
||||
return driver, 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"getting driver failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
else:
|
||||
|
||||
try:
|
||||
__driverHandler.getVehicles()
|
||||
# return drivers, 200
|
||||
drivers = driverHandler.getDrivers()
|
||||
return drivers, 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"getting drivers failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
elif request.method == "POST":
|
||||
if "name" not in request.args:
|
||||
|
||||
# grabbing json from request
|
||||
data = request.get_json()
|
||||
app.logger.debug(f"json request payload: {data}")
|
||||
|
||||
if "name" not in data:
|
||||
app.logger.debug(f"no driver name was found in request")
|
||||
return "missing name", 400
|
||||
|
||||
app.logger.debug(f"driver name has passed check {data["name"]}")
|
||||
|
||||
# handle creating vehicle
|
||||
try:
|
||||
__driverHandler.createVehicle(request.args["name"])
|
||||
# TODO: return id, 200
|
||||
app.logger.debug(f"json request name: {data["name"]}")
|
||||
driver = driverHandler.createDriver(data["name"])
|
||||
return jsonify({"name": driver.name, "id": driver.id}), 200
|
||||
|
||||
except Exception as e:
|
||||
app.logger.debug(f"creating drivers failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
@FlaskApp.route("/vehicle", methods=['GET', 'POST'])
|
||||
|
||||
@app.route("/vehicle", methods=['GET', 'POST'])
|
||||
@cross_origin()
|
||||
def handleVehicleRoute():
|
||||
|
||||
if request.method == "GET":
|
||||
if 'vehicle' in request.args:
|
||||
app.logger.debug(f"no vehicle id was found in request")
|
||||
vehicle = int(request.args["vehicle"])
|
||||
|
||||
try:
|
||||
__vehicleHandler.getVehicle(int(request.args["driver"]))
|
||||
# return drivers, 200
|
||||
foundVehicle = vehicleHandler.getVehicle(vehicle)
|
||||
return foundVehicle, 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"getting vehicle {vehicle} failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
else:
|
||||
|
||||
try:
|
||||
__vehicleHandler.getVehicles()
|
||||
# return drivers, 200
|
||||
foundVehicles = vehicleHandler.getVehicles()
|
||||
return foundVehicles, 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"getting all vehicles failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
elif request.method == "POST":
|
||||
if "name" not in request.args:
|
||||
data = request.get_json()
|
||||
app.logger.debug(f"json request payload: {data}")
|
||||
|
||||
if "name" not in data:
|
||||
return "missing name", 400
|
||||
|
||||
if "type" not in request.args:
|
||||
return "missing type", 400
|
||||
name = data["name"]
|
||||
|
||||
# handle creating vehicle
|
||||
try:
|
||||
__vehicleHandler.createVehicle(
|
||||
request.args["name"], request.args["type"])
|
||||
vehicle = vehicleHandler.createVehicle(name)
|
||||
return jsonify({"id": vehicle.id, "name": vehicle.name}), 200
|
||||
|
||||
except Exception as e:
|
||||
app.logger.debug(f"creating vehicle with name {name} failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
@FlaskApp.route('/upload', methods=['POST'])
|
||||
|
||||
@app.route('/upload', methods=['POST'])
|
||||
@cross_origin()
|
||||
def uploadFile():
|
||||
if 'file' not in request.files:
|
||||
app.logger.debug("no file was found in clients request")
|
||||
return "no file provided", 400
|
||||
|
||||
if request.args["routeName"] == '':
|
||||
return "no routename provided", 400
|
||||
app.logger.debug("client did not provide any name for uploaded route")
|
||||
return "no route name provided", 400
|
||||
|
||||
file = request.files['file']
|
||||
if file.filename == '':
|
||||
app.logger.debug("filename was found empty")
|
||||
return "no file selected", 400
|
||||
|
||||
try:
|
||||
__gpxHandler.parse(file, request.args["routeName"])
|
||||
app.logger.debug(f"attempting to parse file: {file.name}")
|
||||
gpxHandler.parse(file, request.args["routeName"])
|
||||
return "file stored succesfull", 200
|
||||
except Exception as e:
|
||||
app.logger.debug(f"storing gpx file failed with error {e}")
|
||||
return "error" + " " + str(e), 500
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
entryPoint()
|
||||
app.run(debug=True)
|
||||
app.logger.debug("flask app started")
|
||||
|
||||
Reference in New Issue
Block a user