fixed event submissions and cleaned up dates and utils

Author: tonyqiu123

.github/workflows/send-newsletter.yml

@@ -2,7 +2,7 @@ name: Send Newsletter
 
 on:
   schedule:
-    - cron: '0 19 * * *'  # 2pm EST (7pm UTC)
+    - cron: '0 11 * * *'  # 9am EST (4pm UTC)
   workflow_dispatch:      # Optional manual trigger
 
 jobs:

backend/apps/clubs/views.py

@@ -22,11 +22,7 @@ def get_clubs(request):
         search_term = request.GET.get("search", "").strip()
         category_filter = request.GET.get("category", "").strip()
         cursor = request.GET.get("cursor", "").strip()
-        limit = int(request.GET.get("limit", "50"))
-        
-        # Limit boundary check
-        if limit > 100:
-            limit = 100
+        limit = 50
 
         queryset = Clubs.objects.all().order_by("id")
 

backend/apps/core/auth.py

@@ -55,14 +55,20 @@ def _wrapped_view(request, *args, **kwargs):
             error = getattr(request, "error_message", "User not authenticated")
             return JsonResponse({"detail": error}, status=401)
         request.user = user
+        
+        # Extract user_id and is_admin from auth_payload (set by JwtAuthBackend)
+        auth_payload = getattr(request, "auth_payload", {})
+        request.user_id = auth_payload.get("sub") or auth_payload.get("id")
+        request.is_admin = auth_payload.get("role") == "admin"
+        
         return view_func(request, *args, **kwargs)
     return _wrapped_view
 
 
 def optional_jwt(view_func):
     """
     Optional JWT authentication decorator.
-    If a token is provided and valid, populates request.auth_payload.
+    If a token is provided and valid, populates request.auth_payload, request.user_id, and request.is_admin.
     If no token or invalid token, continues without error (for public endpoints).
     """
     @wraps(view_func)
@@ -78,16 +84,24 @@ def _wrapped_view(request, *args, **kwargs):
 
             if state.is_signed_in:
                 request.auth_payload = state.payload
+                # Extract user_id (tries 'sub' first, falls back to 'id')
+                request.user_id = state.payload.get("sub") or state.payload.get("id")
+                # Check if user is admin
+                request.is_admin = state.payload.get("role") == "admin"
                 django_user = AnonymousUser()
-                django_user.username = state.payload.get("sub") or "clerk_user"
+                django_user.username = request.user_id or "clerk_user"
                 request.user = django_user
             else:
                 # No token or invalid token - that's fine, just continue
                 request.auth_payload = {}
+                request.user_id = None
+                request.is_admin = False
                 request.user = AnonymousUser()
         except Exception:
             # Any error during auth - that's fine, just continue
             request.auth_payload = {}
+            request.user_id = None
+            request.is_admin = False
             request.user = AnonymousUser()
 
         return view_func(request, *args, **kwargs)
@@ -98,8 +112,7 @@ def admin_required(view_func):
     @wraps(view_func)
     @jwt_required
     def _wrapped_view(request, *args, **kwargs):
-        role = request.auth_payload.get("role")
-        if role != "admin":
+        if not getattr(request, "is_admin", False):
             return JsonResponse({"message": "Admin only"}, status=403)
         return view_func(request, *args, **kwargs)
     return _wrapped_view

backend/apps/events/migrations/0028_remove_events_events_school_status_dtend_idx_and_more.py

@@ -0,0 +1,89 @@
+# Generated by Django 4.2.7 on 2025-11-07 12:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0027_ignoredpost"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_school_status_dtend_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_school_status_dtstart_nullend_idx",
+        ),
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_school_status_dtend_utc_dtstart_utc_idx",
+        ),
+        migrations.RemoveField(
+            model_name="eventdates",
+            name="dtend",
+        ),
+        migrations.RemoveField(
+            model_name="eventdates",
+            name="dtstart",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="all_day",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="dtend",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="dtend_utc",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="dtstamp",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="dtstart",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="dtstart_utc",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="duration",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="rdate",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="rrule",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="tz",
+        ),
+        migrations.RemoveField(
+            model_name="eventsubmission",
+            name="extracted_data",
+        ),
+        migrations.RemoveField(
+            model_name="eventsubmission",
+            name="screenshot_url",
+        ),
+        migrations.RemoveField(
+            model_name="eventsubmission",
+            name="source_url",
+        ),
+        migrations.RemoveField(
+            model_name="eventsubmission",
+            name="status",
+        ),
+    ]

backend/apps/events/migrations/0029_remove_events_latitude_remove_events_longitude.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.7 on 2025-11-07 21:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0028_remove_events_events_school_status_dtend_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="events",
+            name="latitude",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="longitude",
+        ),
+    ]

backend/apps/events/migrations/0030_remove_eventsubmission_admin_notes.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2025-01-XX XX:XX
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0029_remove_events_latitude_remove_events_longitude"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="eventsubmission",
+            name="admin_notes",
+        ),
+    ]
+

backend/apps/events/migrations/0031_remove_events_raw_json.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2025-11-08 22:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0030_remove_eventsubmission_admin_notes'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='events',
+            name='raw_json',
+        ),
+    ]

backend/apps/events/models.py

@@ -17,25 +17,6 @@ class Events(models.Model):
         null=True, blank=True, help_text="'Student Center Ballroom, 123 University Ave'"
     )
 
-    # iCalendar datetime fields (RFC 5545 standard)
-    dtstamp = models.DateTimeField(
-        default=timezone.now, help_text="'time created in UTC, 2024-03-15T10:30:00Z'"
-    )
-    dtstart = models.DateTimeField(
-        default=timezone.now, help_text="'2024-03-20T09:00:00'"
-    )
-    dtend = models.DateTimeField(
-        blank=True, null=True, help_text="'2024-03-20T17:00:00'"
-    )
-    dtstart_utc = models.DateTimeField(
-        default=timezone.now, help_text="'2024-03-20T14:00:00Z'"
-    )
-    dtend_utc = models.DateTimeField(
-        blank=True, null=True, help_text="'2024-03-20T22:00:00Z'"
-    )
-    all_day = models.BooleanField(default=False, help_text="True")
-    duration = models.DurationField(blank=True, null=True, help_text="'8:00:00'")
-
     # Event categorization
     categories = models.JSONField(
         default=list,
@@ -44,17 +25,6 @@ class Events(models.Model):
         help_text="['Career', 'Networking']",
     )
 
-    # Timezone information
-    tz = models.CharField(
-        max_length=64, null=True, blank=True, help_text="'America/New_York'"
-    )
-
-    # Recurrence rules (iCalendar RFC 5545)
-    rrule = models.TextField(null=True, blank=True, help_text="'FREQ=WEEKLY;BYDAY=MO'")
-    rdate = models.JSONField(
-        null=True, blank=True, help_text="['2024-03-25', '2024-04-01']"
-    )
-
     # Event status
     status = models.CharField(
         max_length=32,
@@ -63,14 +33,6 @@ class Events(models.Model):
         help_text="Event status (e.g., 'CONFIRMED', 'TENTATIVE', 'CANCELLED')",
     )
 
-    # Geographic location (regular numeric fields)
-    latitude = models.FloatField(null=True, blank=True, help_text="40.7128")
-    longitude = models.FloatField(null=True, blank=True, help_text="-74.0059")
-
-    # Data provenance and raw extraction
-    raw_json = models.JSONField(
-        default=dict, help_text="{'title': 'Career Fair', 'location': 'Student Center'}"
-    )
     source_url = models.TextField(
         null=True, blank=True, help_text="'https://university.edu/events/career-fair'"
     )
@@ -126,15 +88,7 @@ class Events(models.Model):
 
     class Meta:
         db_table = "events"
-        indexes = [
-            models.Index(fields=["school", "status", "dtend_utc"], name="events_school_status_dtend_idx"),
-            models.Index(fields=["school", "status", "dtend_utc", "dtstart_utc"], name="events_school_status_dtend_utc_dtstart_utc_idx"),
-            models.Index(
-                fields=["school", "status", "dtstart_utc"],
-                condition=models.Q(dtend_utc__isnull=True),
-                name="events_school_status_dtstart_nullend_idx",
-            ),
-        ]
+        indexes = []
 
     def __str__(self):
         return f"{self.title[:50] if self.title else 'untitled'}"
@@ -151,11 +105,6 @@ class EventSubmission(models.Model):
 
     # Submission details
     id = models.BigAutoField(primary_key=True)
-    screenshot_url = models.URLField(help_text="S3 URL of uploaded screenshot")
-    source_url = models.URLField(help_text="URL to original event source")
-    status = models.CharField(
-        max_length=20, choices=STATUS_CHOICES, default="pending", db_index=True
-    )
     submitted_by = models.CharField(
         max_length=255, help_text="Clerk user ID who submitted this event"
     )
@@ -165,12 +114,6 @@ class EventSubmission(models.Model):
     reviewed_at = models.DateTimeField(null=True, blank=True)
     reviewed_by = models.CharField(max_length=255, null=True, blank=True)
 
-    # Extracted event data (populated after OpenAI processing)
-    extracted_data = models.JSONField(
-        null=True, blank=True, help_text="Event data extracted by OpenAI"
-    )
-
-    # Required link to created event
     created_event = models.ForeignKey(
         Events,
         null=False,
@@ -179,9 +122,6 @@ class EventSubmission(models.Model):
         related_name="submission",
     )
 
-    # Admin notes
-    admin_notes = models.TextField(blank=True)
-
     class Meta:
         db_table = "event_submissions"
         ordering = ["-submitted_at"]
@@ -193,9 +133,6 @@ def __str__(self):
 class EventDates(models.Model):
     """
     Stores individual occurrence dates for events.
-    For events with rrule or rdate, this table contains all computed dates.
-    For simple events without recurrence, contains a single date entry.
-    This enables efficient querying of upcoming events without calculating rrule/rdate.
     """
 
     id = models.BigAutoField(primary_key=True)
@@ -206,12 +143,6 @@ class EventDates(models.Model):
         db_index=True,
         help_text="Reference to the parent event",
     )
-    dtstart = models.DateTimeField(
-        help_text="Local start time for this occurrence"
-    )
-    dtend = models.DateTimeField(
-        blank=True, null=True, help_text="Local end time for this occurrence"
-    )
     dtstart_utc = models.DateTimeField(
         db_index=True, help_text="UTC start time for this occurrence"
     )

backend/apps/events/urls.py

@@ -9,7 +9,6 @@
 urlpatterns = [
     path("", views.get_events, name="events"),
     path("<int:event_id>/", views.get_event, name="event_detail"),
-    path("<int:event_id>/submission/", views.get_event_submission, name="get_event_submission"),
     path("<int:event_id>/update/", views.update_event, name="update_event"),
     path("<int:event_id>/delete/", views.delete_event, name="delete_event"),
     path("export.ics", views.export_events_ics, name="export_events_ics"),
@@ -27,9 +26,6 @@
     path("submissions/<int:submission_id>/", views.delete_submission, name="delete_submission"),
     # Event interest endpoints
     path("my-interests/", views.get_my_interested_event_ids, name="get_my_interested_event_ids"),
-    path("<int:event_id>/interest/", views.get_event_interest, name="get_event_interest"),
     path("<int:event_id>/interest/mark/", views.mark_event_interest, name="mark_event_interest"),
     path("<int:event_id>/interest/unmark/", views.unmark_event_interest, name="unmark_event_interest"),
-    # Test endpoints
-    path("test-similarity/", views.test_similarity, name="test_similarity"),
 ]