Merge branch '65-adapt-to-managed_by-change' into 'master'

Resolve "Adapt to managed_by change"

Closes #65

See merge request !86

aleksis/apps/lesrooster/models.py

@@ -480,7 +480,8 @@ class LessonBundle(ExtensibleModel):
         )
 
         lesson_bundle.lessons.set(
-            [Lesson.create_from_course(course, validity_range) for course in course_bundle.courses.all()]
+            [Lesson.create_from_course(course, validity_range)
+             for course in course_bundle.courses.all()]
         )
 
         return lesson_bundle
@@ -552,7 +553,7 @@ class Lesson(TeacherPropertiesMixin, RoomPropertiesMixin, ExtensibleModel):
     def create_from_course(cls, course: Course, validity_range: ValidityRange) -> "Lesson":
         """Create a lesson from a course backed by a validity range."""
         # Lookup the TCC for the course in the validity_range
-        tcc = TimeboundCourseConfig.objects.managed_and_unmanaged().get(
+        tcc = TimeboundCourseConfig.objects.get(
             course=course, validity_range=validity_range
         )
         lesson = cls.objects.create(

aleksis/apps/lesrooster/preferences.py

@@ -33,9 +33,6 @@ class GroupTypeCourseGroups(ModelChoicePreference):
     verbose_name = _("Group type for automatically created course groups")
     help_text = _("If you leave it empty, no group type will be used.")
 
-    def get_queryset(self):
-        return GroupType.objects.managed_and_unmanaged()
-
 
 @site_preferences_registry.register
 class FillCourseGroupsWithMembers(BooleanPreference):

aleksis/apps/lesrooster/schema/__init__.py

@@ -249,7 +249,7 @@ class Query(graphene.ObjectType):
             return []
 
         return graphene_django_optimizer.query(
-            CourseBundle.objects.managed_and_unmanaged()
+            CourseBundle.objects
             .filter(Q(courses__groups__id=group) | Q(courses__groups__parent_groups__id=group))
             .distinct()
             .annotate(validity_range_id=Value(validity_range)),

aleksis/apps/lesrooster/schema/timebound_course_bundle.py

@@ -16,7 +16,7 @@ class TimeboundCourseType(BaseCourseType):
     def resolve_lesson_quota(root, info):
         """Resolve lesson_quota from timebound_course_config"""
         return (
-            TimeboundCourseConfig.objects.managed_and_unmanaged()
+            TimeboundCourseConfig.objects
             .get(
                 course=root,
                 validity_range__id=root.validity_range_id,
@@ -27,7 +27,7 @@ class TimeboundCourseType(BaseCourseType):
     def resolve_teachers(root, info):
         """Resolve teachers from timebound_course_config"""
         return (
-            TimeboundCourseConfig.objects.managed_and_unmanaged()
+            TimeboundCourseConfig.objects
             .get(course=root, validity_range__id=root.validity_range_id)
             .teachers.all()
         )