From 41499f13291d6e60e21963f69be70f863c3a39c3 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Mon, 26 Dec 2022 18:50:02 +0100
Subject: [PATCH] Update search to use listview Enables pagination

---
 nummi/main/templates/main/base.html |  4 +--
 nummi/main/urls.py                  |  3 +-
 nummi/main/views.py                 | 49 ++++++++++++++++-------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html
index afa55f6..6d51bc3 100644
--- a/nummi/main/templates/main/base.html
+++ b/nummi/main/templates/main/base.html
@@ -48,8 +48,8 @@
                        accesskey="s">
                         {% translate "Snapshot" %}
                     </a>
-                    <form id="search" action="{% url 'search' %}" method="post">
-                        {% csrf_token %}
+                    <form id="search" action="{% url 'search_post' %}" method="post">
+												{% csrf_token %}
                         <input type="text"
                                name="search"
                                placeholder="{% translate "Search" %}"
diff --git a/nummi/main/urls.py b/nummi/main/urls.py
index 2a76acb..a72733f 100644
--- a/nummi/main/urls.py
+++ b/nummi/main/urls.py
@@ -18,5 +18,6 @@ urlpatterns = [
     path("snapshot", views.snapshot, name="snapshot"),
     path("snapshot/<uuid>", views.snapshot, name="snapshot"),
     path("snapshot/<uuid>/del", views.del_snapshot, name="del_snapshot"),
-    path("search", views.search, name="search"),
+    path("search", views.search, name="search_post"),
+    path("search/<search>", views.SearchView.as_view(), name="search"),
 ]
diff --git a/nummi/main/views.py b/nummi/main/views.py
index fbc6039..f4cc9da 100644
--- a/nummi/main/views.py
+++ b/nummi/main/views.py
@@ -49,7 +49,7 @@ class LogoutView(auth_views.LogoutView):
 
 
 class TransactionListView(LoginRequiredMixin, ListView):
-    paginate_by = 64
+    paginate_by = 24
     model = Transaction
     template_name = "main/transactions.html"
     context_object_name = "transactions"
@@ -213,25 +213,30 @@ def del_snapshot(request, uuid):
 @login_required
 def search(request):
     _search = request.POST.get("search")
-    _transactions = (
-        Transaction.objects.annotate(
-            rank=SearchRank(
-                SearchVector("name", weight="A")
-                + SearchVector("description", weight="B")
-                + SearchVector("trader", weight="B"),
-                SearchQuery(_search, search_type="websearch"),
-            ),
-            similarity=TrigramSimilarity("name", _search),
-        )
-        .filter(models.Q(rank__gte=0.1) | models.Q(similarity__gte=0.3))
-        .order_by("-rank", "-date")
-    )
+    return redirect("search", search=_search)
 
-    return render(
-        request,
-        "main/transactions.html",
-        {
-            "transactions": _transactions,
-            "search": _search,
-        },
-    )
+
+class SearchView(LoginRequiredMixin, ListView):
+    paginate_by = 24
+    model = Transaction
+    template_name = "main/transactions.html"
+    context_object_name = "transactions"
+
+    def get_queryset(self):
+        self.search = self.kwargs["search"]
+        return (
+            Transaction.objects.annotate(
+                rank=SearchRank(
+                    SearchVector("name", weight="A")
+                    + SearchVector("description", weight="B")
+                    + SearchVector("trader", weight="B"),
+                    SearchQuery(self.search, search_type="websearch"),
+                ),
+                similarity=TrigramSimilarity("name", self.search),
+            )
+            .filter(models.Q(rank__gte=0.1) | models.Q(similarity__gte=0.3))
+            .order_by("-rank", "-date")
+        )
+
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(**kwargs) | {"search": self.kwargs["search"]}