refactor: allow PythonICATSkipFilter to use Search API config #263

ral-facilities · Dec 2, 2021 · 5ab60de · 5ab60de
1 parent 9266e85
commit 5ab60de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/datagateway_api/src/datagateway_api/icat/filters.py b/datagateway_api/src/datagateway_api/icat/filters.py
@@ -210,13 +210,20 @@ def apply_filter(self, query):
 
 
 class PythonICATSkipFilter(SkipFilter):
-    def __init__(self, skip_value):
+    def __init__(self, skip_value, client_use="datagateway_api"):
         super().__init__(skip_value)
+        self.client_use = client_use
 
     def apply_filter(self, query):
-        icat_properties = get_icat_properties(
-            config.datagateway_api.icat_url, config.datagateway_api.icat_check_cert,
-        )
+        if self.client_use == "datagateway_api":
+            icat_properties = get_icat_properties(
+                config.datagateway_api.icat_url, config.datagateway_api.icat_check_cert,
+            )
+        else:
+            icat_properties = get_icat_properties(
+                config.search_api.icat_url, config.search_api.icat_check_cert,
+            )
+
         icat_set_limit(query, self.skip_value, icat_properties["maxEntities"])
 
 

diff --git a/datagateway_api/src/search_api/filters.py b/datagateway_api/src/search_api/filters.py
@@ -19,7 +19,7 @@ def apply_filter(self, query):
 
 class SearchAPISkipFilter(PythonICATSkipFilter):
     def __init__(self, skip_value):
-        super().__init__(skip_value)
+        super().__init__(skip_value, client_use="search_api")
 
     def apply_filter(self, query):
         return super().apply_filter(query)