input_filename & additional_filenames

Author: JulienChampagnol

src/opengeodeweb_microservice/database/data.py

@@ -17,22 +17,22 @@ class Data(Base):
     native_filename: Mapped[str | None] = mapped_column(String, nullable=True)
     viewable_filename: Mapped[str | None] = mapped_column(String, nullable=True)
 
-    light_viewable: Mapped[str | None] = mapped_column(String, nullable=True)
-    input_file: Mapped[str | None] = mapped_column(String, nullable=True)
-    additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
+    light_viewable_filename: Mapped[str | None] = mapped_column(String, nullable=True)
+    input_filename: Mapped[str | None] = mapped_column(String, nullable=True)
+    additional_filenames: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
 
     @staticmethod
     def create(
         geode_object: str,
         viewer_object: str,
-        input_file: str | None = None,
-        additional_files: list[str] | None = None,
+        input_filename: str | None = None,
+        additional_filenames: list[str] | None = None,
     ) -> "Data":
         data_entry = Data(
             geode_object=geode_object,
             viewer_object=viewer_object,
-            input_file=input_file,
-            additional_files=additional_files,
+            input_filename=input_filename,
+            additional_filenames=additional_filenames,
         )
 
         session = get_session()

tests/test_database.py

@@ -5,8 +5,8 @@ def test_data_crud_operations(clean_database):
     data = Data.create(
         geode_object="test_object",
         viewer_object="test_viewer",
-        input_file="test.txt",
-        additional_files=[],
+        input_filename="test.txt",
+        additional_filenames=[],
     )
     print("id", data.id, flush=True)
     assert data.id is not None
@@ -16,7 +16,7 @@ def test_data_crud_operations(clean_database):
     assert retrieved is not None
     assert isinstance(retrieved, Data)
     assert retrieved.geode_object == "test_object"
-    assert retrieved.input_file == "test.txt"
+    assert retrieved.input_filename == "test.txt"
     assert retrieved.id == data.id
     non_existent = Data.get("fake_id")
     assert non_existent is None
@@ -25,13 +25,13 @@ def test_data_crud_operations(clean_database):
 def test_data_with_additional_files(clean_database):
     files = ["file1.txt", "file2.txt"]
     data = Data.create(
-        geode_object="test_files", viewer_object="test_viewer", additional_files=files
+        geode_object="test_files", viewer_object="test_viewer", additional_filenames=files
     )
     assert data.id is not None
     assert isinstance(data.id, str)
 
     retrieved = Data.get(data.id)
     assert retrieved is not None
     assert isinstance(retrieved, Data)
-    assert retrieved.additional_files == files
+    assert retrieved.additional_filenames == files
     assert retrieved.geode_object == "test_files"