api: added tests for the search API

rhodecode/api/tests/test_fts_search.py

@@ -0,0 +1,93 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2019 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+from rhodecode.tests import HG_REPO
+from rhodecode.api.tests.utils import (
+    build_data, api_call, assert_error, assert_ok)
+
+
[e-mail]("testuser_api", "app")
+class TestApiSearch(object):
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('todo', 23, [
+            'vcs/backends/hg/inmemory.py',
+            'vcs/tests/test_git.py']),
+        ('extension:rst installation', 6, [
+            'docs/index.rst',
+            'docs/installation.rst']),
+        ('def repo', 87, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('repository:%s def test' % HG_REPO, 18, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('"def main"', 9, [
+            'vcs/__init__.py',
+            'vcs/tests/__init__.py',
+            'vcs/utils/progressbar.py']),
+        ('owner:test_admin', 358, [
+            'vcs/tests/base.py',
+            'MANIFEST.in',
+            'vcs/utils/termcolors.py',
+            'docs/theme/ADC/static/documentation.png']),
+        ('owner:test_admin def main', 72, [
+            'vcs/__init__.py',
+            'vcs/tests/test_utils_filesize.py',
+            'vcs/tests/test_cli.py']),
+        ('owner:michał test', 0, []),
+    ])
+    def test_search_content_results(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='content')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('readme.rst', 3, []),
+        ('test*', 75, []),
+        ('*model*', 1, []),
+        ('extension:rst', 48, []),
+        ('extension:rst api', 24, []),
+    ])
+    def test_search_file_paths(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='path')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths

rhodecode/api/views/search_api.py

@@ -1,109 +1,112 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2018 RhodeCode GmbH
+# Copyright (C) 2011-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 import logging
 
 from rhodecode.api import jsonrpc_method
 from rhodecode.api.exc import JSONRPCValidationError
 from rhodecode.api.utils import Optional
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.model import validation_schema
 from rhodecode.model.validation_schema.schemas import search_schema
 
 log = logging.getLogger(__name__)
 
 
 @jsonrpc_method()
-def search(request, apiuser, search_query, search_type, page_limit=Optional(10), page=Optional(1), search_sort=Optional('newfirst'), repo_name=Optional(None), repo_group_name=Optional(None)):
+def search(request, apiuser, search_query, search_type, page_limit=Optional(10),
+           page=Optional(1), search_sort=Optional('newfirst'),
+           repo_name=Optional(None), repo_group_name=Optional(None)):
     """
-    Search
+    Fetch Full Text Search results using API.
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
     :param search_query: Search query.
     :type search_query: str
     :param search_type: Search type. The following are valid options:
         * commit
         * content
         * path
     :type search_type: str
     :param page_limit: Page item limit, from 1 to 500. Default 10 items.
     :type page_limit: Optional(int)
     :param page: Page number. Default first page.
     :type page: Optional(int)
     :param search_sort: Search sort order. Default newfirst. The following are valid options:
         * newfirst
         * oldfirst
     :type search_sort: Optional(str)
     :param repo_name: Filter by one repo. Default is all.
     :type repo_name: Optional(str)
     :param repo_group_name: Filter by one repo group. Default is all.
     :type repo_group_name: Optional(str)
     """
 
-    searcher = searcher_from_config(request.registry.settings)
     data = {'execution_time': ''}
     repo_name = Optional.extract(repo_name)
     repo_group_name = Optional.extract(repo_group_name)
 
     schema = search_schema.SearchParamsSchema()
 
-    search_params = {}
     try:
         search_params = schema.deserialize(
             dict(search_query=search_query,
                  search_type=search_type,
                  search_sort=Optional.extract(search_sort),
                  page_limit=Optional.extract(page_limit),
                  requested_page=Optional.extract(page))
         )
     except validation_schema.Invalid as err:
         raise JSONRPCValidationError(colander_exc=err)
 
     search_query = search_params.get('search_query')
     search_type = search_params.get('search_type')
     search_sort = search_params.get('search_sort')
 
     if search_params.get('search_query'):
         page_limit = search_params['page_limit']
         requested_page = search_params['requested_page']
 
+        searcher = searcher_from_config(request.registry.settings)
+
         try:
             search_result = searcher.search(
                 search_query, search_type, apiuser, repo_name, repo_group_name,
                 requested_page=requested_page, page_limit=page_limit, sort=search_sort)
 
             data.update(dict(
                 results=list(search_result['results']), page=requested_page,
                 item_count=search_result['count'],
                 items_per_page=page_limit))
         finally:
             searcher.cleanup()
 
         if not search_result['error']:
             data['execution_time'] = '%s results (%.3f seconds)' % (
                 search_result['count'],
                 search_result['runtime'])
         else:
             node = schema['search_query']
-            raise JSONRPCValidationError(colander_exc=validation_schema.Invalid(node, search_result['error']))
+            raise JSONRPCValidationError(
+                colander_exc=validation_schema.Invalid(node, search_result['error']))
 
     return data