Improve events importer

aleksis/apps/untis/util/mysql/importers/events.py

@@ -47,8 +47,6 @@ def import_events(
     for event in tqdm(events, desc="Import events", **TQDM_DEFAULTS):
         import_ref = event.event_id
 
-        logger.info(f"Import event {import_ref}")
-
         # Build values
         comment = event.text or ""
 
@@ -59,6 +57,11 @@ def import_events(
         weekday_from = datetime_start.weekday()
         weekday_to = datetime_end.weekday()
 
+        logger.info(
+            f"Import event {import_ref} ({datetime_start}-{datetime_end}, "
+            f"{slot_start}-{slot_end}, {comment})"
+        )
+
         # Check min/max weekdays
         weekday_from = move_weekday_to_range(slots_ref, weekday_from)
         weekday_to = move_weekday_to_range(slots_ref, weekday_to)
@@ -102,7 +105,10 @@ def import_events(
         datetime_start = slot_start.get_datetime_start(datetime_start)
         datetime_end = slot_end.get_datetime_end(datetime_end)
 
-        new_event, created = LessonEvent.objects.update_or_create(
+        new_event, created = LessonEvent.objects.filter(
+            datetime_start__date__lte=validity_range.date_end,
+            datetime_end__date__gte=validity_range.date_start,
+        ).update_or_create(
             extended_data__event_untis=import_ref,
             defaults={
                 "datetime_start": datetime_start,
@@ -110,6 +116,7 @@ def import_events(
                 "title": comment,
                 "slot_number_start": slot_start.period,
                 "slot_number_end": slot_end.period,
+                "cancelled": False,
             },
         )