removed comments

changed classmethod to staticmethod in Data model
renamed load function

Author: MaxNumerique

src/opengeodeweb_back/data.py

@@ -10,7 +10,6 @@ class Data(Base):
     id: Mapped[str] = mapped_column(
         String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
     )
-    # name: Mapped[str] = mapped_column(String, nullable=False)
     native_file_name: Mapped[str] = mapped_column(String, nullable=False)
     viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
     geode_object: Mapped[str] = mapped_column(String, nullable=False)
@@ -41,6 +40,6 @@ def create(
         database.session.flush()
         return data_entry
 
-    @classmethod
+    @staticmethod
     def get(cls, data_id: str) -> "Data | None":
         return database.session.get(cls, data_id)

src/opengeodeweb_back/geode_functions.py

@@ -54,8 +54,8 @@ def data_file_path(data_id: str, filename: str = None) -> str:
     return os.path.join(data_folder_path, data_id)
 
 
-def load_data_by_id(data_id: str):
-    data_entry = Data.get(data_id)
+def load_data(data_id: str):
+    data_entry = Data.get(Data, data_id)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -290,7 +290,7 @@ def create_point():
 )
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_data_by_id(flask.request.json["id"])
+    data = geode_functions.load_data(flask.request.json["id"])
     texture_coordinates = data.texture_manager().texture_names()
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
@@ -308,7 +308,7 @@ def texture_coordinates():
 )
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data_by_id(flask.request.json["id"])
+    data = geode_functions.load_data(flask.request.json["id"])
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
     return flask.make_response(
         {
@@ -331,7 +331,7 @@ def vertex_attribute_names():
 )
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_data_by_id(flask.request.json["id"])
+    data = geode_functions.load_data(flask.request.json["id"])
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
     return flask.make_response(
         {
@@ -354,7 +354,7 @@ def polygon_attribute_names():
 )
 def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, polyhedron_attribute_names_json)
-    data = geode_functions.load_data_by_id(flask.request.json["id"])
+    data = geode_functions.load_data(flask.request.json["id"])
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
     return flask.make_response(
         {

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -49,6 +49,6 @@ def extract_model_uuids(model):
 @routes.route(mesh_components_json["route"], methods=mesh_components_json["methods"])
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
-    model = geode_functions.load_data_by_id(flask.request.json["id"])
+    model = geode_functions.load_data(flask.request.json["id"])
     uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

tests/test_utils_functions.py

@@ -118,7 +118,7 @@ def test_save_all_viewables_and_return_info(client):
         assert result["geode_object"] == geode_object
         assert result["input_files"] == input_file
 
-        db_entry = Data.get(result["id"])
+        db_entry = Data.get(Data, result["id"])
         assert db_entry is not None
         assert db_entry.native_file_name == result["native_file_name"]
         assert db_entry.viewable_file_name == result["viewable_file_name"]
@@ -140,11 +140,11 @@ def test_save_all_viewables_commits_to_db(client):
             geode_object, data, input_file
         )
         data_id = result["id"]
-        db_entry_before = Data.get(data_id)
+        db_entry_before = Data.get(Data, data_id)
         assert db_entry_before is not None
         assert db_entry_before.native_file_name == result["native_file_name"]
         database.session.rollback()
-        db_entry_after = Data.get(data_id)
+        db_entry_after = Data.get(Data, data_id)
         assert (
             db_entry_after is not None
         ), "database.session.commit() was not called - entry missing after rollback"