ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Christian Cueni 2023-08-16 07:47:28 +02:00
parent 95a6d404b5
commit 5c7baab570
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/vbv_lernwelt/edoniq_test/tests/test_edoniq_export.py
View File

@ -34,7 +34,7 @@ class EdoniqUserExportTestCase(TestCase):
def test_fetch_course_session_users(self): def test_fetch_course_session_users(self):
users = fetch_course_session_users([COURSE_TEST_ID]) users = fetch_course_session_users([COURSE_TEST_ID])
self.assertEqual(len(users), 3) self.assertEqual(len(users), 2)
def test_response_csv(self): def test_response_csv(self):
users = fetch_course_session_users([COURSE_TEST_ID]) users = fetch_course_session_users([COURSE_TEST_ID])
@ -42,17 +42,17 @@ class EdoniqUserExportTestCase(TestCase):
user_data = [ user_data = [
[ [
user.user.id, str(user.id),
user.user.first_name, user.first_name,
user.user.last_name, user.last_name,
"m", "m",
user.user.language, user.language,
user.user.email, user.email,
user.user.additional_json_data.get("Geburtsdatum", ""), user.additional_json_data.get("Geburtsdatum", ""),
"Lernende", "Lernende",
user.user.additional_json_data.get("Firmenname", ""), user.additional_json_data.get("Firmenname", ""),
user.user.additional_json_data.get("Lehrvertragsnummer", ""), user.additional_json_data.get("Lehrvertragsnummer", ""),
user.course_session.import_id, user.coursesessionuser_set.first().course_session.import_id,
"", "",
] ]
for user in users for user in users

3
server/vbv_lernwelt/edoniq_test/views.py
View File

@ -26,8 +26,7 @@ def export_trainers(request):
def fetch_course_session_users(courses: List[int], role=CourseSessionUser.Role.MEMBER): def fetch_course_session_users(courses: List[int], role=CourseSessionUser.Role.MEMBER):
# if a user is in multiple courses, he should be exported multiple times # if users should be exported per course session, remove the distinct() call
# todo: check if this is the case otherwise use .distinct("user")
return ( return (
User.objects.filter( User.objects.filter(
coursesessionuser__course_session__course__id__in=courses, coursesessionuser__course_session__course__id__in=courses,