BC-4783 Migrate GET endpoints of school API

src/components/organisms/administration/GeneralSettings.unit.js

@@ -6,49 +6,45 @@ import EnvConfigModule from "@/store/env-config";
 import AuthModule from "@/store/auth";
 
 const school = {
-	_id: { $oid: "5f2987e020834114b8efd6f8" },
+	id: "5f2987e020834114b8efd6f8",
 	name: "Paul-Gerhardt-Gymnasium",
-	federalState: { $oid: "0000b186816abba584714c53" },
+	federalState: {
+		id: "0000b186816abba584714c53",
+		counties: [
+			{
+				id: "5fa55eb53f472a2d986c8812",
+				antaresKey: "BRB",
+				countyId: 12051,
+				name: "Brandenburg an der Havel",
+			},
+			{
+				id: "5fa55eb53f472a2d986c8813",
+				antaresKey: "CB",
+				countyId: 12052,
+				name: "Cottbus",
+			},
+		],
+		name: "Brandenburg",
+		abbreviation: "BB",
+	},
 	county: {
+		id: "5fa55eb53f472a2d986c8812",
 		antaresKey: "BRB",
-		_id: { $oid: "5fa55eb53f472a2d986c8812" },
 		countyId: 12051,
 		name: "Brandenburg an der Havel",
 	},
-	systems: [{ $oid: "0000d186816abba584714c90" }],
 	updatedAt: { $date: "2020-07-27T08:21:14.719Z" },
 	createdAt: { $date: "2017-01-01T00:06:37.148Z" },
 	currentYear: {
-		_id: { $oid: "5ebd6dc14a431f75ec9a3e77" },
+		id: "5ebd6dc14a431f75ec9a3e77",
 		name: "2021/22",
 		startDate: "2021-08-01T00:00:00.000Z",
 		endDate: "2022-07-31T00:00:00.000Z",
 	},
 	purpose: "demo",
-	enableStudentTeamCreation: false,
 	officialSchoolNumber: "123",
 };
 
-const federalState = {
-	_id: "0000b186816abba584714c53",
-	counties: [
-		{
-			antaresKey: "BRB",
-			_id: "5fa55eb53f472a2d986c8812",
-			countyId: 12051,
-			name: "Brandenburg an der Havel",
-		},
-		{
-			antaresKey: "CB",
-			_id: "5fa55eb53f472a2d986c8813",
-			countyId: 12052,
-			name: "Cottbus",
-		},
-	],
-	name: "Brandenburg",
-	abbreviation: "BB",
-};
-
 const syncedSystem = [
 	{
 		_id: "0000d186816abba584714c90",
@@ -112,8 +108,8 @@ const mockData = {
 			},
 		},
 		county: {
+			id: "5fa55eb53f472a2d986c8813",
 			antaresKey: "CB",
-			_id: "5fa55eb53f472a2d986c8813",
 			countyId: 12052,
 			name: "Cottbus",
 		},
@@ -131,8 +127,6 @@ describe("GeneralSettings", () => {
 		});
 
 		schoolsModule.setSchool(school);
-		schoolsModule.setFederalState(federalState);
-		schoolsModule.setSystems(syncedSystem);
 
 		envConfigModule.setEnvs({
 			I18N__AVAILABLE_LANGUAGES: "de,en,es",
@@ -178,50 +172,42 @@ describe("GeneralSettings", () => {
 		});
 
 		it("should not be possible to edit the school name if the school is synced", async () => {
+			schoolsModule.setSystems(syncedSystem);
 			const wrapper = mount(GeneralSettings, {
 				...createComponentMocks({
 					i18n: true,
 					store: generateMockStore,
 					vuetify: true,
 				}),
 			});
-			await wrapper.setData(mockData);
 
 			const ele = wrapper.find(searchStrings.schoolName);
 			expect(ele.vm.disabled).toBeTruthy();
 		});
 
 		it("should be possible to edit the school name if the school is not synced", async () => {
+			schoolsModule.setSystems(unsyncedSystem);
 			const wrapper = mount(GeneralSettings, {
 				...createComponentMocks({
 					i18n: true,
 					store: generateMockStore,
 					vuetify: true,
 				}),
 			});
-			const localMockData = {
-				localSchool: {
-					...mockData.localSchool,
-					systems: [{ $oid: unsyncedSystem[0]._id }],
-				},
-			};
-			schoolsModule.setSystems(unsyncedSystem);
-			await wrapper.setData(localMockData);
 
 			const ele = wrapper.find(searchStrings.schoolName);
 			expect(ele.vm.disabled).toBeFalsy();
 		});
 
 		it("should be possible to edit the school name if the school is not attached to a system", async () => {
+			schoolsModule.setSystems([]);
 			const wrapper = mount(GeneralSettings, {
 				...createComponentMocks({
 					i18n: true,
 					store: generateMockStore,
 					vuetify: true,
 				}),
 			});
-			schoolsModule.setSystems([]);
-			await wrapper.setData(mockData);
 
 			const ele = wrapper.find(searchStrings.schoolName);
 			expect(ele.vm.disabled).toBeFalsy();

src/components/organisms/administration/GeneralSettings.vue

@@ -55,7 +55,7 @@
 					"
 					:items="federalState.counties"
 					item-text="name"
-					item-value="_id"
+					item-value="id"
 					return-object
 					dense
 					:disabled="!!localSchool.county"
@@ -283,9 +283,9 @@ export default {
 			if (
 				!this.school.county &&
 				this.localSchool.county &&
-				this.localSchool.county._id
+				this.localSchool.county.id
 			) {
-				updatedSchool.county = this.localSchool.county._id;
+				updatedSchool.county = this.localSchool.county.id;
 			}
 
 			updatedSchool.logo_dataUrl = this.logoFile

src/pages/administration/ClassOverview.page.unit.ts

@@ -61,7 +61,6 @@ describe("ClassOverview", () => {
 						name: "2023/24",
 					} as Year,
 					lastYear: {} as Year,
-					defaultYear: {} as Year,
 				},
 			} as unknown as School,
 			...getters,

src/pages/administration/SchoolSettings.page.unit.ts

@@ -24,20 +24,18 @@ describe("SchoolSettingsPage", () => {
 	let schoolsModule: jest.Mocked<SchoolsModule>;
 
 	const mockFederalState: FederalState = {
-		_id: "00001234597947823",
+		id: "00001234597947823",
 		counties: [
 			{
-				antaresKey: "BRB",
-				_id: "00001234597998793",
 				id: "00001234597998793",
-				countyId: "12051",
+				antaresKey: "BRB",
+				countyId: 12051,
 				name: "Brandenburg an der Havel",
 			},
 			{
-				antaresKey: "CB",
-				_id: "00001234597913216",
 				id: "00001234597913216",
-				countyId: "12052",
+				antaresKey: "CB",
+				countyId: 12052,
 				name: "Cottbus",
 			},
 		],
@@ -62,7 +60,7 @@ describe("SchoolSettingsPage", () => {
 			getFederalState: mockFederalState,
 			getSystems: mockSystems,
 			getCurrentYear: {
-				_id: "123",
+				id: "123",
 				name: "School Year 3000",
 				startDate: "",
 				endDate: "",
@@ -181,12 +179,10 @@ describe("SchoolSettingsPage", () => {
 
 	it("should load needed data from server", async () => {
 		const fetchSystemsSpy = jest.spyOn(schoolsModule, "fetchSystems");
-		const fetchFederalStateSpy = jest.spyOn(schoolsModule, "fetchFederalState");
 
 		const wrapper = setup();
 		await wrapper.vm.$nextTick();
 
 		expect(fetchSystemsSpy).toHaveBeenCalled();
-		expect(fetchFederalStateSpy).toHaveBeenCalled();
 	});
 });

src/pages/administration/SchoolSettings.page.vue

@@ -235,20 +235,18 @@ export default defineComponent({
 		]);
 
 		const school: ComputedRef<School> = computed(() => schoolsModule.getSchool);
+
 		watch(
 			school,
 			(newSchool, oldSchool) => {
-				// fetch school year and systems when the school is loaded
+				// fetch systems when the school is loaded
 				// if the school object gets a new reference (e.g. after updating it) do not reload the year or systems
 				if (
-					!schoolsModule.getFederalState ||
-					!schoolsModule.getFederalState._id ||
 					!schoolsModule.systems ||
 					!schoolsModule.systems.length ||
 					(newSchool && newSchool.id && (!oldSchool || !oldSchool.id))
 				) {
 					schoolsModule.fetchSystems();
-					schoolsModule.fetchFederalState();
 				}
 			},
 			{ immediate: true }

src/pages/administration/migration.unit.ts

@@ -42,27 +42,27 @@ const getWrapperShallow: any = (props: object, options?: object) => {
 };
 
 const schoolMock = {
-	_id: "5f2987e020834114b8efd6f8",
+	id: "5f2987e020834114b8efd6f8",
 	name: "Schule_100000",
 	fileStorageType: "awsS3",
-	federalState: "0000b186816abba584714c53",
+	federalState: {
+		id: "0000b186816abba584714c53",
+		counties: [],
+		name: "",
+		abbreviation: "",
+		logoUrl: "",
+	},
 	logo_name: "Schule_logo",
 	county: {
+		id: "5fa55eb53f472a2d986c8812",
 		antaresKey: "BRB",
-		_id: "5fa55eb53f472a2d986c8812",
-		countyId: "12051",
+		countyId: 12051,
 		name: "Brandenburg an der Havel",
-		id: "5fa55eb53f472a2d986c8812",
 	},
-	systems: [
-		"0000d186816abba584714c91",
-		"0000d186816abba584714c90",
-		"6204fb6dcd5e9eb7240bc93f",
-	],
 	updatedAt: "2022-02-10T11:56:22.817Z",
 	createdAt: "2017-01-01T00:06:37.148Z",
 	currentYear: {
-		_id: "5ebd6dc14a431f75ec9a3e77",
+		id: "5ebd6dc14a431f75ec9a3e77",
 		name: "2021/22",
 		startDate: "2021-08-01T00:00:00.000Z",
 		endDate: "2022-07-31T00:00:00.000Z",
@@ -75,62 +75,49 @@ const schoolMock = {
 		ldapUniventionMigrationSchool: false,
 		showOutdatedUsers: false,
 		enableLdapSyncDuringMigration: false,
+		isTeamCreationByStudentsEnabled: false,
 		nextcloud: false,
 		oauthProvisioningEnabled: false,
 	},
-	enableStudentTeamCreation: false,
 	permissions: { teacher: { STUDENT_LIST: true } },
 	officialSchoolNumber: "100000",
-	documentBaseDirType: "",
-	inMaintenanceSince: "2022-02-10T11:55:50.344Z",
 	inUserMigration: true,
-	ldapSchoolIdentifier: "100000",
 	inMaintenance: true,
-	documentBaseDir: "https://s3.hidrive.strato.com/cloud-instances/default/",
 	isExternal: true,
-	id: "5f2987e020834114b8efd6f8",
 	years: {
 		schoolYears: [
 			{
-				_id: "5ebd6dc14a431f75ec9a3e77",
+				id: "5ebd6dc14a431f75ec9a3e77",
 				name: "2021/22",
 				startDate: "2021-08-01T00:00:00.000Z",
 				endDate: "2022-07-31T00:00:00.000Z",
 			},
 			{
-				_id: "5ebd6dc14a431f75ec9a3e78",
+				id: "5ebd6dc14a431f75ec9a3e78",
 				name: "2022/23",
 				startDate: "2022-08-01T00:00:00.000Z",
 				endDate: "2023-07-31T00:00:00.000Z",
 			},
 		],
 		activeYear: {
-			_id: "5ebd6dc14a431f75ec9a3e77",
-			name: "2021/22",
-			startDate: "2021-08-01T00:00:00.000Z",
-			endDate: "2022-07-31T00:00:00.000Z",
-		},
-		defaultYear: {
-			_id: "5ebd6dc14a431f75ec9a3e77",
+			id: "5ebd6dc14a431f75ec9a3e77",
 			name: "2021/22",
 			startDate: "2021-08-01T00:00:00.000Z",
 			endDate: "2022-07-31T00:00:00.000Z",
 		},
 		nextYear: {
-			_id: "5ebd6dc14a431f75ec9a3e78",
+			id: "5ebd6dc14a431f75ec9a3e78",
 			name: "2022/23",
 			startDate: "2022-08-01T00:00:00.000Z",
 			endDate: "2023-07-31T00:00:00.000Z",
 		},
 		lastYear: {
-			_id: "5d44297075e1502c27e405e2",
+			id: "5d44297075e1502c27e405e2",
 			name: "2020/21",
 			startDate: "2020-08-01T00:00:00.000Z",
 			endDate: "2021-07-31T00:00:00.000Z",
 		},
 	},
-	isTeamCreationByStudentsEnabled: false,
-	enableMigrationStart: false,
 };
 
 window.scrollTo = jest.fn();