add smarter searching; fix bug to allow 0.0 for free events

Author: ericahan22

backend/apps/clubs/views.py

@@ -28,7 +28,37 @@ def get_clubs(request):
 
         # Apply search filter
         if search_term:
-            queryset = queryset.filter(club_name__icontains=search_term)
+            import re
+            from django.db.models import Q
+            
+            # 1. Standard search
+            search_query = Q(club_name__icontains=search_term)
+            
+            # 2. Normalized search using translate
+            normalized_term = re.sub(r'[^a-z0-9]', '', search_term.lower())
+            
+            if normalized_term and normalized_term != search_term.lower():
+                # Common accented chars
+                accents_from = "àáâãäåèéêëìíîïòóôõöùúûüýÿñç"
+                accents_to   = "aaaaaaeeeeiiiiooooouuuuyync"
+                
+                # Special chars to remove
+                special_from = "-_.,!?:;()[]{}|/\\ "
+                
+                map_from = accents_from + special_from
+                map_to   = accents_to
+                
+                translate_sql = f"TRANSLATE(LOWER(club_name), '{map_from}', '{map_to}') LIKE %s"
+                like_param = f"%{normalized_term}%"
+                
+                search_query |= Q(
+                    id__in=queryset.extra(
+                        where=[translate_sql],
+                        params=[like_param]
+                    ).values_list('id', flat=True)
+                )
+            
+            queryset = queryset.filter(search_query)
 
         # Apply category filter
         if category_filter and category_filter.lower() != "all":

backend/apps/events/views.py

@@ -101,16 +101,27 @@ def get_events(request):
 
         if search_term:
             import re
+            from django.db.models import Func, Value, F
 
             # Parse semicolon-separated filters (for OR query)
             search_terms = [
                 term.strip() for term in search_term.split(";") if term.strip()
             ]
 
-            # Build OR query: match any of the search terms in any field
+            # Define character mapping for translate
+            # Common accented chars
+            accents_from = "àáâãäåèéêëìíîïòóôõöùúûüýÿñç"
+            accents_to   = "aaaaaaeeeeiiiiooooouuuuyync"
+            
+            # Special chars to remove
+            special_from = "-_.,!?:;()[]{}|/\\ "
+            map_from = accents_from + special_from
+            map_to   = accents_to
+            
+            # Build OR query
             or_queries = Q()
             for term in search_terms:
-                # Search with original term (exact/partial matches)
+                # 1. Standard search (exact/partial matches)
                 term_query = (
                     Q(title__icontains=term)
                     | Q(location__icontains=term)
@@ -125,20 +136,39 @@ def get_events(request):
                     | Q(fb_handle__icontains=term)
                 )
 
-                # Search with normalized term
+                # 2. Normalized search using translate
                 normalized_term = re.sub(r'[^a-z0-9]', '', term.lower())
                 if normalized_term and normalized_term != term.lower():
-                    term_query |= (
-                        Q(title__icontains=normalized_term)
-                        | Q(location__icontains=normalized_term)
-                        | Q(description__icontains=normalized_term)
-                        | Q(food__icontains=normalized_term)
-                        | Q(club_type__icontains=normalized_term)
-                        | Q(ig_handle__icontains=normalized_term)
-                        | Q(discord_handle__icontains=normalized_term)
-                        | Q(x_handle__icontains=normalized_term)
-                        | Q(tiktok_handle__icontains=normalized_term)
-                        | Q(fb_handle__icontains=normalized_term)
+                    # Func for translate:
+                    # translate(lower(field), map_from, map_to)                    
+                    class Translate(Func):
+                        function = 'TRANSLATE'
+                        template = "%(function)s(LOWER(%(expressions)s), '%(from)s', '%(to)s')"
+                    
+                    # Use .extra() to filter on normalized fields (Django doesn't support function calls in filter keys)
+                    translate_sql = f"TRANSLATE(LOWER({{}}), '{map_from}', '{map_to}') LIKE %s"
+                    like_param = f"%{normalized_term}%"
+                    fields = [
+                        "title", "location", "description", "food", 
+                        "club_type", "ig_handle", "discord_handle", 
+                        "x_handle", "tiktok_handle", "fb_handle"
+                    ]
+                    where_clauses = []
+                    params = []
+                    for field in fields:
+                        # Handle COALESCE for nullable fields
+                        col_ref = field
+                        if field not in ["title"]: # title is nullable but usually present, others might be null
+                             col_ref = f"COALESCE({field}, '')"
+                        where_clauses.append(translate_sql.format(col_ref))
+                        params.append(like_param)
+                    
+                    full_where = " OR ".join(where_clauses)
+                    term_query |= Q(
+                        id__in=filtered_queryset.extra(
+                            where=[full_where],
+                            params=params
+                        ).values_list('id', flat=True)
                     )
 
                 or_queries |= term_query

backend/utils/scraping_utils.py

@@ -132,7 +132,7 @@ def insert_event_to_db(event_data, ig_handle, source_url, club_type=None):
             "club_type": club_type[:50] if club_type else None,
             "location": location,
             "food": food[:255] if food else None,
-            "price": price or None,
+            "price": price,
             "registration": registration,
             "description": description or None,
             "reactions": {},
@@ -238,8 +238,22 @@ def _check_same_club_update(self, ig_handle, title, log_prefix):
         if not ig_handle:
             return None
 
-        same_club_events = Events.objects.filter(ig_handle=ig_handle)
+        same_club_events = Events.objects.filter(ig_handle=ig_handle).prefetch_related("event_dates")
+        now = timezone.now()
+
         for existing_event in same_club_events:
+            # Check if event is in the past
+            dates = list(existing_event.event_dates.all())
+            if not dates:
+                continue
+                
+            # Get the latest end time (or start time)
+            latest_end = max((d.dtend_utc or d.dtstart_utc) for d in dates)
+            
+            # If the event has already passed, treat as new event
+            if latest_end < now:
+                continue
+
             c_title = getattr(existing_event, "title", "") or ""
 
             title_sim = max(