From f24fd040f982a10eb3ce2ed0458f2c1de3aac38e Mon Sep 17 00:00:00 2001 From: Elia Bieri Date: Tue, 17 Sep 2024 11:49:07 +0200 Subject: [PATCH] Add test data --- client/src/services/dashboard.ts | 1 - server/vbv_lernwelt/core/constants.py | 3 +- .../vbv_lernwelt/core/create_default_users.py | 8 ++-- .../commands/reset_iterativ_test_sessions.py | 2 +- .../commands/create_default_courses.py | 45 ++++++++++++++++++- .../0020_alter_checkoutinformation_user.py | 2 +- 6 files changed, 52 insertions(+), 9 deletions(-) diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts index 7a0c7d25..91b9de35 100644 --- a/client/src/services/dashboard.ts +++ b/client/src/services/dashboard.ts @@ -21,7 +21,6 @@ import type { XlsExportRequestData, XlsExportResponseData, } from "@/types"; -import type dayjs from "dayjs"; export type DashboardPersonRoleType = | "SUPERVISOR" diff --git a/server/vbv_lernwelt/core/constants.py b/server/vbv_lernwelt/core/constants.py index 2f0b9722..bfc79f4d 100644 --- a/server/vbv_lernwelt/core/constants.py +++ b/server/vbv_lernwelt/core/constants.py @@ -26,9 +26,10 @@ 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_BERUFSBILDNER1_USER_ID = "bb83dde0-27e7-4859-8acb-a323025d712c" -TEST_LERNBEGLEITER1_USER_ID = "ffeedde0-27e7-ff59-8aff-a3230ffd712c" +TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID = "ffeedde0-27e7-ff59-8aff-a3230ffd712c" TEST_STUDENT1_VV_USER_ID = "5ff59857-8de5-415e-a387-4449f9a0337a" TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID = "7e8ebf0b-e6e2-4022-88f4-6e663ba0a9db" +TEST_STUDENT3_VV_USER_ID = "ba8ebf0b-9de5-215e-a387-4449f9aa337b" TEST_USER_EMPTY_ID = "daecbabe-4ab9-4edf-a71f-4119042ccb02" TEST_USER_DATATRANS_HANNA_ID = "6bec1a0d-f852-47aa-a4de-072df6e07ad1" diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py index 58d547a4..f7f60a2a 100644 --- a/server/vbv_lernwelt/core/create_default_users.py +++ b/server/vbv_lernwelt/core/create_default_users.py @@ -6,14 +6,15 @@ from environs import Env from vbv_lernwelt.core.constants import ( ADMIN_USER_ID, + TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID, TEST_BERUFSBILDNER1_USER_ID, - TEST_LERNBEGLEITER1_USER_ID, TEST_MENTOR1_USER_ID, TEST_STUDENT1_USER_ID, TEST_STUDENT1_VV_USER_ID, TEST_STUDENT2_USER_ID, TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID, TEST_STUDENT3_USER_ID, + TEST_STUDENT3_VV_USER_ID, TEST_SUPERVISOR1_USER_ID, TEST_TRAINER1_USER_ID, TEST_TRAINER2_USER_ID, @@ -256,6 +257,7 @@ def create_default_users(default_password="test", set_avatar=False): last_name="Vollgas", ) _create_student_user( + id=TEST_STUDENT3_VV_USER_ID, email="patrizia.huggel@eiger-versicherungen.ch", first_name="Patrizia", last_name="Huggel", @@ -421,10 +423,10 @@ def create_default_users(default_password="test", set_avatar=False): avatar_image="uk1.patrizia.huggel.jpg", ) _create_user( - _id=TEST_LERNBEGLEITER1_USER_ID, + _id=TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID, email="test-lernbegleiter1@example.com", first_name="Bruno", - last_name="Banani-Lernbegleiter", + last_name="Banani-Ausbildungsverantwortlicher", password=default_password, language="de", avatar_image="uk1.patrizia.huggel.jpg", diff --git a/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py b/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py index 6dff700a..33c2fe31 100644 --- a/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py +++ b/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py @@ -108,7 +108,7 @@ def delete_cs_data(cs: CourseSession): CourseSessionEdoniqTest.objects.filter(course_session=cs).delete() CourseSessionUser.objects.filter(course_session=cs).delete() - AgentParticipantRelation.objects.filter(course_session=cs).delete() + AgentParticipantRelation.objects.filter(participant__course_session=cs).delete() else: logger.info("no_course_session_found", import_id=cs.import_id) diff --git a/server/vbv_lernwelt/course/management/commands/create_default_courses.py b/server/vbv_lernwelt/course/management/commands/create_default_courses.py index e9b4d51f..f82f2234 100644 --- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py +++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py @@ -45,7 +45,12 @@ 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_STUDENT2_VV_AND_VV_MENTOR_USER_ID +from vbv_lernwelt.core.constants import ( + TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID, + TEST_STUDENT1_VV_USER_ID, + TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID, + TEST_STUDENT3_VV_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 ( @@ -92,6 +97,14 @@ from vbv_lernwelt.importer.services import ( import_students_from_excel, import_trainers_from_excel_for_training, ) +from vbv_lernwelt.learning_mentor.models import ( + AgentParticipantRelation, + AgentParticipantRoleType, +) +from vbv_lernwelt.learnpath.consts import ( + COURSE_PROFILE_NICHTLEBEN_CODE, + COURSE_PROFILE_NICHTLEBEN_ID, +) from vbv_lernwelt.learnpath.create_vv_new_learning_path import ( create_vv_motorfahrzeug_pruefung_learning_path, create_vv_new_learning_path, @@ -100,6 +113,7 @@ from vbv_lernwelt.learnpath.create_vv_new_learning_path import ( from vbv_lernwelt.learnpath.creators import assign_circles_to_profiles from vbv_lernwelt.learnpath.models import ( Circle, + CourseProfile, LearningContent, LearningContentAssignment, LearningContentAttendanceCourse, @@ -113,6 +127,7 @@ from vbv_lernwelt.media_files.create_default_images import create_default_images from vbv_lernwelt.media_library.create_default_media_library import ( create_default_media_library, ) +from vbv_lernwelt.shop.tests.factories import CheckoutInformationFactory ADMIN_EMAILS = ["info@iterativ.ch", "admin"] @@ -239,13 +254,22 @@ def create_versicherungsvermittlerin_course( student_1_csu = CourseSessionUser.objects.create( course_session=cs, - user=User.objects.get(username="student-vv@eiger-versicherungen.ch"), + user=User.objects.get(id=TEST_STUDENT1_VV_USER_ID), ) 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, ) + student_3_csu = CourseSessionUser.objects.create( + course_session=cs, + user=User.objects.get(id=TEST_STUDENT3_VV_USER_ID), + chosen_profile=CourseProfile.objects.get_or_create( + id=COURSE_PROFILE_NICHTLEBEN_ID, + code=COURSE_PROFILE_NICHTLEBEN_CODE, + order=3, + )[0], + ) CourseSessionUser.objects.create( course_session=cs, @@ -270,6 +294,23 @@ def create_versicherungsvermittlerin_course( course_session=cs, user=User.objects.get(email=admin_email), ) + # Ausbildungsverantwortlicher + AgentParticipantRelation.objects.create( + agent=User.objects.get(id=TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID), + participant=student_1_csu, + role=AgentParticipantRoleType.BERUFSBILDNER.value, + ) + AgentParticipantRelation.objects.create( + agent=User.objects.get(id=TEST_AUSBILDUNGSVERANTWORTLICHER1_USER_ID), + participant=student_3_csu, + role=AgentParticipantRoleType.BERUFSBILDNER.value, + ) + CheckoutInformationFactory( + user=User.objects.get(id=TEST_STUDENT1_VV_USER_ID), + ) + CheckoutInformationFactory( + user=User.objects.get(id=TEST_STUDENT3_VV_USER_ID), + ) def create_versicherungsvermittlerin_pruefung_course( diff --git a/server/vbv_lernwelt/shop/migrations/0020_alter_checkoutinformation_user.py b/server/vbv_lernwelt/shop/migrations/0020_alter_checkoutinformation_user.py index 008bf864..ff270db8 100644 --- a/server/vbv_lernwelt/shop/migrations/0020_alter_checkoutinformation_user.py +++ b/server/vbv_lernwelt/shop/migrations/0020_alter_checkoutinformation_user.py @@ -1,8 +1,8 @@ # Generated by Django 4.2.13 on 2024-09-12 13:40 +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration):