#234: Fix missing brackets on include filter logic

- `join()` only accepts iterables, not multiple strings - This commit also adds a test case to cover this
ral-facilities · May 24, 2021 · 2961b18 · 2961b18
1 parent b18da3b
commit 2961b18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/datagateway_api/common/icat/filters.py b/datagateway_api/common/icat/filters.py
@@ -246,7 +246,9 @@ def _extract_filter_fields(self, field):
                             self._extract_filter_fields(".".join((key, element)))
                         elif isinstance(element, list):
                             for sub_element in element:
-                                self._extract_filter_fields(".".join(key, sub_element))
+                                self._extract_filter_fields(
+                                    ".".join((key, sub_element)),
+                                )
                         elif isinstance(element, dict):
                             for (
                                 inner_element_key,

diff --git a/test/icat/filters/test_include_filter.py b/test/icat/filters/test_include_filter.py
@@ -45,7 +45,12 @@ class TestICATIncludeFilter:
                     "investigationUsers.user.userGroups",
                     "investigationUsers.investigation",
                 },
-                id="Complex use case used similarly in DataGateway",
+                id="complex use case used similarly in DataGateway",
+            ),
+            pytest.param(
+                {"investigationUsers": [["investigation.datasets"]]},
+                {"investigationUsers.investigation.datasets"},
+                id="dictionary with nested list value",
             ),
         ],
     )