fix(functions): fix functions based on key input

Author: JulienChampagnol

src/opengeodeweb_back/geode_functions.py

@@ -110,55 +110,59 @@ def get_geode_object_output_extensions(geode_object: str):
     return output_list
 
 
-def list_input_extensions(
-    keys: list = [],
-):
-    """
-    Purpose:
-        Function that returns a list of all input extensions
-    Args:
-        keys -- Tells the function if we want the geode_objects that have a crs
-    Returns:
-        An ordered list of input file extensions
-    """
+def list_input_extensions(keys: list = []):
     extensions_list = []
-
     for geode_object, value in objects_list().items():
         if keys:
             for key in keys:
                 if key in value:
-                    if type(value[key]) == bool and value[key] == True:
-                        pass
+                    if type(value[key]) == bool:
+                        if value[key] == True:
+                            extensions_list += get_geode_object_input_extensions(
+                                geode_object
+                            )
                     else:
-                        continue
+                        extensions_list += get_geode_object_input_extensions(
+                            geode_object
+                        )
                 else:
                     continue
-
-        geode_object_input_extensions = get_geode_object_input_extensions(geode_object)
-        extensions_list = extensions_list + geode_object_input_extensions
+        else:
+            extensions_list += get_geode_object_input_extensions(geode_object)
 
     extensions_list = list(set(extensions_list))
     extensions_list.sort()
     return extensions_list
 
 
+def has_creator(input_factories, extension: str):
+    for input in input_factories:
+        if input.has_creator(extension):
+            return True
+
+
 def list_geode_objects(extension: str, keys: list = []):
-    """
-    Purpose:
-        Function that returns a list of objects that can handle a file, given his extension
-    Args:
-        extension -- The extension of the file
-    Returns:
-        An ordered list of object's names
-    """
     geode_objects_list = []
-
     for geode_object, value in objects_list().items():
-        input_factory = get_input_factory(geode_object)
-        for input in input_factory:
-            if input.has_creator(extension):
-                if geode_object not in geode_objects_list:
-                    geode_objects_list.append(geode_object)
+        geode_object_input_factory = get_input_factory(geode_object)
+        if keys:
+            for key in keys:
+                if key in value:
+                    if type(value[key]) == bool:
+                        if value[key] == True:
+                            if has_creator(geode_object_input_factory, extension):
+                                print(f"{geode_object=}")
+                                geode_objects_list.append(geode_object)
+                    else:
+                        if has_creator(geode_object_input_factory, extension):
+                            print(f"{geode_object=}")
+                            geode_objects_list.append(geode_object)
+                else:
+                    continue
+        else:
+            if has_creator(geode_object_input_factory, extension):
+                print(f"{geode_object=}")
+                geode_objects_list.append(geode_object)
     geode_objects_list.sort()
     return geode_objects_list
 

tests/test_functions.py

@@ -71,15 +71,36 @@ def test_get_geode_object_output_extensions():
 
 
 def test_list_input_extensions():
-    keys_array = [["crs"], ["inspector"]]
+    keys_array = ["crs", "inspector"]
     for geode_object, value in geode_objects.objects_list().items():
         for keys in keys_array:
             input_extensions = geode_functions.list_input_extensions(keys)
             assert type(input_extensions) is list
 
 
 def test_list_geode_objects():
-    keys_array = [["crs"], ["inspector"]]
+    test_list = [
+        {
+            "keys_array": ["crs"],
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+        {
+            "keys_array": ["inspector"],
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+    ]
     input_extensions = geode_functions.list_input_extensions()
     for geode_object, value in geode_objects.objects_list().items():
         for input_extension in input_extensions:
@@ -90,6 +111,8 @@ def test_list_geode_objects():
                     input_extension, keys
                 )
                 assert type(geode_objects_list) is list
+                for invalid_geode_object in invalid_geode_objects:
+                    assert invalid_geode_object not in geode_objects_list
 
 
 def test_get_versions():