chore: adds new user that is student and mentor




server/vbv_lernwelt/core/constants.py

@@ -26,6 +26,7 @@ TEST_STUDENT2_USER_ID = "19c40d94-15cc-4198-aaad-ef707c4b0900"
 TEST_STUDENT3_USER_ID = "bcf94dba-53bc-474b-a22d-e4af39aa042b"
 TEST_MENTOR1_USER_ID = "d1f5f5a9-5b0a-4e1a-9e1a-9e9b5b5e1b1b"
 TEST_STUDENT1_VV_USER_ID = "5ff59857-8de5-415e-a387-4449f9a0337a"
+TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID = "7e8ebf0b-e6e2-4022-88f4-6e663ba0a9db"
 
 TEST_COURSE_SESSION_BERN_ID = -1
 TEST_COURSE_SESSION_ZURICH_ID = -2

server/vbv_lernwelt/core/create_default_users.py

@@ -19,6 +19,7 @@ from vbv_lernwelt.core.constants import (
     TEST_SUPERVISOR1_USER_ID,
     TEST_TRAINER1_USER_ID,
     TEST_TRAINER2_USER_ID,
+    TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
 )
 from vbv_lernwelt.core.models import User
 
@@ -372,6 +373,14 @@ def create_default_users(default_password="test", set_avatar=False):
         language="de",
         avatar_image="uk1.patrizia.huggel.jpg",
     )
+    _create_student_user(
+        id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
+        email="test-student-and-mentor2@example.com",
+        first_name="Robert",
+        last_name="Student-plus-Mentor",
+        password=default_password,
+        language="de",
+    )
 
 
 def _get_or_create_user(user_model, *args, **kwargs):

server/vbv_lernwelt/core/management/commands/cypress_reset.py

@@ -13,6 +13,7 @@ from vbv_lernwelt.core.constants import (
     TEST_STUDENT2_USER_ID,
     TEST_STUDENT3_USER_ID,
     TEST_TRAINER1_USER_ID,
+    TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
 )
 from vbv_lernwelt.core.models import Organisation, User
 from vbv_lernwelt.course.consts import (
@@ -362,12 +363,32 @@ def command(
             course=vv_course,
             mentor=User.objects.get(id=TEST_MENTOR1_USER_ID),
         )
+
         vv_mentor.participants.add(
             CourseSessionUser.objects.get(
                 user__id=TEST_STUDENT1_VV_USER_ID, course_session=vv_course_session
             )
         )
 
+        vv_mentor.participants.add(
+            CourseSessionUser.objec.get(
+                user__id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
+                course_session=vv_course_session,
+            )
+        )
+
+        vv_student_and_mentor = LearningMentor.objects.create(
+            mentor=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
+            course=vv_course,
+        )
+
+        vv_student_and_mentor.participants.add(
+            CourseSessionUser.objects.get(
+                user__id=TEST_STUDENT1_VV_USER_ID,
+                course_session=vv_course_session,
+            )
+        )
+
     course = Course.objects.get(id=COURSE_TEST_ID)
     course.configuration.enable_circle_documents = enable_circle_documents
     course.configuration.save()

server/vbv_lernwelt/course/management/commands/create_default_courses.py

@@ -45,7 +45,10 @@ from vbv_lernwelt.competence.create_vv_new_competence_profile import (
     create_vv_new_competence_profile,
 )
 from vbv_lernwelt.competence.models import PerformanceCriteria
-from vbv_lernwelt.core.constants import TEST_MENTOR1_USER_ID
+from vbv_lernwelt.core.constants import (
+    TEST_MENTOR1_USER_ID,
+    TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
+)
 from vbv_lernwelt.core.create_default_users import default_users
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.consts import (
@@ -234,7 +237,7 @@ def create_versicherungsvermittlerin_course(
                 user=User.objects.get(username=user_data["email"]),
             )
 
-        csu = CourseSessionUser.objects.create(
+        student_1_csu = CourseSessionUser.objects.create(
             course_session=cs,
             user=User.objects.get(username="student-vv@eiger-versicherungen.ch"),
         )
@@ -257,12 +260,29 @@ def create_versicherungsvermittlerin_course(
             role=CourseSessionUser.Role.EXPERT,
         )
 
-        lemme = LearningMentor.objects.create(
+        mentor_and_student_2_learning_csu = CourseSessionUser.objects.create(
+            course_session=cs,
+            user=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        # TEST_MENTOR1_USER_ID is only mentor
+        just_mentor = LearningMentor.objects.create(
             mentor=User.objects.get(id=TEST_MENTOR1_USER_ID),
             course=cs.course,
         )
 
-        lemme.participants.add(csu)
+        just_mentor.participants.add(student_1_csu)
+        just_mentor.participants.add(mentor_and_student_2_learning_csu)
+
+        # TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID is both student and mentor
+
+        mentor_and_student_learning_mentor = LearningMentor.objects.create(
+            mentor=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
+            course=cs.course,
+        )
+
+        mentor_and_student_learning_mentor.participants.add(student_1_csu)
 
         for admin_email in ADMIN_EMAILS:
             CourseSessionUser.objects.create(