Merge branch 'feat/database' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/database

Author: MaxNumerique

src/opengeodeweb_back/app_config.py

@@ -24,7 +24,9 @@ class ProdConfig(Config):
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "/data/"
-    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(DATA_FOLDER_PATH, 'db.sqlite3')}"
+    SQLALCHEMY_DATABASE_URI = (
+        f"sqlite:///{os.path.join(DATA_FOLDER_PATH, 'db.sqlite3')}"
+    )
 
 
 class DevConfig(Config):
@@ -33,4 +35,6 @@ class DevConfig(Config):
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "./data/"
-    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(DATA_FOLDER_PATH, 'db.sqlite3')}"
+    SQLALCHEMY_DATABASE_URI = (
+        f"sqlite:///{os.path.join(DATA_FOLDER_PATH, 'db.sqlite3')}"
+    )

src/opengeodeweb_back/database.py

@@ -4,11 +4,12 @@
 
 initialized = False
 
+
 def init_db(app):
     global initialized
     if initialized:
-        return db 
-    print('DB', app.config.get("SQLALCHEMY_DATABASE_URI"))
+        return db
+    print("DB", app.config.get("SQLALCHEMY_DATABASE_URI"))
     db.init_app(app)
     with app.app_context():
         db.create_all()

tests/conftest.py

@@ -26,7 +26,7 @@ def client():
     app.config["REQUEST_COUNTER"] = 0
     app.config["LAST_REQUEST_TIME"] = time.time()
     BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-    db_path = os.path.join(BASE_DIR, "data", "project.db") 
+    db_path = os.path.join(BASE_DIR, "data", "project.db")
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
 
     print("Current working directory:", os.getcwd())

tests/test_utils_functions.py

@@ -113,7 +113,9 @@ def test_save_all_viewables_and_return_info(client):
         assert db_entry is not None
         assert db_entry.name == data.name()
         assert db_entry.native_file_name == os.path.basename(result["native_file_name"])
-        assert db_entry.viewable_file_name == os.path.basename(result["viewable_file_name"])
+        assert db_entry.viewable_file_name == os.path.basename(
+            result["viewable_file_name"]
+        )
         assert db_entry.light_viewable == os.path.basename(db_entry.light_viewable)
         assert db_entry.geode_object == geode_object
         assert db_entry.input_files == additional_files