rechange some tests & functions

Author: SpliiT

src/opengeodeweb_back/geode_functions.py

@@ -55,8 +55,7 @@ def geode_object_output_extensions(
     geode_object: GeodeObject,
 ) -> dict[GeodeObjectType, dict[str, bool]]:
     results: dict[GeodeObjectType, dict[str, bool]] = {}
-    current_type = geode_object.geode_object_type()
-    for mixin_geode_object in geode_objects[current_type].__mro__:
+    for mixin_geode_object in geode_objects[geode_object.geode_object_type()].__mro__:
         output_extensions_method = getattr(
             mixin_geode_object, "output_extensions", None
         )
@@ -67,16 +66,11 @@ def geode_object_output_extensions(
             continue
         object_output_extensions: dict[str, bool] = {}
         is_saveable_method = getattr(mixin_geode_object, "is_saveable")
-        target_type = None
-        if hasattr(mixin_geode_object, "geode_object_type"):
-            target_type = mixin_geode_object.geode_object_type()
-        if target_type and target_type != current_type:
-            continue
         for output_extension in output_extensions:
             bool_is_saveable = is_saveable_method(
                 geode_object, f"test.{output_extension}"
             )
             object_output_extensions[output_extension] = bool_is_saveable
-        if target_type:
-            results[target_type] = object_output_extensions
-    return results
+        if hasattr(mixin_geode_object, "geode_object_type"):
+            results[mixin_geode_object.geode_object_type()] = object_output_extensions
+    return results

src/opengeodeweb_back/utils_functions.py

@@ -212,6 +212,10 @@ def save_all_viewables_and_return_info(
         data.native_file = os.path.basename(native_files[0])
         data.viewable_file = os.path.basename(viewable_path)
         data.light_viewable_file = os.path.basename(light_path)
+        
+        if not data.input_file:
+            data.input_file = data.native_file
+        
         assert data.native_file is not None
         assert data.viewable_file is not None
         assert data.light_viewable_file is not None
@@ -223,11 +227,10 @@ def save_all_viewables_and_return_info(
             "viewer_type": data.viewer_object,
             "binary_light_viewable": binary_light_viewable.decode("utf-8"),
             "geode_object_type": data.geode_object,
-            "input_file": data.input_file or "",
+            "input_file": data.input_file or "", 
             "additional_files": data.additional_files or [],
         }
 
-
 def generate_native_viewable_and_light_viewable_from_object(
     geode_object: GeodeObject,
 ) -> dict[str, str | list[str]]:

tests/test_utils_functions.py

@@ -183,16 +183,29 @@ def test_generate_native_viewable_and_light_viewable_from_object(
             )
         )
 
-    assert isinstance(result, dict)
-    assert isinstance(result["native_file"], str)
-    assert result["native_file"].startswith("native.")
-    assert isinstance(result["viewable_file"], str)
-    assert result["viewable_file"].endswith(".vtm")
-    assert isinstance(result["id"], str)
-    assert re.match(r"[0-9a-f]{32}", result["id"])
-    assert isinstance(result["viewer_type"], str)
-    assert isinstance(result["binary_light_viewable"], str)
-    assert result["input_file"] == ""
+        assert isinstance(result, dict)
+        assert isinstance(result["native_file"], str)
+        assert result["native_file"].startswith("native.")
+        assert isinstance(result["viewable_file"], str)
+        assert result["viewable_file"].endswith(".vtm")
+        assert isinstance(result["id"], str)
+        assert re.match(r"[0-9a-f]{32}", result["id"])
+        assert isinstance(result["viewer_type"], str)
+        assert isinstance(result["binary_light_viewable"], str)
+        assert result["binary_light_viewable"].startswith('<?xml version="1.0"?>')
+        
+        assert result["input_file"] == result["native_file"]
+        
+        data = Data.get(result["id"])
+        assert data is not None
+        assert data.input_file == data.native_file
+        assert data.light_viewable_file is not None
+        assert data.light_viewable_file.endswith('.vtp')
+        
+        data_path = os.path.join(app.config["DATA_FOLDER_PATH"], result["id"])
+        assert os.path.exists(os.path.join(data_path, result["native_file"]))
+        assert os.path.exists(os.path.join(data_path, result["viewable_file"]))
+        assert os.path.exists(os.path.join(data_path, data.light_viewable_file))
 
 
 def test_generate_native_viewable_and_light_viewable_from_file(