search methods renamed

oarepo · Aug 20, 2024 · c21c84b · c21c84b
1 parent 8c97902
commit c21c84b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/oarepo_global_search/resources/records/resource.py b/oarepo_global_search/resources/records/resource.py
@@ -33,14 +33,14 @@ def create_url_rules(self):
     @request_search_args
     @response_handler(many=True)
     def search(self):
-        items = self.service.global_search(g.identity, params=resource_requestctx.args)
+        items = self.service.search(g.identity, params=resource_requestctx.args)
         return items.to_dict(), 200
 
     @request_search_args
     @request_json_search_args
     @response_handler(many=True)
     def json_search(self):
-        items = self.service.global_search(
+        items = self.service.search(
             g.identity,
             params={
                 **resource_requestctx.args,
@@ -52,14 +52,14 @@ def json_search(self):
     @request_search_args
     @response_handler(many=True)
     def search_user(self):
-        items = self.service.global_search_drafts(g.identity, params=resource_requestctx.args)
+        items = self.service.search_drafts(g.identity, params=resource_requestctx.args)
         return items.to_dict(), 200
 
     @request_search_args
     @request_json_search_args
     @response_handler(many=True)
     def json_search_user(self):
-        items = self.service.global_search_drafts(
+        items = self.service.search_drafts(
             g.identity,
             params={
                 **resource_requestctx.args,

diff --git a/oarepo_global_search/services/records/service.py b/oarepo_global_search/services/records/service.py
@@ -113,10 +113,10 @@ def config(self):
     def config(self, value):
         pass
 
-    def global_search_drafts(self, identity, params, *args, extra_filter=None, **kwargs):
+    def search_drafts(self, identity, params, *args, extra_filter=None, **kwargs):
         return self._global_search(identity, params, action="search_drafts", *args, extra_filter=extra_filter, **kwargs)
 
-    def global_search(self, identity, params, *args, extra_filter=None, **kwargs):
+    def search(self, identity, params, *args, extra_filter=None, **kwargs):
         # return ""
         return self._global_search(identity, params, action="search", *args, extra_filter=extra_filter, **kwargs)
 
@@ -205,7 +205,7 @@ def _global_search(self, identity, params, action, *args, extra_filter=None, **k
 
         self.config.search.params_interpreters_cls.append(GlobalSearchStrParam)
 
-        hits = self.search(identity, params=combined_query)
+        hits = super().search(identity, params=combined_query)
 
         del hits._links_tpl.context["args"][
             "json"