From 702618b9246f3db40fa67dfd27c43d6aaf9cd442 Mon Sep 17 00:00:00 2001 From: Michael Price Date: Mon, 5 Mar 2018 01:44:11 -0400 Subject: [PATCH] SearchModel no longer returns result_set. It is unfiltered and unused. Signed-off-by: Michael Price --- HISTORY.rst | 1 + mayan/apps/dynamic_search/api_views.py | 4 ++-- mayan/apps/dynamic_search/classes.py | 2 +- mayan/apps/dynamic_search/tests/test_models.py | 18 +++++++++--------- mayan/apps/dynamic_search/tests/test_views.py | 4 ++-- mayan/apps/dynamic_search/views.py | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index f7da7edaf7..0348298c6a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -15,6 +15,7 @@ Next (2018-XX-XX) - Update to the latest version the packages for building, development, documentation and testing. - Add statistics script to produce a report of the views, APIs and test for each app. - Merge base64 filename patch from Cornelius Ludmann. +- SearchModel retrun interface changed. The class no longer returns the result_set value. Use the queryset returned instead. 2.8 (2018-02-27) ================ diff --git a/mayan/apps/dynamic_search/api_views.py b/mayan/apps/dynamic_search/api_views.py index faf5c323db..282f65c932 100644 --- a/mayan/apps/dynamic_search/api_views.py +++ b/mayan/apps/dynamic_search/api_views.py @@ -38,7 +38,7 @@ class APISearchView(SearchModelMixin, generics.ListAPIView): self.mayan_object_permissions = {'GET': (search_model.permission,)} try: - queryset, ids, timedelta = search_model.search( + queryset, timedelta = search_model.search( query_string=self.request.GET, user=self.request.user ) except Exception as exception: @@ -86,7 +86,7 @@ class APIAdvancedSearchView(SearchModelMixin, generics.ListAPIView): global_and_search = False try: - queryset, ids, timedelta = self.search_model.search( + queryset, timedelta = self.search_model.search( query_string=self.request.GET, user=self.request.user, global_and_search=global_and_search ) diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py index 20b045c4ce..982fdf9add 100644 --- a/mayan/apps/dynamic_search/classes.py +++ b/mayan/apps/dynamic_search/classes.py @@ -236,7 +236,7 @@ class SearchModel(object): self.permission, user, queryset ) - return queryset, result_set, elapsed_time + return queryset, elapsed_time # SearchField classes diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index aae37e9558..5059c22bc9 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -31,24 +31,24 @@ class DocumentSearchTestCase(BaseTestCase): document versions and document version pages """ - model_list, result_set, elapsed_time = document_search.search( + queryset, elapsed_time = document_search.search( {'q': 'Mayan'}, user=self.admin_user ) - self.assertEqual(len(result_set), 1) - self.assertEqual(list(model_list), [self.document]) + self.assertEqual(queryset.count(), 1) + self.assertTrue(self.document in queryset) def test_advanced_search_after_related_name_change(self): # Test versions__filename - model_list, result_set, elapsed_time = document_search.search( + queryset, elapsed_time = document_search.search( {'label': self.document.label}, user=self.admin_user ) - self.assertEqual(len(result_set), 1) - self.assertEqual(list(model_list), [self.document]) + self.assertEqual(queryset.count(), 1) + self.assertTrue(self.document in queryset) # Test versions__mimetype - model_list, result_set, elapsed_time = document_search.search( + queryset, elapsed_time = document_search.search( {'versions__mimetype': self.document.file_mimetype}, user=self.admin_user ) - self.assertEqual(len(result_set), 1) - self.assertEqual(list(model_list), [self.document]) + self.assertEqual(queryset.count(), 1) + self.assertTrue(self.document in queryset) diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index 940d07c06b..8b99cb757c 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -39,10 +39,10 @@ class Issue46TestCase(GenericViewTestCase): def test_advanced_search_past_first_page(self): # Make sure all documents are returned by the search - model_list, result_set, elapsed_time = document_search.search( + queryset, elapsed_time = document_search.search( {'label': 'test document'}, user=self.admin_user ) - self.assertEqual(len(result_set), self.document_count) + self.assertEqual(queryset.count(), self.document_count) with self.settings(COMMON_PAGINATE_BY=2): # Funcitonal test for the first page of advanced results diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index 66365ce16f..b5fd2234da 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -39,7 +39,7 @@ class ResultsView(SearchModelMixin, SingleObjectListView): else: global_and_search = False - queryset, ids, timedelta = self.search_model.search( + queryset, timedelta = self.search_model.search( query_string=self.request.GET, user=self.request.user, global_and_search=global_and_search )