From ee3f696aef0ff0017712879570026116f0b64d4c Mon Sep 17 00:00:00 2001
From: Nemesis <lorenzo.balugani@gmail.com>
Date: Mon, 19 Apr 2021 16:23:50 +0200
Subject: [PATCH] Even better backend structure

---
 code/backend/nest_backend/__main__.py                 | 6 +++---
 code/backend/nest_backend/database/__init__.py        | 6 ++++++
 code/backend/nest_backend/database/tables/__init__.py | 5 +++++
 code/backend/nest_backend/routes/__init__.py          | 5 +++++
 code/backend/nest_backend/routes/doa.py               | 6 ++++--
 5 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 code/backend/nest_backend/database/__init__.py
 create mode 100644 code/backend/nest_backend/database/tables/__init__.py
 create mode 100644 code/backend/nest_backend/routes/__init__.py

diff --git a/code/backend/nest_backend/__main__.py b/code/backend/nest_backend/__main__.py
index 8db8156..34e35f9 100644
--- a/code/backend/nest_backend/__main__.py
+++ b/code/backend/nest_backend/__main__.py
@@ -1,8 +1,8 @@
 from flask import Flask
 import os
 import werkzeug.middleware.proxy_fix
-from .routes import doa
-from .database.base import Base
+from .routes import *
+from .database import Base
 
 
 app = Flask(__name__)
@@ -14,7 +14,7 @@ reverse_proxy_app = werkzeug.middleware.proxy_fix.ProxyFix(app=app, x_for=1, x_p
 app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://postgres:password@localhost:5432/PdSDev'
 
 # Routes setup
-app.add_url_rule("/doa", view_func=doa.page, methods=["GET"])
+app.add_url_rule("/doa", view_func=page_doa, methods=["GET"])
 
 if __name__ == "__main__":
     try:
diff --git a/code/backend/nest_backend/database/__init__.py b/code/backend/nest_backend/database/__init__.py
new file mode 100644
index 0000000..f699f3f
--- /dev/null
+++ b/code/backend/nest_backend/database/__init__.py
@@ -0,0 +1,6 @@
+from .tables import *
+from .base import Base
+
+"""
+This module imports all the tables and the declarative base
+"""
\ No newline at end of file
diff --git a/code/backend/nest_backend/database/tables/__init__.py b/code/backend/nest_backend/database/tables/__init__.py
new file mode 100644
index 0000000..339563a
--- /dev/null
+++ b/code/backend/nest_backend/database/tables/__init__.py
@@ -0,0 +1,5 @@
+from .Utente import Utente
+
+"""
+This module contains all database classes.
+"""
\ No newline at end of file
diff --git a/code/backend/nest_backend/routes/__init__.py b/code/backend/nest_backend/routes/__init__.py
new file mode 100644
index 0000000..80d20c1
--- /dev/null
+++ b/code/backend/nest_backend/routes/__init__.py
@@ -0,0 +1,5 @@
+from .doa import page_doa
+
+"""
+This module imports all the routes that return something to the frontend.
+"""
\ No newline at end of file
diff --git a/code/backend/nest_backend/routes/doa.py b/code/backend/nest_backend/routes/doa.py
index 71db96b..2ea0f46 100644
--- a/code/backend/nest_backend/routes/doa.py
+++ b/code/backend/nest_backend/routes/doa.py
@@ -1,9 +1,11 @@
 from flask import render_template, abort
-from ..database.tables.Utente import Utente
+from ..database import *
 
 """
 Page that displays a message if the server is on
 """
 
-def page():
+
+def page_doa():
+    utente = Utente()
     return "If you see this, the server is fine."