Import programs from exam events in JSON import

Author: hansegucker

evap/staff/importers/json.py

@@ -219,7 +219,6 @@ def _import_lecturers(self, data: list[ImportLecturer]) -> None:
 
     def _import_course(self, data: ImportEvent) -> Course:
         course_type = self._get_course_type(data["type"])
-        programs = [self._get_program(c["cprid"]) for c in data["courses"]]
         responsibles = self._get_user_profiles(data["lecturers"])
         responsibles = self._filter_user_profiles(responsibles)
         responsibles = self._choose_responsibles(responsibles)
@@ -229,7 +228,6 @@ def _import_course(self, data: ImportEvent) -> Course:
             cms_id=data["gguid"],
             defaults={"name_de": data["title"], "name_en": data["title_en"], "type": course_type},
         )
-        course.programs.set(programs)
         course.responsibles.set(responsibles)
 
         if changes:
@@ -241,6 +239,10 @@ def _import_course(self, data: ImportEvent) -> Course:
 
         return course
 
+    def _import_course_programs(self, course: Course, data: ImportEvent) -> None:
+        programs = [self._get_program(c["cprid"]) for c in data["courses"]]
+        course.programs.set(programs)
+
     # pylint: disable=too-many-locals
     def _import_evaluation(self, course: Course, data: ImportEvent) -> Evaluation:
         last_appointment = sorted(data["appointments"], key=lambda x: x["end"])[-1]
@@ -333,6 +335,8 @@ def _import_events(self, data: list[ImportEvent]) -> None:
         for event in exam_events:
             course = self.course_map[event["relatedevents"]["gguid"]]
 
+            self._import_course_programs(course, event)
+
             self._import_evaluation(course, event)
 
     @transaction.atomic

evap/staff/tests/test_json_importer.py

@@ -33,10 +33,7 @@
             "title_en": "Process-oriented information systems",
             "type": "Vorlesung",
             "isexam": False,
-            "courses": [
-                {"cprid": "BA-Inf", "scale": "GRADE_PARTICIPATION"},
-                {"cprid": "MA-Inf", "scale": "GRADE_PARTICIPATION"},
-            ],
+            "courses": [],
             "relatedevents": {"gguid": "0x6"},
             "appointments": [{"begin": "15.04.2024 10:15", "end": "15.07.2024 11:45"}],
             "lecturers": [{"gguid": "0x3"}],
@@ -50,8 +47,8 @@
             "type": "Klausur",
             "isexam": True,
             "courses": [
-                {"cprid": "BA-Inf", "scale": ""},
-                {"cprid": "MA-Inf", "scale": ""},
+                {"cprid": "BA-Inf", "scale": "GRADE_PARTICIPATION"},
+                {"cprid": "MA-Inf", "scale": "GRADE_PARTICIPATION"},
             ],
             "relatedevents": {"gguid": "0x5"},
             "appointments": [{"begin": "29.07.2024 10:15", "end": "29.07.2024 11:45"}],
@@ -182,7 +179,7 @@ def test_import_courses(self):
         self.assertEqual(course.name_en, EXAMPLE_DATA["events"][0]["title_en"])
         self.assertEqual(course.type.name_de, EXAMPLE_DATA["events"][0]["type"])
         self.assertSetEqual(
-            {d.name_de for d in course.programs.all()}, {d["cprid"] for d in EXAMPLE_DATA["events"][0]["courses"]}
+            {d.name_de for d in course.programs.all()}, {d["cprid"] for d in EXAMPLE_DATA["events"][1]["courses"]}
         )
         self.assertSetEqual(
             set(course.responsibles.values_list("email", flat=True)),
@@ -200,7 +197,6 @@ def test_import_courses(self):
             set(main_evaluation.participants.values_list("email", flat=True)),
             {"[email protected]", "[email protected]"},
         )
-        self.assertTrue(main_evaluation.wait_for_grade_upload_before_publishing)
 
         self.assertEqual(Contribution.objects.filter(evaluation=main_evaluation).count(), 2)
         self.assertSetEqual(
@@ -223,7 +219,7 @@ def test_import_courses(self):
             set(exam_evaluation.participants.values_list("email", flat=True)),
             {"[email protected]", "[email protected]"},
         )
-        self.assertFalse(exam_evaluation.wait_for_grade_upload_before_publishing)
+        self.assertTrue(exam_evaluation.wait_for_grade_upload_before_publishing)
 
         self.assertEqual(Contribution.objects.filter(evaluation=exam_evaluation).count(), 4)
         self.assertSetEqual(