Add QuerySet for extra lessons

aleksis/apps/chronos/models.py

@@ -946,14 +946,24 @@ class SupervisionSubstitution(ExtensibleModel):
         verbose_name_plural = _("Supervision substitutions")
 
 
-class EventQuerySet(DateRangeQuerySet):
+class TimetableQuerySet(models.QuerySet):
+    """ Common filters
+
+     Models need following fields:
+     - groups
+     - teachers
+     - rooms (_multiple_rooms=True)/room (_multiple_rooms=False)
+     """
+
+    _multiple_rooms = True
+
     def filter_participant(self, person: Union[Person, int]):
-        """ Filter for all lessons a participant (student) attends. """
+        """ Filter for all objects a participant (student) attends. """
 
         return self.filter(Q(groups_members=person))
 
     def filter_group(self, group: Union[Group, int]):
-        """ Filter for all events a group (class) attends. """
+        """ Filter for all objects a group (class) attends. """
 
         if isinstance(group, int):
             group = Group.objects.get(pk=group)
@@ -970,9 +980,12 @@ class EventQuerySet(DateRangeQuerySet):
         return self.filter(teachers=teacher)
 
     def filter_room(self, room: Union[Room, int]):
-        """ Filter for all lessons taking part in a certain room. """
+        """ Filter for all objects taking part in a certain room. """
 
-        return self.filter(rooms=room)
+        if self._multiple_rooms:
+            return self.filter(rooms=room)
+        else:
+            return self.filter(room=room)
 
     def filter_from_type(self, type_: str, pk: int) -> Optional[models.QuerySet]:
         if type_ == "group":
@@ -1002,6 +1015,10 @@ class EventQuerySet(DateRangeQuerySet):
             return None
 
 
+class EventQuerySet(DateRangeQuerySet, TimetableQuerySet):
+    pass
+
+
 class Event(ExtensibleModel):
     label_ = "event"
 
@@ -1032,7 +1049,27 @@ class Event(ExtensibleModel):
         verbose_name_plural = _("Events")
 
 
+class ExtraLessonQuerySet(TimetableQuerySet):
+    _multiple_rooms = False
+
+    def within_dates(self, start: date, end: date):
+        week_start = CalendarWeek.from_date(start)
+        week_end = CalendarWeek.from_date(end)
+
+        return self.filter(
+            week__gte=week_start.week,
+            week__lte=week_end.week,
+            period__weekday__gte=start.weekday(),
+            period__weekday__lte=end.weekday(),
+        )
+
+    def on_day(self, day:date):
+        self.within_dates(day, day)
+
+
 class ExtraLesson(ExtensibleModel):
+    objects = models.Manager.from_queryset(ExtraLessonQuerySet)()
+
     week = models.IntegerField(verbose_name=_("Week"), default=CalendarWeek.current_week)
     period = models.ForeignKey("TimePeriod", models.CASCADE, related_name="extra_lessons")