diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5230f1dd154ea500ba9f786c1453d59023c3f33e..342321d693656c7d0ee0e316de3a0bd54a5b7e25 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,7 @@ Fixed * Import failed if there were classes without class teachers. * Management command ``move_dates_for_testing`` throwed misleading errors. +* Events weren't always deleted due to wrong date filters. `2.0`_ - 2021-10-30 ------------------- diff --git a/aleksis/apps/untis/util/mysql/importers/events.py b/aleksis/apps/untis/util/mysql/importers/events.py index 766ee2551e39906bbe84180853eba3aba70aa916..7d6d0054d50438fe4659544565b43f228aa9b397 100644 --- a/aleksis/apps/untis/util/mysql/importers/events.py +++ b/aleksis/apps/untis/util/mysql/importers/events.py @@ -137,9 +137,8 @@ def import_events( ref[import_ref] = new_event # Delete all no longer existing events - for e in chronos_models.Event.objects.filter( - date_start__lte=validity_range.date_start, - date_end__gte=validity_range.date_end, + for e in chronos_models.Event.objects.within_dates( + validity_range.date_start, validity_range.date_end ): if e.import_ref_untis and e.import_ref_untis not in existing_events: logger.info("Event {} deleted".format(e.id))