N21-2293 Full sync warning bug fix

hpi-schul-cloud · Jan 13, 2025 · eb6da01 · eb6da01
1 parent 74ff042
commit eb6da01
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 6 deletions.
diff --git a/src/modules/feature/course-sync/StartExistingCourseSyncDialog.unit.ts b/src/modules/feature/course-sync/StartExistingCourseSyncDialog.unit.ts
@@ -1,5 +1,5 @@
 import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
-import { RoleName } from "@/serverApi/v3";
+import { MeResponse, RoleName } from "@/serverApi/v3";
 import AuthModule from "@/store/auth";
 import NotifierModule from "@/store/notifier";
 import { AUTH_MODULE_KEY, NOTIFIER_MODULE_KEY } from "@/utils/inject";
@@ -28,13 +28,14 @@ describe("StartExistingCourseSyncDialog", () => {
 			isOpen: true,
 			courseId: "courseId",
 			courseName: "courseName",
-		}
+			courseTeachers: ["firstName lastName"],
+		},
+		admin?: MeResponse
 	) => {
 		const me = meResponseFactory.build();
-
 		const notifierModule = createModuleMocks(NotifierModule);
 		const authModule = createModuleMocks(AuthModule, {
-			getMe: me,
+			getMe: admin ?? me,
 		});
 
 		const wrapper = mount(StartExistingCourseSyncDialog, {
@@ -334,4 +335,108 @@ describe("StartExistingCourseSyncDialog", () => {
 			);
 		});
 	});
+
+	describe("when the user is not part of the selected group and course teacher are part of group", () => {
+		const setup = async () => {
+			const { wrapper, notifierModule } = getWrapper(
+				{
+					isOpen: true,
+					courseId: "courseId",
+					courseName: "courseName",
+					courseTeachers: ["firstname lastname"],
+				},
+				meResponseFactory.build({
+					roles: [{ id: "0", name: RoleName.Administrator }],
+				})
+			);
+
+			const group = groupResponseFactory.build({
+				users: [
+					{
+						id: "otherUserId",
+						firstName: "firstname",
+						lastName: "lastname",
+						role: RoleName.Teacher,
+					},
+					{
+						id: "otherUserId1",
+						firstName: "firstname1",
+						lastName: "lastname1",
+						role: RoleName.Teacher,
+					},
+					{
+						id: "otherUserId2",
+						firstName: "firstname2",
+						lastName: "lastname2",
+						role: RoleName.Teacher,
+					},
+				],
+			});
+
+			wrapper.getComponent(GroupSelectionDialog).vm.$emit("confirm", group);
+			await nextTick();
+
+			return {
+				wrapper,
+				notifierModule,
+				group,
+			};
+		};
+
+		it("should display the correct warning in the confirmation dialog", async () => {
+			const { wrapper } = await setup();
+
+			const text = wrapper.find("[data-testid=no-teacher-warning-text]");
+
+			expect(text.text()).toEqual(
+				"feature-course-sync.StartExistingCourseSyncDialog.confirmation.userInGroupWarning"
+			);
+		});
+	});
+
+	describe("when the user is not part of the selected group and course teacher are not part of group", () => {
+		const setup = async () => {
+			const { wrapper, notifierModule } = getWrapper(
+				{
+					isOpen: true,
+					courseId: "courseId",
+					courseName: "courseName",
+					courseTeachers: ["Firstname Lastname", "another teacher"],
+				},
+				meResponseFactory.build({
+					roles: [{ id: "0", name: RoleName.Administrator }],
+				})
+			);
+
+			const group = groupResponseFactory.build({
+				users: [
+					{
+						id: "otherUserId",
+						firstName: "Firstname",
+						lastName: "Lastname",
+						role: RoleName.Teacher,
+					},
+				],
+			});
+
+			wrapper.getComponent(GroupSelectionDialog).vm.$emit("confirm", group);
+			await nextTick();
+
+			return {
+				wrapper,
+				notifierModule,
+				group,
+			};
+		};
+
+		it("should display the correct warning in the confirmation dialog", async () => {
+			const { wrapper } = await setup();
+
+			const text = wrapper.find("[data-testid=no-teacher-warning-text]");
+
+			expect(text.text()).toEqual(
+				"feature-course-sync.StartExistingCourseSyncDialog.confirmation.userNotInGroupWarning"
+			);
+		});
+	});
 });
diff --git a/src/modules/feature/course-sync/StartExistingCourseSyncDialog.vue b/src/modules/feature/course-sync/StartExistingCourseSyncDialog.vue
@@ -46,7 +46,12 @@
 
 <script setup lang="ts">
 import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
-import { GroupResponse, GroupUserResponse, MeResponse } from "@/serverApi/v3";
+import {
+	GroupResponse,
+	GroupUserResponse,
+	MeResponse,
+	RoleName,
+} from "@/serverApi/v3";
 import type AuthModule from "@/store/auth";
 import {
 	AUTH_MODULE_KEY,
@@ -69,6 +74,9 @@ const props = defineProps({
 	courseId: {
 		type: String,
 	},
+	courseTeachers: {
+		type: Array,
+	},
 });
 
 const isOpen: ModelRef<boolean> = defineModel("isOpen", {
@@ -98,9 +106,27 @@ const isUserInGroup = computed(() => {
 		return false;
 	}
 
-	return selectedGroup.value.users.some(
+	const isPartOfGroup: boolean = selectedGroup.value.users.some(
 		(user: GroupUserResponse) => user.id === me.user.id
 	);
+
+	const isAdmin: boolean = me.roles.some(
+		(role) => role.name === RoleName.Administrator
+	);
+
+	if (isAdmin && !isPartOfGroup) {
+		const allCourseTeacherPartOfGroup = props.courseTeachers?.every(
+			(teacher) => {
+				return selectedGroup.value?.users.some(
+					(user) => user.firstName + " " + user.lastName === teacher
+				);
+			}
+		);
+
+		return allCourseTeacherPartOfGroup;
+	} else {
+		return isPartOfGroup;
+	}
 });
 
 const onConfirmWarning = async () => {

diff --git a/src/pages/administration/RoomsOverview.page.vue b/src/pages/administration/RoomsOverview.page.vue
@@ -125,6 +125,7 @@
 			v-model:is-open="isCourseSyncDialogOpen"
 			:course-id="selectedItem?.id"
 			:course-name="selectedItem?.name"
+			:course-teachers="selectedItem?.teacherNames"
 			@success="onConfirmSynchronizeCourse"
 			data-testid="start-sync-dialog"
 		/>