From 3553b9e1df2cdb4e236ad2d00b4056ae306280cd Mon Sep 17 00:00:00 2001
From: JasonGrace2282 <aarush.deshpande@gmail.com>
Date: Thu, 3 Oct 2024 21:51:40 -0400
Subject: [PATCH] chore: make search more pythonic

---
 intranet/apps/dashboard/views.py            | 26 ++++++++++-----------
 intranet/templates/dashboard/dashboard.html |  8 ++++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/intranet/apps/dashboard/views.py b/intranet/apps/dashboard/views.py
index afe87da7f7..d82b256ee5 100644
--- a/intranet/apps/dashboard/views.py
+++ b/intranet/apps/dashboard/views.py
@@ -331,25 +331,23 @@ class RawPaginationData(TypedDict, Generic[T]):
     page_obj: Paginator[T]
 
 
-def filter_announcements_by_search(request, items):
-    if "search" not in request.GET:
+def filter_announcements_by_search(request, items) -> list[Announcement]:
+    query = request.GET.get("search", "").strip().lower()
+    if not query:
         return items
-    searchParam = request.GET["search"]
-    if len(searchParam.strip()) == 0:
-        return items
-    searchParam = searchParam.lower()
 
-    def filterMethod(item):
-        return searchParam in item.title.lower() or searchParam in item.content.lower()
+    def search(item):
+        return query in item.title.lower() or query in item.content.lower()
 
-    filteredItems = list(filter(filterMethod, items))
+    filtered = [item for item in items if search(item)]
 
-    sorted_announcements = sorted(
-        filteredItems,
-        key=lambda announcement: (searchParam.lower() not in announcement.title.lower(), searchParam.lower() not in announcement.content.lower()),
-    )
+    # order by title then content
+    def order_by(item):
+        return (query in item.title.lower(), query in item.content.lower())
+
+    filtered.sort(key=order_by, reverse=True)
 
-    return sorted_announcements
+    return filtered
 
 
 def paginate_announcements_list_raw(
diff --git a/intranet/templates/dashboard/dashboard.html b/intranet/templates/dashboard/dashboard.html
index d3228c331c..964eb2b5a0 100644
--- a/intranet/templates/dashboard/dashboard.html
+++ b/intranet/templates/dashboard/dashboard.html
@@ -107,9 +107,11 @@
         <h2>{{ dashboard_header }}</h2>
             <span class="announcements-icon-wrapper" style="display: flex; flex-direction: row;">
             {% if view_announcements_url == "club_announcements" %}
-            <form id="subscribed-announcement-search" style="display: flex; margin-right:1px">
-                <input id="subscribed-announcement-search-input" type="text" placeholder="Search Club Announcements" style="width: 15rem;" class="dashboard-textinput" onsubmit="" >
-            </form>
+                <!-- TODO(2027adeshpan): handle searches containing # -->
+                <form id="subscribed-announcement-search" style="display: flex; margin-right:1px" method="get" role="search">
+                    <input id="subscribed-announcement-search-input"
+                    type="search" placeholder="Search Club Announcements" style="width: 15rem" class="dashboard-textinput">
+                </form>
             {% endif %}
 
             {% if show_expired or not show_widgets %}