matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport search improvements, remove SEARCH_LIMIT

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-26 00:35:55 -04:00
parent 1c5681c79d
commit 20acc24c7f
9 changed files with 342 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY.rst
View File

@@ -158,6 +158,9 @@
from an user.
* Require dual permissions when add or removing users to and
from group. Same with group to users.
* Backport search improvements.
* Remove search elapsed time calculation.
* Remove SEARCH_LIMIT setting.
3.1.11 (2019-04-XX)
===================

3
docs/releases/3.2.rst
View File

@@ -190,6 +190,9 @@ Other changes
from an user.
* Require dual permissions when add or removing users to and
from group. Same with group to users.
* Backport search improvements.
* Remove search elapsed time calculation.
* Remove SEARCH_LIMIT setting.
Removals
--------

8
mayan/apps/dynamic_search/api_views.py
View File

@@ -29,7 +29,7 @@ class APISearchView(SearchModelMixin, generics.ListAPIView):
self.mayan_object_permissions = {'GET': (search_model.permission,)}
try:
queryset, timedelta = search_model.search(
queryset = search_model.search(
query_string=self.request.GET, user=self.request.user
)
except Exception as exception:
@@ -68,9 +68,9 @@ class APIAdvancedSearchView(SearchModelMixin, generics.ListAPIView):
global_and_search = False
try:
queryset, timedelta = self.search_model.search(
query_string=self.request.GET, user=self.request.user,
global_and_search=global_and_search
queryset = self.search_model.search(
global_and_search=global_and_search,
query_string=self.request.GET, user=self.request.user
)
except Exception as exception:
raise ParseError(force_text(exception))

490
mayan/apps/dynamic_search/classes.py
View File

File diff suppressed because it is too large Load Diff

12
mayan/apps/dynamic_search/literals.py Normal file
View File

@@ -0,0 +1,12 @@
from __future__ import unicode_literals
QUERY_OPERATION_AND = 1
QUERY_OPERATION_OR = 2
TERM_OPERATION_AND = 'AND'
TERM_OPERATION_OR = 'OR'
TERM_OPERATIONS = [TERM_OPERATION_AND, TERM_OPERATION_OR]
TERM_QUOTES = ['"', '\'']
TERM_NEGATION_CHARACTER = '-'
TERM_SPACE_CHARACTER = ' '

12
mayan/apps/dynamic_search/settings.py
View File

@@ -1,12 +0,0 @@
from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
from mayan.apps.smart_settings import Namespace
namespace = Namespace(name='dynamic_search', label=_('Search'))
setting_limit = namespace.add_setting(
global_name='SEARCH_LIMIT', default=100,
help_text=_('Maximum amount search hits to fetch and display.')
)

78
mayan/apps/dynamic_search/tests/test_models.py
View File

@@ -3,28 +3,25 @@ from __future__ import unicode_literals
from mayan.apps.common.tests import BaseTestCase
from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.search import document_search
from mayan.apps.documents.tests import (
DocumentTestMixin, TEST_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_FILENAME
)
from mayan.apps.documents.tests import DocumentTestMixin
class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
auto_upload_document = False
test_document_filename = TEST_DOCUMENT_FILENAME
def test_simple_search_after_related_name_change(self):
"""
Test that simple search works after related_name changes to
document versions and document version pages
"""
self.upload_document()
self.upload_document(label='first_doc')
self.grant_access(
obj=self.test_document, permission=permission_document_view
)
queryset, elapsed_time = document_search.search(
{'q': 'Mayan'}, user=self._test_case_user
queryset = document_search.search(
{'q': 'first'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.test_document in queryset)
@@ -36,90 +33,109 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
obj=self.test_document, permission=permission_document_view
)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': self.test_document.label}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.test_document in queryset)
# Test versions__mimetype
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'versions__mimetype': self.test_document.file_mimetype},
user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.test_document in queryset)
def test_simple_or_search(self):
self.upload_document(label='first_doc.pdf')
def test_meta_only(self):
self.upload_document(label='first_doc')
self.grant_access(
obj=self.test_document, permission=permission_document_view
)
queryset = document_search.search(
{'q': 'OR first'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
self.test_document_filename = TEST_SMALL_DOCUMENT_FILENAME
self.test_document_2 = self.upload_document(label='second_doc.pdf')
def test_simple_or_search(self):
self.upload_document(label='first_doc')
self.grant_access(
obj=self.test_document, permission=permission_document_view
)
self.test_document_2 = self.upload_document(label='second_doc')
self.grant_access(
obj=self.test_document_2, permission=permission_document_view
)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'q': 'first OR second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 2)
self.assertTrue(self.test_document in queryset)
self.assertTrue(self.test_document_2 in queryset)
def test_simple_and_search(self):
self.test_document_filename = TEST_SMALL_DOCUMENT_FILENAME
self.test_document_2 = self.upload_document(label='second_doc.pdf')
def test_advanced_or_search(self):
self.upload_document(label='first_doc')
self.grant_access(
obj=self.test_document, permission=permission_document_view
)
self.test_document_2 = self.upload_document(label='second_doc')
self.grant_access(
obj=self.test_document_2, permission=permission_document_view
)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': 'first OR second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 2)
self.assertTrue(self.test_document in queryset)
self.assertTrue(self.test_document_2 in queryset)
def test_simple_and_search(self):
self.upload_document(label='second_doc')
self.grant_access(
obj=self.test_document, permission=permission_document_view
)
queryset = document_search.search(
{'q': 'non_valid second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 0)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'q': 'second non_valid'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 0)
def test_simple_negated_search(self):
self.test_document_filename = TEST_SMALL_DOCUMENT_FILENAME
self.test_document_2 = self.upload_document()
self.test_document_2.label = 'second_doc.pdf'
self.test_document_2.save()
self.test_document_2 = self.upload_document(label='second_doc')
self.grant_access(
obj=self.test_document_2, permission=permission_document_view
)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'q': '-non_valid second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': '-second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 0)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': '-second -Mayan'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 0)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': '-second OR -Mayan'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 1)
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': '-non_valid -second'}, user=self._test_case_user
)
self.assertEqual(queryset.count(), 0)

2
mayan/apps/dynamic_search/tests/test_views.py
View File

@@ -30,7 +30,7 @@ class Issue46TestCase(DocumentTestMixin, GenericViewTestCase):
)
# Make sure all documents are returned by the search
queryset, elapsed_time = document_search.search(
queryset = document_search.search(
{'label': test_document_label}, user=self._test_case_user
)
self.assertEqual(queryset.count(), self.test_document_count)

6
mayan/apps/dynamic_search/views.py
View File

@@ -45,9 +45,9 @@ class ResultsView(SearchModelMixin, SingleObjectListView):
else:
global_and_search = False
queryset, timedelta = self.search_model.search(
query_string=self.request.GET, user=self.request.user,
global_and_search=global_and_search
queryset = self.search_model.search(
global_and_search=global_and_search,
query_string=self.request.GET, user=self.request.user
)
return queryset