app_config.py added

import session into data.py

Author: MaxNumerique

src/opengeodeweb_microservice/app_config.py

@@ -1,38 +1,17 @@
-# # Standard library imports
-# import os
-# import time
+import os
+from .database.session import DATABASE_FILENAME
 
-# # Third party imports
-# # Local application imports
-# from .database import DATABASE_FILENAME
 
+class ProdConfig(Config):
+    DATA_FOLDER_PATH = "/data"
+    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.abspath(
+        os.path.join(DATA_FOLDER_PATH, DATABASE_FILENAME)
+        )}"
 
-# class Config(object):
-#     FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
-#     DEFAULT_HOST = "localhost"
-#     DEFAULT_PORT = "5000"
-#     CORS_HEADERS = "Content-Type"
-#     UPLOAD_FOLDER = "./uploads"
-#     REQUEST_COUNTER = 0
-#     LAST_REQUEST_TIME = time.time()
-#     LAST_PING_TIME = time.time()
-#     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
-
-# class ProdConfig(Config):
-#     DATA_FOLDER_PATH = "/data"
-#     SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.abspath(
-#         os.path.join(DATA_FOLDER_PATH, DATABASE_FILENAME)
-#         )}"
-
-
-# class DevConfig(Config):
-#     SSL = None
-#     ORIGINS = "*"
-#     MINUTES_BEFORE_TIMEOUT = "1"
-#     SECONDS_BETWEEN_SHUTDOWNS = "10"
-#     BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-#     DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
-#     SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(
-#         BASE_DIR, DATA_FOLDER_PATH, DATABASE_FILENAME
-#         )}"
+class DevConfig(Config):
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+    DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
+    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(
+        BASE_DIR, DATA_FOLDER_PATH, DATABASE_FILENAME
+        )}"

src/opengeodeweb_microservice/microservice/data.py

@@ -1,6 +1,7 @@
 from sqlalchemy import String, JSON
 from sqlalchemy.orm import Mapped, mapped_column
-from src.opengeodeweb_microservice.microservice.base import database, Base
+from ..database.session import get_session
+from .base import Base
 import uuid
 
 
@@ -36,10 +37,12 @@ def create(
             light_viewable=None,
         )
 
-        database.session.add(data_entry)
-        database.session.flush()
+        session = get_session()
+        session.session.add(data_entry)
+        session.session.flush()
         return data_entry
 
     @staticmethod
     def get(data_id: str) -> "Data | None":
-        return database.session.get(Data, data_id)
+        session = get_session()
+        return session.session.get(Data, data_id)