Merge pull request #301 from ral-facilities/feature/search-api-includ…

…e-filter-#261 Implement Include Filter for Search API
ral-facilities · Jan 31, 2022 · 10d1ca8 · 10d1ca8
2 parents 58e5f20 + e0b2d95
commit 10d1ca8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/datagateway_api/src/search_api/panosc_mappings.py b/datagateway_api/src/search_api/panosc_mappings.py
@@ -49,7 +49,7 @@ def get_icat_mapping(self, panosc_entity_name, field_name):
         )
 
         try:
-            icat_mapping = mappings.mappings[panosc_entity_name][field_name]
+            icat_mapping = self.mappings[panosc_entity_name][field_name]
             log.debug("ICAT mapping/translation found: %s", icat_mapping)
         except KeyError as e:
             raise FilterError(f"Bad PaNOSC to ICAT mapping: {e.args}")

diff --git a/datagateway_api/src/search_api/query_filter_factory.py b/datagateway_api/src/search_api/query_filter_factory.py
@@ -245,15 +245,13 @@ def get_include_filter(include_filter_input, entity_name):
                             scope_query_filter, included_entity,
                         )
                     if isinstance(scope_query_filter, SearchAPIIncludeFilter):
-                        for included_entity_pointer in range(
-                            len(scope_query_filter.included_filters),
+                        for i, included_filter in enumerate(
+                            scope_query_filter.included_filters,
                         ):
                             nested_include = True
-                            included_filter = scope_query_filter.included_filters[
-                                included_entity_pointer
-                            ]
+                            scope_query_filter.panosc_entity_name = entity_name
                             scope_query_filter.included_filters[
-                                included_entity_pointer
+                                i
                             ] = f"{included_entity}.{included_filter}"
 
                 query_filters.extend(scope_query_filters)

diff --git a/test/search_api/filters/test_search_api_include_filter.py b/test/search_api/filters/test_search_api_include_filter.py
@@ -53,16 +53,6 @@ def test_valid_apply_filter_single(self):
                 " iu.user",
                 id="Document.members.person",
             ),
-            # TODO - Below test fails because dataset/investigation parameters issue on
-            # mapping
-            pytest.param(
-                SearchAPIIncludeFilter(["dataset.parameters.document"], "File"),
-                "File",
-                "SELECT o FROM Datafile o INCLUDE o.dataset AS d, d.parameters AS p,"
-                " p.investigation",
-                id="File.dataset.parameters.document",
-                marks=pytest.mark.skip,
-            ),
             pytest.param(
                 SearchAPIIncludeFilter(["dataset.samples.datasets"], "File"),
                 "File",

diff --git a/test/search_api/test_search_api_query_filter_factory.py b/test/search_api/test_search_api_query_filter_factory.py
@@ -1714,6 +1714,7 @@ def test_valid_include_filter_with_where_filter_in_scope(
         assert len(filters) == expected_length
         for test_filter in filters:
             if isinstance(test_filter, SearchAPIIncludeFilter):
+                assert test_filter.panosc_entity_name == test_entity_name
                 for expected_include in expected_included_entities:
                     assert test_filter.included_filters == expected_include
                     expected_included_entities.remove(expected_include)