[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.1
+    rev: v0.14.2
     hooks:
       # Run the linter.
       - id: ruff

core/migrations/0079_alter_event_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.13 on 2025-10-26 03:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0078_timetable_courses_str_timetable_title'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='name',
+            field=models.CharField(max_length=150),
+        ),
+    ]

core/models/course.py

@@ -219,7 +219,7 @@ class Meta:
 
 
 class Event(models.Model):
-    name = models.CharField(max_length=64)
+    name = models.CharField(max_length=150, blank=False)
     term = models.ForeignKey(Term, on_delete=models.CASCADE, related_name="events")
 
     organization = models.ForeignKey(

core/models/timetable.py

@@ -12,7 +12,7 @@ def get_default_timetable_format():
 
 
 def default_courses():
-    return [f"Period {i+1}" for i in range(4)]
+    return [f"Period {i + 1}" for i in range(4)]
 
 
 class Timetable(models.Model):

core/tasks.py

@@ -389,11 +389,13 @@ def fetch_calendar_events():
     try:
         url = f"https://www.googleapis.com/calendar/v3/calendars/{settings.GCAL_CID}/events"
         url += "?fields=items(id,status,summary,description,start,end)"
+        timeMin = dt.datetime.now(dt.UTC) + dt.timedelta(days=-30)
+        timeMax = dt.datetime.now(dt.UTC) + dt.timedelta(days=60)
         params = {
             "key": settings.GCAL_API_KEY,
             "orderBy": "startTime",
-            "timeMin": (dt.datetime.now(dt.UTC) + dt.timedelta(days=-30)).isoformat(),
-            "timeMax": (dt.datetime.now(dt.UTC) + dt.timedelta(days=60)).isoformat(),
+            "timeMin": timeMin.isoformat(),
+            "timeMax": timeMax.isoformat(),
             "eventTypes": "default",
             "singleEvents": "True",
             "showDeleted": "True",
@@ -412,80 +414,141 @@ def fetch_calendar_events():
         logger.warning(f"Fetch Calendar Events: {exc}")
         return
 
-    events = []
+    school_org = Organization.objects.get(pk=2)  # SAC: https://maclyonsden.com/c/2
+
+    existing_events = {
+        event.gcal_id: event
+        for event in Event.objects.filter(
+            gcal_id__isnull=False,
+            start_date__gte=timeMin.isoformat(),
+            end_date__lte=timeMax.isoformat(),
+        )
+    }
+    terms = list(
+        Term.objects.filter(
+            end_date__gte=timeMin.date().isoformat(),
+            start_date__lte=timeMax.date().isoformat(),
+        )
+    )
+
+    events_to_create = []
+    events_to_update = []
+    events_to_delete = []
 
     for gcal_event in gcal_eventlist:
         if gcal_event.get("summary").strip().lower() in ["day 1", "day 2"]:
             continue
 
         try:
-            event = Event.objects.filter(gcal_id=gcal_event.get("id")).first()
+            gcal_id = gcal_event.get("id")
             status = gcal_event.get("status")
+            existing_event = existing_events.get(gcal_id)
 
-            if event is not None and (status is None or status == "cancelled"):
-                event.delete()
+            if existing_event is not None and (status is None or status == "cancelled"):
+                events_to_delete.append(existing_event)
 
-            elif status == "confirmed":
-                all_day_event = gcal_event.get("start").get("dateTime") is None
+            if status != "confirmed":
+                continue
 
-                if all_day_event:
-                    start_date = timezone.make_aware(
-                        dt.datetime.combine(
-                            dt.date.fromisoformat(gcal_event.get("start").get("date")),
-                            dt.time(0, 0),
-                        )
-                    )
-                    end_date = timezone.make_aware(
-                        dt.datetime.combine(
-                            dt.date.fromisoformat(gcal_event.get("end").get("date"))
-                            + dt.timedelta(days=-1),
-                            dt.time(23, 59),
-                        )
+            gcal_start = gcal_event.get("start")
+            gcal_end = gcal_event.get("end")
+            all_day_event = gcal_start.get("dateTime") is None
+
+            if all_day_event:
+                start_dtime = timezone.make_aware(
+                    dt.datetime.combine(
+                        dt.date.fromisoformat(gcal_start.get("date")),
+                        dt.time(0, 0),
                     )
-                else:
-                    start_date = dt.datetime.fromisoformat(
-                        gcal_event.get("start").get("dateTime")
+                )
+                end_dtime = timezone.make_aware(
+                    dt.datetime.combine(
+                        dt.date.fromisoformat(gcal_end.get("date"))
+                        + dt.timedelta(days=-1),
+                        dt.time(23, 59),
                     )
-                    end_date = dt.datetime.fromisoformat(
-                        gcal_event.get("end").get("dateTime")
+                )
+            else:
+                start_dtime = dt.datetime.fromisoformat(gcal_start.get("dateTime"))
+                end_dtime = dt.datetime.fromisoformat(gcal_end.get("dateTime"))
+
+            event_term = next(
+                (
+                    term
+                    for term in terms
+                    if (
+                        term.start_date
+                        <= start_dtime.date()
+                        <= end_dtime.date()
+                        <= term.end_date
                     )
+                ),
+                None,
+            )
 
-                event_data = {
-                    "name": gcal_event.get("summary").strip(),
-                    "term": Term.get_current(start_date),
-                    "description": gcal_event.get("description") or "",
-                    "start_date": start_date,
-                    "end_date": end_date,
-                }
-
-                event_create_data = event_data | {
-                    "organization": Organization.objects.get(
-                        pk=2
-                    ),  # SAC: https://maclyonsden.com/c/2
-                    "is_public": True,
-                    "schedule_format": "default",
-                }
-
-                event, created = Event.objects.update_or_create(
-                    gcal_id=gcal_event.get("id"),
-                    create_defaults=event_create_data,
-                    defaults=event_data,
-                )
+            event_data = {
+                "name": gcal_event.get("summary").strip(),
+                "term": event_term,
+                "description": gcal_event.get("description") or "",
+            }
 
-                if created:
-                    events.append(
-                        (
-                            event,
-                            all_day_event,
-                        )
-                    )
+            if "late start" in event_data["name"].lower():
+                event_data["name"] = "Late Start"
+
+            if existing_event is not None:
+                changed = any(
+                    getattr(existing_event, field) != value
+                    for field, value in event_data.items()
+                )
+                if changed:
+                    for field, value in event_data.items():
+                        setattr(existing_event, field, value)
+                    events_to_update.append(existing_event)
+            else:
+                event = Event(
+                    gcal_id=gcal_id,
+                    **event_data,
+                    organization=school_org,
+                    start_date=start_dtime,
+                    end_date=end_dtime,
+                    is_public=False,  # whitelist in admin
+                    schedule_format="default",
+                )
+                events_to_create.append(event)
 
         except Exception:
             logger.warning(
                 f"core.tasks.fetch_calendar_events: Failed to process event {gcal_event.get('id')}"
                 + f"\n{traceback.format_exc()}"
             )
 
+    from django.db import transaction
+
+    with transaction.atomic():
+        if events_to_delete:
+            Event.objects.filter(id__in=[e.id for e in events_to_delete]).delete()
+
+        if events_to_update:
+            Event.objects.bulk_update(events_to_update, list(event_data.keys()))
+
+        if events_to_create:
+            # Event.objects.bulk_create(events_to_create, ignore_conflicts=True) # no logging? *megamind peeking*
+            for event in events_to_create:
+                try:
+                    event.save()
+                except Exception:
+                    events_to_create.remove(event)
+                    logger.warning(
+                        f"core.tasks.fetch_calendar_events: Failed to create event {event.name}"
+                        + f"\n{traceback.format_exc()}"
+                    )
+
+    events = events_to_create + events_to_update
+    del existing_events
+    del events_to_create
+    del events_to_update
+    del events_to_delete
+
     if len(events) == 0:
         return
 
@@ -518,7 +581,7 @@ def fetch_calendar_events():
             }
         )
 
-    for event, _ in events:
+    for event in events:
         data_for_llm["new_events"].append(
             {"event": event.name, "description": event.description, "id": event.gcal_id}
         )
@@ -539,7 +602,7 @@ def fetch_calendar_events():
     except Exception:
         logger.warning(traceback.format_exc())
 
-    for event, _ in events:
+    for event in events:
         try:
             for tag in response[event.gcal_id]:
                 if tag not in tags:
@@ -565,7 +628,8 @@ def fetch_calendar_events():
     except Exception:
         logger.warning(traceback.format_exc())
 
-    for event, all_day_event in events:
+    for event in events:
+        all_day_event = event.start_date == start_dtime and event.end_date == end_dtime
         if not all_day_event:
             continue