cleaned up db, includes longitude, latitude, school, duration, proper utc dates

Author: Tony Qiu

README.md

@@ -42,6 +42,7 @@ pip install -r requirements.txt
 python manage.py makemigrations
 python manage.py migrate
 # PRODUCTION=1 python manage.py migrate
+python scripts/populate-local-db-with-prod-data.py 
 python manage.py runserver 8000
 ```
 

backend/apps/core/management/__init__.py

@@ -81,8 +81,8 @@ def get_events(request):
             "title",
             "description",
             "location",
-            "dtstart",
-            "dtend",
+            "dtstart_utc",
+            "dtend_utc",
             "price",
             "food",
             "registration",
@@ -121,8 +121,8 @@ def get_event(request, event_id):
             "title",
             "description",
             "location",
-            "dtstart",
-            "dtend",
+            "dtstart_utc",
+            "dtend_utc",
             "price",
             "food",
             "registration",
@@ -267,13 +267,13 @@ def escape_text(text):
     dtstamp = now.strftime("%Y%m%dT%H%M%SZ")
 
     for event in events:
-        start_date = event.dtstart.strftime("%Y%m%d")
-        start_time = event.dtstart.strftime("%H%M%S")
-        end_time = event.dtend.strftime("%H%M%S") if event.dtend else start_time
+        start_date = event.dtstart_utc.strftime("%Y%m%d")
+        start_time = event.dtstart_utc.strftime("%H%M%S")
+        end_time = event.dtend_utc.strftime("%H%M%S") if event.dtend_utc else start_time
 
         lines.append("BEGIN:VEVENT")
-        lines.append(f"DTSTART:{start_date}T{start_time}")
-        lines.append(f"DTEND:{start_date}T{end_time}")
+        lines.append(f"DTSTART:{start_date}T{start_time}Z")
+        lines.append(f"DTEND:{start_date}T{end_time}Z")
         lines.append(f"DTSTAMP:{dtstamp}")
         lines.append(f"SUMMARY:{escape_text(event.title)}")
 
@@ -343,13 +343,13 @@ def get_google_calendar_urls(request):
         from urllib.parse import urlencode
 
         for event in events:
-            # Format dates for Google Calendar (YYYYMMDDTHHMMSS)
-            start_date = event.dtstart.strftime("%Y%m%d")
-            start_time = event.dtstart.strftime("%H%M%S")
-            end_time = event.dtend.strftime("%H%M%S") if event.dtend else start_time
+            # Format dates for Google Calendar (YYYYMMDDTHHMMSSZ for UTC)
+            start_date = event.dtstart_utc.strftime("%Y%m%d")
+            start_time = event.dtstart_utc.strftime("%H%M%S")
+            end_time = event.dtend_utc.strftime("%H%M%S") if event.dtend_utc else start_time
 
-            start_datetime = f"{start_date}T{start_time}"
-            end_datetime = f"{start_date}T{end_time}"
+            start_datetime = f"{start_date}T{start_time}Z"
+            end_datetime = f"{start_date}T{end_time}Z"
 
             # Build details field
             details_parts = []
@@ -387,7 +387,7 @@ def rss_feed(request):
     Simple RSS feed of upcoming events (returns application/rss+xml).
     """
     now = timezone.now()
-    items = Events.objects.filter(dtstart__gte=now).order_by("dtstart")[:50]
+    items = Events.objects.filter(dtstart_utc__gte=now).order_by("dtstart_utc")[:50]
 
     site_url = getattr(settings, "SITE_URL", "https://wat2do.ca")
     rss_items = []

backend/apps/core/management/commands/__init__.py

@@ -186,8 +186,8 @@ def get_promoted_events(request):
                 {
                     "id": event.id,
                     "title": event.title,
-                    "dtstart": event.dtstart.isoformat(),
-                    "dtend": event.dtend.isoformat() if event.dtend else None,
+                    "dtstart": event.dtstart_utc.isoformat(),
+                    "dtend": event.dtend_utc.isoformat() if event.dtend_utc else None,
                     "location": event.location,
                     "description": event.description,
                     "source_image_url": event.source_image_url,

backend/apps/events/views.py

@@ -30,18 +30,18 @@ def _get_events_added_today(self):
         events = (
             Events.objects.filter(added_at__date=today)
             .select_related()
-            .order_by("dtstart", "dtend")
+            .order_by("dtstart_utc", "dtend_utc")
         )
 
         events_data = []
         for event in events:
             # Format the event data for email template
-            event_date = event.dtstart.strftime("%B %d, %Y")
+            event_date = event.dtstart_utc.strftime("%B %d, %Y")
 
             # Format time range
-            start_time = event.dtstart.strftime("%I:%M %p").lstrip("0")
-            if event.dtend:
-                end_time = event.dtend.strftime("%I:%M %p").lstrip("0")
+            start_time = event.dtstart_utc.strftime("%I:%M %p").lstrip("0")
+            if event.dtend_utc:
+                end_time = event.dtend_utc.strftime("%I:%M %p").lstrip("0")
                 time_range = f"{start_time} - {end_time}"
             else:
                 time_range = f"Starting at {start_time}"

backend/apps/promotions/views.py

@@ -109,6 +109,7 @@ def extract_events_from_caption(
             "dtend": string,  // end date in YYYY-MM-DD HH:MM:SS+HH format if found, empty string if not
             "dtstart_utc": string,  // start date in UTC format YYYY-MM-DD HH:MM:SSZ (convert from dtstart using tz)
             "dtend_utc": string,  // end date in UTC format YYYY-MM-DD HH:MM:SSZ (convert from dtend using tz)
+            "duration": string,  // duration in HH:MM:SS format (e.g., "02:30:00" for 2.5 hours), empty string if dtend is not available
             "all_day": boolean,  // true if event is all day (no specific time mentioned), false otherwise
             "location": string,  // location of the event
             "latitude": number or null,  // latitude coordinate if location can be geocoded (e.g., 43.4723)
@@ -133,6 +134,7 @@ def extract_events_from_caption(
     - If recurring events are mentioned (e.g., "every Friday"), just create one event
     - For dtstart and dtend, if year not found, assume {now.year}
     - For dtstart_utc and dtend_utc: convert the local time (dtstart/dtend) to UTC using the timezone (tz). Format as YYYY-MM-DD HH:MM:SSZ. If dtstart/dtend are empty, then dtstart_utc/dtend_utc should also be empty
+    - For duration: calculate the duration between dtstart and dtend in HH:MM:SS format (e.g., "02:30:00" for 2 hours 30 minutes). If dtend is empty or not available, use empty string ""
     - When interpreting relative terms like "tonight", "tomorrow", "weekly", "every Friday", use the current date context above and the date the post was made. If an explicit date is found in the image, use that date
     - For weekly events, calculate the next occurrence based on the current date and day of week
     - For (off-campus) addresses: use the format "[Street Address], [City], [Province] [Postal Code]" when possible

backend/services/email_service.py

@@ -26,8 +26,8 @@ def find_similar_events(
                 title,
                 description,
                 location,
-                dtstart,
-                dtend,
+                dtstart_utc,
+                dtend_utc,
                 club_type,
                 1 - (embedding <=> %s::vector) as similarity
             FROM events 
@@ -38,7 +38,7 @@ def find_similar_events(
 
         # Add date filter if provided
         if min_date:
-            base_query += " AND dtstart >= %s"
+            base_query += " AND dtstart_utc >= %s"
             params.append(min_date)
 
         # Add similarity threshold

backend/services/openai_service.py

@@ -6,8 +6,8 @@
 class EventFilter(FilterSet):
     """Filter for Event queryset"""
 
-    dtstart = DateTimeFilter(field_name="dtstart", lookup_expr="gte")
-    dtend = DateTimeFilter(field_name="dtstart", lookup_expr="lte")
+    dtstart_utc = DateTimeFilter(field_name="dtstart_utc", lookup_expr="gte")
+    dtend_utc = DateTimeFilter(field_name="dtstart_utc", lookup_expr="lte")
     min_price = NumberFilter(field_name="price", lookup_expr="gte")
     max_price = NumberFilter(field_name="price", lookup_expr="lte")
     club_type = CharFilter(field_name="club_type")
@@ -17,8 +17,8 @@ class EventFilter(FilterSet):
     class Meta:
         model = Events
         fields = [
-            "dtstart",
-            "dtend",
+            "dtstart_utc",
+            "dtend_utc",
             "min_price",
             "max_price",
             "club_type",

backend/utils/embedding_utils.py

@@ -103,13 +103,13 @@ const EventPopup: React.FC<{
     <div className="space-y-2 text-sm text-gray-600 dark:text-gray-400">
       <div className="flex items-center gap-2">
         <CalendarIcon className="h-4 w-4 flex-shrink-0" />
-        <span>{formatPrettyDate(event.dtstart)}</span>
+        <span>{formatPrettyDate(event.dtstart_utc)}</span>
       </div>
 
       <div className="flex items-center gap-2">
         <Clock className="h-4 w-4 flex-shrink-0" />
         <span>
-          {formatEventTimeRange(event.dtstart, event.dtend)}
+          {formatEventTimeRange(event.dtstart_utc, event.dtend_utc)}
         </span>
       </div>
 
@@ -234,9 +234,9 @@ const EventsCalendar: React.FC<{ events: Event[] }> = ({ events }) => {
   }, [currentView, currentDate]); 
 
   const calendarEvents = events.map((event) => {
-    const start = new Date(removeTimezoneInfo(event.dtstart));
-    const end = event.dtend
-      ? new Date(removeTimezoneInfo(event.dtend))
+    const start = new Date(removeTimezoneInfo(event.dtstart_utc));
+    const end = event.dtend_utc
+      ? new Date(removeTimezoneInfo(event.dtend_utc))
       : new Date(start.getTime() + 60 * 60 * 1000); // Default end time = 1 hour after start
     return {
       ...event,