From ee5a164653d7f1f67cb9aa3a9def3ecbd2fabf89 Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <yuki@vachot.fr>
Date: Wed, 8 Dec 2021 09:44:22 +0100
Subject: [PATCH] Update: Not working

---
 backend/app.py                           | 34 +++++++++++++++++++++---
 backend/application/__init__.py          | 31 ---------------------
 backend/{application => }/logs_model.py  |  2 +-
 backend/{application => }/responses.py   |  0
 backend/{application => }/routes.py      |  6 ++---
 backend/{application => }/users_model.py |  2 +-
 6 files changed, 36 insertions(+), 39 deletions(-)
 delete mode 100644 backend/application/__init__.py
 rename backend/{application => }/logs_model.py (97%)
 rename backend/{application => }/responses.py (100%)
 rename backend/{application => }/routes.py (95%)
 rename backend/{application => }/users_model.py (97%)

diff --git a/backend/app.py b/backend/app.py
index 7a0c77b..77aec81 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -1,6 +1,34 @@
-from application import create_app
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from ddtrace import patch_all
+import sys
+import os
+
+db = SQLAlchemy()
+patch_all()
 
-app = create_app()
 
 if __name__ == "__main__":
-    app.run(host='0.0.0.0')
+    app = Flask(__name__)
+    FLASK_ENV = os.environ.get('FLASK_ENV', None)
+    if FLASK_ENV == 'production':
+        app.config.from_object("config.ProductionConfig")
+    elif FLASK_ENV == 'staging':
+        app.config.from_object("config.StagingConfig")
+    elif FLASK_ENV == 'development':
+        app.config.from_object("config.DevelopmentConfig")
+    else:
+        app.config.from_object("config.Config")
+
+    if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None:
+        print('No ENV Variables for DATABASE_URL_1 or DATABASE_URL_2')
+        sys.exit(1)
+    else:
+        print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS'])
+
+    # db.init_app(app)
+    # with app.app_context():
+        # from . import routes
+        # db.create_all()
+    PORT = os.environ.get('PORT', 4999)
+    app.run(host='0.0.0.0', port=PORT)
diff --git a/backend/application/__init__.py b/backend/application/__init__.py
deleted file mode 100644
index 1734aec..0000000
--- a/backend/application/__init__.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from flask import Flask
-from flask_sqlalchemy import SQLAlchemy
-from ddtrace import patch_all
-import sys
-import os
-
-db = SQLAlchemy()
-patch_all()
-
-
-def create_app():
-    app = Flask(__name__)
-    FLASK_ENV = os.environ.get('FLASK_ENV', None)
-    if FLASK_ENV == 'production':
-        app.config.from_object("config.ProductionConfig")
-    elif FLASK_ENV == 'staging':
-        app.config.from_object("config.StagingConfig")
-    elif FLASK_ENV == 'development':
-        app.config.from_object("config.DevelopmentConfig")
-    else:
-        app.config.from_object("config.Config")
-
-    if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None:
-        print('No ENV Variable for DATABASE_URL_1 or DATABASE_URL_2')
-        sys.exit(1)
-
-    db.init_app(app)
-    with app.app_context():
-        from . import routes
-        db.create_all()
-        return app
diff --git a/backend/application/logs_model.py b/backend/logs_model.py
similarity index 97%
rename from backend/application/logs_model.py
rename to backend/logs_model.py
index 78b42a2..0432ff8 100644
--- a/backend/application/logs_model.py
+++ b/backend/logs_model.py
@@ -1,4 +1,4 @@
-from . import db
+from app import db
 
 
 class Logs(db.Model):
diff --git a/backend/application/responses.py b/backend/responses.py
similarity index 100%
rename from backend/application/responses.py
rename to backend/responses.py
diff --git a/backend/application/routes.py b/backend/routes.py
similarity index 95%
rename from backend/application/routes.py
rename to backend/routes.py
index 8e582d9..3c36499 100644
--- a/backend/application/routes.py
+++ b/backend/routes.py
@@ -1,8 +1,8 @@
 from flask import current_app as app
 from flask import request
-from .logs_model import Logs, db
-from .users_model import Users, db
-from .responses import send_message, send_error
+from logs_model import db
+from users_model import Users, db
+from responses import send_message, send_error
 
 
 # Login
diff --git a/backend/application/users_model.py b/backend/users_model.py
similarity index 97%
rename from backend/application/users_model.py
rename to backend/users_model.py
index c378181..c5ce292 100644
--- a/backend/application/users_model.py
+++ b/backend/users_model.py
@@ -1,4 +1,4 @@
-from . import db
+from app import db
 
 
 class Users(db.Model):