fix(geode_id): Add geode_id param

src/opengeodeweb_microservice/database/data.py

@@ -12,6 +12,7 @@ class Data(Base):
     id: Mapped[str] = mapped_column(
         String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
     )
+    geode_id: Mapped[str] = mapped_column(String, nullable=False)
     geode_object: Mapped[GeodeObjectType] = mapped_column(String, nullable=False)
     viewer_object: Mapped[ViewerType] = mapped_column(String, nullable=False)
     viewer_elements_type: Mapped[ViewerElementsType] = mapped_column(
@@ -23,11 +24,13 @@ class Data(Base):
 
     @staticmethod
     def create(
+        geode_id: str,
         geode_object: GeodeObjectType,
         viewer_object: ViewerType,
         viewer_elements_type: ViewerElementsType,
     ) -> "Data":
         data_entry = Data(
+            geode_id=geode_id,
             geode_object=geode_object,
             viewer_object=viewer_object,
             viewer_elements_type=viewer_elements_type,

tests/test_database.py

@@ -1,28 +1,36 @@
+from sqlalchemy import select
+
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.connection import get_session
 
+GEODE_ID = "01a08187-2c4c-7e64-85c5-52c3439f0626"
+
 
 def test_data_crud_operations(clean_database: None) -> None:
     data = Data.create(
+        geode_id=GEODE_ID,
         geode_object="test_object",
         viewer_object="test_viewer",
         viewer_elements_type="test_type",
     )
     print("id", data.id, flush=True)
     assert data.id is not None
     assert isinstance(data.id, str)
+    assert len(data.id) == 32
 
     retrieved = Data.get(data.id)
     assert retrieved is not None
     assert isinstance(retrieved, Data)
     assert retrieved.geode_object == "test_object"
+    assert retrieved.geode_id == GEODE_ID
     assert retrieved.id == data.id
     non_existent = Data.get("fake_id")
     assert non_existent is None
 
 
 def test_data_with_file_assignments(clean_database: None) -> None:
     data = Data.create(
+        geode_id=GEODE_ID,
         geode_object="geode_object",
         viewer_object="viewer_object",
         viewer_elements_type="test_type",
@@ -42,3 +50,22 @@ def test_data_with_file_assignments(clean_database: None) -> None:
     assert retrieved.viewable_file == "viewable.vtm"
     assert retrieved.light_viewable_file == "light.vtp"
     assert retrieved.geode_object == "geode_object"
+
+
+def test_data_geode_id_is_not_unique(clean_database: None) -> None:
+    first = Data.create(
+        geode_id=GEODE_ID,
+        geode_object="geode_object",
+        viewer_object="viewer_object",
+        viewer_elements_type="test_type",
+    )
+    second = Data.create(
+        geode_id=GEODE_ID,
+        geode_object="geode_object",
+        viewer_object="viewer_object",
+        viewer_elements_type="test_type",
+    )
+    assert first.id != second.id
+    session = get_session()
+    rows = session.scalars(select(Data).where(Data.geode_id == GEODE_ID)).all()
+    assert {row.id for row in rows} == {first.id, second.id}