fix(Data): add viewer object

Author: BotellaA

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -26,21 +26,23 @@ def register(self, params):
         validate_schema(
             params, self.generic_schemas_dict["register"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        specific_params = {"id": params["id"]}
-        if viewer_object == "mesh":
+        data_id = str(params["id"])
+        specific_params = {"id": data_id}
+        data = self.get_data(data_id)
+        if data.viewer_object == "mesh":
             self.mesh_protocols.registerMesh(specific_params)
-        elif viewer_object == "model":
+        elif data.viewer_object == "model":
             self.model_protocols.registerModel(specific_params)
 
     @exportRpc(generic_prefix + generic_schemas_dict["deregister"]["rpc"])
     def deregister(self, params):
         validate_schema(
             params, self.generic_schemas_dict["deregister"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        specific_params = {"id": params["id"]}
-        if viewer_object == "mesh":
+        data_id = str(params["id"])
+        specific_params = {"id": data_id}
+        data = self.get_data(data_id)
+        if data.viewer_object == "mesh":
             self.mesh_protocols.deregisterMesh(specific_params)
-        elif viewer_object == "model":
+        elif data.viewer_object == "model":
             self.model_protocols.deregisterModel(specific_params)

src/opengeodeweb_viewer/rpc/generic/schemas/deregister.json

@@ -2,21 +2,12 @@
   "rpc": "deregister",
   "type": "object",
   "properties": {
-    "viewer_object": {
-      "type": "string",
-      "minLength": 1,
-      "enum": [
-        "mesh",
-        "model"
-      ]
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "viewer_object",
     "id"
   ],
   "additionalProperties": false

src/opengeodeweb_viewer/rpc/generic/schemas/register.json

@@ -2,21 +2,12 @@
   "rpc": "register",
   "type": "object",
   "properties": {
-    "viewer_object": {
-      "type": "string",
-      "minLength": 1,
-      "enum": [
-        "mesh",
-        "model"
-      ]
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "viewer_object",
     "id"
   ],
   "additionalProperties": false

src/tests/conftest.py

@@ -209,11 +209,11 @@ def configure_test_environment() -> Generator[None, None, None]:
 @pytest.fixture
 def dataset_factory() -> Callable[..., str]:
     def create_dataset(
-        *, id: str, viewable_file_name: str, geode_object: str | None = None
+        *, id: str, viewable_file_name: str, viewer_object: str | None = None
     ) -> str:
         session = get_session()
-        if geode_object is None:
-            geode_object = (
+        if viewer_object is None:
+            viewer_object = (
                 "model" if viewable_file_name.lower().endswith(".vtm") else "mesh"
             )
 
@@ -222,12 +222,9 @@ def create_dataset(
             session.add(
                 Data(
                     id=id,
-                    native_file_name="",
                     viewable_file_name=viewable_file_name,
-                    geode_object=geode_object,
-                    light_viewable=None,
-                    input_file="",
-                    additional_files=[],
+                    geode_object=viewer_object,
+                    viewer_object=viewer_object,
                 )
             )
         else:

src/tests/test_generic_protocols.py

@@ -12,7 +12,7 @@ def test_register_mesh(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
-        [{"id": data_id, "viewer_object": "mesh"}],
+        [{"id": data_id}],
     )
     assert server.compare_image(3, "mesh/register.jpeg") is True
 
@@ -26,7 +26,7 @@ def test_register_model(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
-        [{"id": data_id, "viewer_object": "model"}],
+        [{"id": data_id}],
     )
     assert server.compare_image(3, "model/register.jpeg") is True
 
@@ -39,7 +39,7 @@ def test_deregister_mesh(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
-        [{"id": "123456789", "viewer_object": "mesh"}],
+        [{"id": "123456789"}],
     )
     assert server.compare_image(3, "mesh/deregister.jpeg") == True
 
@@ -52,6 +52,6 @@ def test_deregister_model(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
-        [{"id": "123456789", "viewer_object": "model"}],
+        [{"id": "123456789"}],
     )
     assert server.compare_image(3, "model/deregister.jpeg") == True