fix(databaseConnection): imports adapted to new microservice repository and delete duplicated files

Author: MaxNumerique

app.py

@@ -10,7 +10,7 @@
 from src.opengeodeweb_back.routes.models import blueprint_models
 from src.opengeodeweb_back.utils_functions import handle_exception
 from src.opengeodeweb_back import app_config
-from src.opengeodeweb_back.database import initialize_database
+from opengeodeweb_microservice.database.connection import init_database
 
 
 """ Global config """
@@ -58,6 +58,6 @@ def return_error():
 
 # ''' Main '''
 if __name__ == "__main__":
-    initialize_database(app)
+    init_database(app)
     print(f"Python is running in {FLASK_DEBUG} mode")
     app.run(debug=FLASK_DEBUG, host=DEFAULT_HOST, port=PORT, ssl_context=SSL)

requirements.in

@@ -8,4 +8,5 @@ fastjsonschema==2.16.2
 Flask[async]==3.0.3
 Flask-Cors==6.0.1
 werkzeug==3.0.3
-Flask-SQLAlchemy==3.1.1
+Flask-SQLAlchemy==3.1.1
+opengeodeweb-microservice

src/opengeodeweb_back/app_config.py

@@ -4,7 +4,9 @@
 
 # Third party imports
 # Local application imports
-from .database import DATABASE_FILENAME
+from opengeodeweb_microservice.database.connection import get_database_connection
+
+DATABASE_FILENAME = "project.db"
 
 
 class Config(object):

src/opengeodeweb_back/data.py

@@ -11,8 +11,8 @@
 # Local application imports
 from .geode_objects import geode_objects_dict
 from . import utils_functions
-from .data import Data
-from .database import database
+from opengeodeweb_microservice.microservice.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 
 
 def geode_object_value(geode_object: str):
@@ -65,8 +65,6 @@ def load_data(data_id: str) -> Any:
 
 
 def get_data_info(data_id: str) -> Data:
-    from .data import Data
-
     data_entry = Data.get(data_id)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")

src/opengeodeweb_back/database.py

@@ -16,8 +16,8 @@
 
 # Local application imports
 from . import geode_functions
-from .data import Data
-from .database import database
+from opengeodeweb_microservice.microservice.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 
 
 def increment_request_counter(current_app: flask.Flask) -> None:
@@ -256,3 +256,9 @@ def generate_native_viewable_and_light_viewable_from_file(
         input_file=input_filename,
         additional_files=additional_files_copied,
     )
+
+# Modifier toutes les utilisations de database.session par :
+# database.session.add() -> get_session().session.add()
+# database.session.commit() -> get_session().session.commit()
+# database.session.delete() -> get_session().session.delete()
+# database.session.flush() -> get_session().session.flush()