Add sort option to bookmark list (#522)

* Rename BookmarkFilters to BookmarkSearch * Refactor queries to accept BookmarkSearch * Sort query by data added and title * Ensure pagination respects search parameters * Ensure tag cloud respects search parameters * Ensure user select respects search parameters * Ensure return url respects search options * Fix passing search options to user select * Fix BookmarkSearch initialization * Extract common search form logic * Ensure partial update respects search options * Add sort UI * Use custom ICU collation when sorting with SQLite * Support sort in API
2025-08-07 10:58:25 +02:00 · 2023-09-01 22:48:21 +02:00
parent 0c50906056
commit 0975914a86
35 changed files with 1026 additions and 361 deletions
--- a/bookmarks/tests/test_bookmark_search_model.py
+++ b/bookmarks/tests/test_bookmark_search_model.py
@@ -0,0 +1,59 @@
+from unittest.mock import Mock
+from bookmarks.models import BookmarkSearch
+from django.test import TestCase
+
+
+class BookmarkSearchModelTest(TestCase):
+    def test_from_request(self):
+        # no params
+        mock_request = Mock()
+        mock_request.GET = {}
+
+        search = BookmarkSearch.from_request(mock_request)
+        self.assertEqual(search.q, '')
+        self.assertEqual(search.sort, BookmarkSearch.SORT_ADDED_DESC)
+        self.assertEqual(search.user, '')
+
+        # some params
+        mock_request.GET = {
+            'q': 'search query',
+            'user': 'user123',
+        }
+
+        bookmark_search = BookmarkSearch.from_request(mock_request)
+        self.assertEqual(bookmark_search.q, 'search query')
+        self.assertEqual(bookmark_search.sort, BookmarkSearch.SORT_ADDED_DESC)
+        self.assertEqual(bookmark_search.user, 'user123')
+
+        # all params
+        mock_request.GET = {
+            'q': 'search query',
+            'user': 'user123',
+            'sort': BookmarkSearch.SORT_TITLE_ASC
+        }
+
+        search = BookmarkSearch.from_request(mock_request)
+        self.assertEqual(search.q, 'search query')
+        self.assertEqual(search.user, 'user123')
+        self.assertEqual(search.sort, BookmarkSearch.SORT_TITLE_ASC)
+
+    def test_modified_params(self):
+        # no params
+        bookmark_search = BookmarkSearch()
+        modified_params = bookmark_search.modified_params
+        self.assertEqual(len(modified_params), 0)
+
+        # params are default values
+        bookmark_search = BookmarkSearch(q='', sort=BookmarkSearch.SORT_ADDED_DESC, user='')
+        modified_params = bookmark_search.modified_params
+        self.assertEqual(len(modified_params), 0)
+
+        # some modified params
+        bookmark_search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC)
+        modified_params = bookmark_search.modified_params
+        self.assertCountEqual(modified_params, ['q', 'sort'])
+
+        # all modified params
+        bookmark_search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123')
+        modified_params = bookmark_search.modified_params
+        self.assertCountEqual(modified_params, ['q', 'sort', 'user'])