Import holidays and supervisions on base of validity ranges

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

 import logging
 from typing import Dict
 
+from aleksis.apps.chronos.models import ValidityRange
 from tqdm import tqdm
 
 from aleksis.apps.chronos import models as chronos_models
@@ -11,12 +12,12 @@ from ..util import TQDM_DEFAULTS, run_default_filter, untis_date_to_date
 logger = logging.getLogger(__name__)
 
 
-def import_holidays() -> Dict[int, chronos_models.Holiday]:
+def import_holidays(validity_range: ValidityRange) -> Dict[int, chronos_models.Holiday]:
     """Import holidays."""
     ref = {}
 
     # Get holidays
-    holidays = run_default_filter(mysql_models.Holiday.objects, filter_term=False)
+    holidays = run_default_filter(validity_range, mysql_models.Holiday.objects, filter_term=False)
 
     for holiday in tqdm(holidays, desc="Import holidays", **TQDM_DEFAULTS):
         import_ref = holiday.holiday_id

aleksis/apps/untis/util/mysql/main.py

@@ -40,11 +40,11 @@ def untis_import_mysql():
         time_periods_ref = import_time_periods(validity_range)
         breaks_ref = import_breaks(validity_range, time_periods_ref)
 
-    # Holidays
-    holidays_ref = import_holidays()
+        # Holidays
+        holidays_ref = import_holidays(validity_range)
 
-    # Supervisions
-    supervision_areas_ref = import_supervision_areas(breaks_ref, teachers_ref)
+        # Supervisions
+        supervision_areas_ref = import_supervision_areas(validity_range, breaks_ref, teachers_ref)
 
     # Lessons
     import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, classes_ref)