rm redundant request pos arg, use self.request in search_filter facto…

…ry, re #10804

arches/app/search/components/base.py

@@ -22,7 +22,7 @@ class BaseSearchFilter:
     def __init__(self, request=None):
         self.request = request
 
-    def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request):
+    def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional):
         """
         used to append ES query dsl to the search request
 
@@ -38,13 +38,13 @@ def view_data(self):
 
         pass
 
-    def execute_query(self, search_results_object, response_object, request):
+    def execute_query(self, search_results_object, response_object):
         """
         code responsible for execution of the search query and initial mutation of response object
         """
         pass
 
-    def post_search_hook(self, search_results_object, results, permitted_nodegroups, request):
+    def post_search_hook(self, search_results_object, results, permitted_nodegroups):
         """
         code to run after the search results have been retrieved
 

arches/app/search/components/core_search.py

@@ -22,7 +22,7 @@ class CoreSearchFilter(BaseSearchFilter):
     def view_data():
         pass
 
-    def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request):
+    def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional):
         search_results_object["query"].include("graph_id")
         search_results_object["query"].include("root_ontology_class")
         search_results_object["query"].include("resourceinstanceid")
@@ -36,7 +36,7 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis
         search_results_object["query"].include("displaydescription")
         search_results_object["query"].include("map_popup")
         search_results_object["query"].include("provisional_resource")
-        load_tiles = request.GET.get("tiles", False)
+        load_tiles = self.request.GET.get("tiles", False)
         if load_tiles:
             try:
                 load_tiles = json.loads(load_tiles)
@@ -46,11 +46,11 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis
             search_results_object["query"].include("tiles")
 
 
-    def execute_query(self, search_results_object, response_object, request):
-        for_export = request.GET.get("export", None)
-        pages = request.GET.get("pages", None)
-        total = int(request.GET.get("total", "0"))
-        resourceinstanceid = request.GET.get("id", None)
+    def execute_query(self, search_results_object, response_object):
+        for_export = self.request.GET.get("export", None)
+        pages = self.request.GET.get("pages", None)
+        total = int(self.request.GET.get("total", "0"))
+        resourceinstanceid = self.request.GET.get("id", None)
         dsl = search_results_object["query"]
         if for_export or pages:
             results = dsl.search(index=RESOURCES_INDEX, scroll="1m")
@@ -74,10 +74,10 @@ def execute_query(self, search_results_object, response_object, request):
                     results = {"hits": {"hits": [results]}}
         response_object["results"] = results
 
-    def post_search_hook(search_results_object, response_object, permitted_nodegroups, request):
+    def post_search_hook(self, search_results_object, response_object, permitted_nodegroups):
         dsl = search_results_object["query"]
-        response_object["reviewer"] = user_is_resource_reviewer(request.user)
+        response_object["reviewer"] = user_is_resource_reviewer(self.request.user)
         response_object["timestamp"] = datetime.now()
         response_object["total_results"] = dsl.count(index=RESOURCES_INDEX)
-        response_object["userid"] = request.user.id
+        response_object["userid"] = self.request.user.id
 

arches/app/search/components/localize_result_descriptors.py

@@ -19,7 +19,7 @@ class LocalizeResultDescriptors(BaseSearchFilter):
     def view_data(self):
         pass
 
-    def post_search_hook(self, search_results_object, response_object, permitted_nodegroups, request):
+    def post_search_hook(self, search_results_object, response_object, permitted_nodegroups):
 
         def get_localized_descriptor(resource, descriptor_type, language_codes):
             descriptor = resource["_source"][descriptor_type]

arches/app/views/search.py

@@ -307,7 +307,7 @@ def search_results(request, returnDsl=False):
         for filter_type, querystring in list(request.GET.items()) + list(request.POST.items()) + [("search-results", "")]:
             search_filter = search_filter_factory.get_filter(filter_type)
             if search_filter:
-                search_filter.append_dsl(search_results_object, permitted_nodegroups, include_provisional, request)
+                search_filter.append_dsl(search_results_object, permitted_nodegroups, include_provisional)
         append_instance_permission_filter_dsl(request, search_results_object)
     except Exception as err:
         logger.exception(err)
@@ -321,15 +321,15 @@ def search_results(request, returnDsl=False):
     for filter_type, querystring in list(request.GET.items()) + [("search-results", "")]:
         search_filter = search_filter_factory.get_filter(filter_type)
         if search_filter:
-            search_filter.execute_query(search_results_object, ret, request)
+            search_filter.execute_query(search_results_object, ret)
 
     if ret["results"] is not None:
 
         # allow filters to modify the results
         for filter_type, querystring in list(request.GET.items()) + [("search-results", "")]:
             search_filter = search_filter_factory.get_filter(filter_type)
             if search_filter:
-                search_filter.post_search_hook(search_results_object, ret, permitted_nodegroups, request)
+                search_filter.post_search_hook(search_results_object, ret, permitted_nodegroups)
 
         for key, value in list(search_results_object.items()):
             ret[key] = value