removed "name" from Data model

Author: MaxNumerique

src/opengeodeweb_back/data.py

@@ -10,7 +10,7 @@ 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)
+    # 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)
@@ -21,7 +21,7 @@ class Data(Base):
 
     @staticmethod
     def create(
-        name: str,
+        # name: str,
         geode_object: str,
         input_file: str | None = None,
         additional_files: list[str] | None = None,
@@ -30,7 +30,7 @@ def create(
         additional_files = additional_files if additional_files is not None else []
 
         data_entry = Data(
-            name=name,
+            # name=name,
             geode_object=geode_object,
             input_file=input_file,
             additional_files=additional_files,

src/opengeodeweb_back/geode_functions.py

@@ -56,7 +56,6 @@ def data_file_path(data_id: str, filename: str = None) -> str:
 
 def load_data_by_id(data_id: str):
     data_entry = Data.get(data_id)
-    print(data_entry.geode_object)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")
 

src/opengeodeweb_back/utils_functions.py

@@ -170,7 +170,6 @@ def save_all_viewables_and_return_info(
         additional_files = []
 
     data_entry = Data.create(
-        name=data.name(),
         geode_object=geode_object,
         input_file=input_file,
         additional_files=additional_files,
@@ -197,7 +196,6 @@ def save_all_viewables_and_return_info(
     database.session.commit()
 
     return {
-        "name": data_entry.name,
         "native_file_name": data_entry.native_file_name,
         "viewable_file_name": data_entry.viewable_file_name,
         "id": data_entry.id,
@@ -219,7 +217,6 @@ def generate_native_viewable_and_light_viewable_from_file(
     geode_object: str, input_filename: str
 ) -> dict[str, Any]:
     temp_data_entry = Data.create(
-        name="temp",
         geode_object=geode_object,
         input_file=input_filename,
         additional_files=[],

tests/test_models_routes.py

@@ -33,13 +33,18 @@ def test_extract_brep_uuids(client, test_id):
     brep_filename = "cube.og_brep"
 
     with client.application.app_context():        
-        data_entry = Data.create(name="test_brep", geode_object="BRep", input_file=brep_filename)
+        data_entry = Data.create(
+            geode_object="BRep",
+            input_file=brep_filename
+        )
         data_entry.native_file_name = brep_filename
         database.session.commit()
-        data_path = geode_functions.data_file_path(test_id, brep_filename)
+        
+        data_path = geode_functions.data_file_path(data_entry.id, brep_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy(f"./tests/data/{brep_filename}", data_path)
-    json_data = {"id": test_id}
+    
+    json_data = {"id": data_entry.id}
     response = client.post(route, json=json_data)
 
     assert response.status_code == 200

tests/test_routes.py

@@ -153,8 +153,6 @@ def get_full_data():
     # Normal test with filename 'corbi.og_brep'
     response = client.post(route, json=get_full_data())
     assert response.status_code == 200
-    name = response.json["name"]
-    assert type(name) is str
     native_file_name = response.json["native_file_name"]
     assert type(native_file_name) is str
     viewable_file_name = response.json["viewable_file_name"]
@@ -174,7 +172,6 @@ def get_full_data():
 def test_texture_coordinates(client, test_id):    
     with client.application.app_context():
         data = Data.create(
-            name="hat",
             geode_object="PolygonalSurface3D",
             input_file="hat.vtp"
         )
@@ -204,7 +201,6 @@ def test_vertex_attribute_names(client, test_id):
 
     with client.application.app_context():
         data = Data.create(
-            name="test_mesh",
             geode_object="PolygonalSurface3D",
             input_file="test.vtp"
         )
@@ -229,7 +225,6 @@ def test_polygon_attribute_names(client, test_id):
 
     with client.application.app_context():
         data = Data.create(
-            name="test_mesh",
             geode_object="PolygonalSurface3D",
             input_file="test.vtp"
         )
@@ -253,7 +248,6 @@ def test_polyhedron_attribute_names(client, test_id):
 
     with client.application.app_context():
         data = Data.create(
-            name="test_mesh",
             geode_object="PolyhedralSolid3D",
             input_file="test.vtu"
         )

tests/test_utils_functions.py

@@ -108,7 +108,6 @@ def test_save_all_viewables_and_return_info(client):
         )
 
         assert isinstance(result, dict)
-        assert result["name"] == data.name()
         assert result["native_file_name"].startswith("native.")
         assert result["viewable_file_name"].endswith(".vtm")
         assert isinstance(result["id"], str)
@@ -121,7 +120,6 @@ def test_save_all_viewables_and_return_info(client):
 
         db_entry = Data.get(result["id"])
         assert db_entry is not None
-        assert db_entry.name == data.name()
         assert db_entry.native_file_name == result["native_file_name"]
         assert db_entry.viewable_file_name == result["viewable_file_name"]
         assert db_entry.geode_object == geode_object
@@ -166,7 +164,6 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
         )
 
     assert isinstance(result, dict)
-    assert isinstance(result["name"], str)
     assert isinstance(result["native_file_name"], str)
     assert result["native_file_name"].startswith("native.")
     assert isinstance(result["viewable_file_name"], str)
@@ -189,7 +186,6 @@ def test_generate_native_viewable_and_light_viewable_from_file(client):
         )
 
     assert isinstance(result, dict)
-    assert isinstance(result["name"], str)
     assert isinstance(result["native_file_name"], str)
     assert result["native_file_name"].startswith("native.")
     assert isinstance(result["viewable_file_name"], str)