fix scraper parser missing

Author: tonyqiu123

backend/apps/events/models.py

@@ -3,8 +3,6 @@
 
 
 class Events(models.Model):
-    # Human-readable event information
-    id = models.BigAutoField(primary_key=True)
     title = models.TextField(
         null=True, blank=True, help_text="'Spring Career Fair 2024'"
     )
@@ -103,8 +101,6 @@ class EventSubmission(models.Model):
         ("rejected", "Rejected"),
     ]
 
-    # Submission details
-    id = models.BigAutoField(primary_key=True)
     submitted_by = models.CharField(
         max_length=255, help_text="Clerk user ID who submitted this event"
     )
@@ -135,7 +131,6 @@ class EventDates(models.Model):
     Stores individual occurrence dates for events.
     """
 
-    id = models.BigAutoField(primary_key=True)
     event = models.ForeignKey(
         Events,
         on_delete=models.CASCADE,
@@ -175,7 +170,6 @@ class EventInterest(models.Model):
     Tracks user interest in events.
     Many-to-many relationship between users (Clerk user IDs) and events.
     """
-    id = models.BigAutoField(primary_key=True)
     event = models.ForeignKey(
         Events,
         on_delete=models.CASCADE,
@@ -202,3 +196,18 @@ def __str__(self):
 class IgnoredPost(models.Model):
     shortcode = models.CharField(max_length=32, unique=True)
     added_at = models.DateTimeField(auto_now_add=True)
+
+
+class Promotion(models.Model):
+    # One promo window per event; extend it by spending more credits
+    event = models.OneToOneField(Events, on_delete=models.CASCADE, related_name="promotion")
+    starts_at = models.DateTimeField()
+    ends_at = models.DateTimeField()
+
+    @property
+    def active(self) -> bool:
+        now = timezone.now()
+        return self.starts_at <= now <= self.ends_at
+
+    def __str__(self):
+        return f"Promotion({self.event.id}) {self.starts_at} → {self.ends_at}"

backend/apps/events/views.py

@@ -959,3 +959,42 @@ def delete_event(request, event_id):
 
     except Exception as e:
         return Response({"message": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+# Boost event
+
+@api_view(["GET"])
+def boost_event_view(request, event_id):
+    """
+    Body/query should include 'days' (int).
+    Example: POST /events/123/boost?days=7
+    """
+    clerk_user_id = get_clerk_user_id(request)
+    if not clerk_user_id:
+        return HttpResponseBadRequest("Unauthorized")
+
+    # Parse and validate integer days from query/body as you prefer
+    try:
+        days = int(request.GET.get("days") or request.POST.get("days"))
+    except (TypeError, ValueError):
+        return HttpResponseBadRequest("Missing/invalid 'days'")
+
+    # Optional: ensure only owner can boost their own event
+    event = get_object_or_404(Event, pk=event_id)
+    if event.owner_clerk_user_id != clerk_user_id:
+        return HttpResponseBadRequest("You can only boost your own events")
+
+    try:
+        promo = boost_event(clerk_user_id, event_id, days)
+        return JsonResponse({
+            "ok": True,
+            "promotion": {
+                "starts_at": promo.starts_at.isoformat(),
+                "ends_at": promo.ends_at.isoformat(),
+                "active": promo.active,
+            }
+        })
+    except InsufficientCredits as e:
+        return HttpResponseBadRequest(str(e))
+    except ValueError as e:
+        return HttpResponseBadRequest(str(e))

backend/config/settings/base.py

@@ -51,6 +51,7 @@
     "apps.clubs",
     "apps.promotions",
     "apps.newsletter",
+    "apps.payments",
 ]
 
 MIDDLEWARE = [

backend/scraping/instagram_feed.py

@@ -21,6 +21,7 @@
 from django.utils import timezone
 from dotenv import load_dotenv
 from instaloader import Instaloader
+from dateutil import parser
 
 from apps.clubs.models import Clubs
 from apps.events.models import Events, IgnoredPost, EventDates
@@ -57,6 +58,7 @@
 SUPABASE_DB_URL = os.getenv("SUPABASE_DB_URL")
 
 
+def is_duplicate_event(event_data):
 def is_duplicate_event(event_data):
     """Check for duplicate events using title, occurrences, location, and description."""
 
@@ -226,7 +228,9 @@ def insert_event_to_db(event_data, ig_handle, source_url):
     school = event_data.get("school", "")
     categories = event_data.get("categories", [])
     occurrences = event_data.get("occurrences")
+    occurrences = event_data.get("occurrences")
 
+    if not occurrences:
     if not occurrences:
         logger.warning(f"Event '{title}' missing occurrences; skipping insert")
         return "missing_occurrence"
@@ -235,6 +239,7 @@ def insert_event_to_db(event_data, ig_handle, source_url):
         logger.warning(f"Event '{title}' missing categories, assigning 'Uncategorized'")
         categories = ["Uncategorized"]
 
+    if is_duplicate_event(event_data):
     if is_duplicate_event(event_data):
         return "duplicate"
 
@@ -421,12 +426,14 @@ def check_post_limit():
                             event_data.get("title")
                             and event_data.get("location")
                             and event_data.get("occurrences")
+                            and event_data.get("occurrences")
                         ):
                             missing_fields = []
                             if not event_data.get("title"):
                                 missing_fields.append("title")
                             if not event_data.get("location"):
                                 missing_fields.append("location")
+                            if not event_data.get("occurrences"):
                             if not event_data.get("occurrences"):
                                 missing_fields.append("occurrences")
                             logger.warning(
@@ -435,6 +442,7 @@ def check_post_limit():
                             added_to_db = "missing_fields"
                             continue
 
+                        first_occurrence = event_data.get("occurrences")[0]
                         first_occurrence = event_data.get("occurrences")[0]
                         dtstart_utc = first_occurrence.get("start_utc")
                         now = timezone.now()

frontend/src/features/events/hooks/useEventInterest.ts

@@ -17,6 +17,9 @@ export function useMyInterestedEvents() {
     },
     enabled: isSignedIn,
     staleTime: 1000 * 60 * 5, // Cache for 5 minutes
+    meta: {
+      skipErrorToast: true,
+    },
   });
 }
 

frontend/src/features/events/hooks/useEvents.ts

@@ -20,37 +20,51 @@ export function useEvents() {
   const addedAt = searchParams.get("added_at") || "";
   const showInterested = searchParams.get("interested") === "true";
   const view = searchParams.get("view") || "grid";
-  
+
   const { data: interestedEventIds } = useMyInterestedEvents();
 
-  const { 
+  const {
     data,
-    isLoading, 
+    isLoading,
     error,
     fetchNextPage,
     hasNextPage,
     isFetchingNextPage,
-  } = useInfiniteQuery<EventsResponse, Error, any, string[], string | undefined>({
-    queryKey: ["events", searchTerm, categories, dtstart_utc, addedAt, view, showInterested ? "interested" : ""],
+  } = useInfiniteQuery<
+    EventsResponse,
+    Error,
+    any,
+    string[],
+    string | undefined
+  >({
+    queryKey: [
+      "events",
+      searchTerm,
+      categories,
+      dtstart_utc,
+      addedAt,
+      view,
+      showInterested ? "interested" : "",
+    ],
     queryFn: async ({ pageParam }: { pageParam: string | undefined }) => {
       const queryParams: Record<string, any> = {};
-      
+
       if (pageParam) {
         queryParams.cursor = pageParam;
       }
-      
+
       if (searchTerm) {
         queryParams.search = searchTerm;
       }
-      
+
       if (categories) {
         queryParams.categories = categories;
       }
-      
+
       if (dtstart_utc) {
         queryParams.dtstart_utc = dtstart_utc;
       }
-      
+
       if (addedAt) {
         queryParams.added_at = addedAt;
       }
@@ -71,7 +85,7 @@ export function useEvents() {
     initialPageParam: undefined as string | undefined,
     getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,
     refetchOnWindowFocus: false,
-    enabled: true,  
+    enabled: true,
   });
 
   // Flatten all pages into a single array of events
@@ -81,7 +95,8 @@ export function useEvents() {
   }, [data]);
 
   // Get total count from first page
-  const totalCount = (data?.pages?.[0] as EventsResponse | undefined)?.totalCount ?? 0;
+  const totalCount =
+    (data?.pages?.[0] as EventsResponse | undefined)?.totalCount ?? 0;
 
   // Filter events by interested if the filter is active
   const filteredEvents = useMemo(() => {
@@ -95,9 +110,11 @@ export function useEvents() {
 
   const documentTitle = useMemo(() => {
     let title: string;
-    
+
     // Use totalCount if available and not filtering by interested (which filters client-side)
-    const displayCount = showInterested ? filteredEvents.length : totalCount || filteredEvents.length;
+    const displayCount = showInterested
+      ? filteredEvents.length
+      : totalCount || filteredEvents.length;
 
     if (searchTerm || categories) {
       title = `${displayCount} Found Events - Wat2Do`;
@@ -116,7 +133,16 @@ export function useEvents() {
     }
 
     return previousTitleRef.current;
-  }, [filteredEvents.length, totalCount, isLoading, searchTerm, categories, dtstart_utc, addedAt, showInterested]);
+  }, [
+    filteredEvents.length,
+    totalCount,
+    isLoading,
+    searchTerm,
+    categories,
+    dtstart_utc,
+    addedAt,
+    showInterested,
+  ]);
 
   useDocumentTitle(documentTitle);
 
@@ -156,7 +182,6 @@ export function useEvents() {
         const isoString = cutoffDate.toISOString();
         nextParams.set("added_at", isoString);
         nextParams.delete("dtstart_utc");
-        nextParams.delete("interested");
       }
       return nextParams;
     });
@@ -176,12 +201,22 @@ export function useEvents() {
         // When deselecting interested, remove all filters to show upcoming events
         nextParams.delete("interested");
         nextParams.delete("dtstart_utc");
-        nextParams.delete("added_at");
       } else {
         nextParams.set("interested", "true");
-        // Reveal all interested from 2025-01-01
-        nextParams.set("dtstart_utc", "2025-01-01T00:00:00Z");
+      }
+      return nextParams;
+    });
+  };
+
+  const handleToggleAllEvents = () => {
+    setSearchParams((prev) => {
+      const nextParams = new URLSearchParams(prev);
+
+      if (dtstart_utc) {
+        nextParams.delete("dtstart_utc");
+      } else {
         nextParams.delete("added_at");
+        nextParams.set("dtstart_utc", "2025-01-01T00:00:00Z");
       }
       return nextParams;
     });
@@ -201,6 +236,7 @@ export function useEvents() {
     handleToggleStartDate,
     handleToggleNewEvents,
     handleToggleInterested,
+    handleToggleAllEvents,
     fetchNextPage,
     hasNextPage,
     isFetchingNextPage,