Merge branch 'main' of github.com:hpi-schul-cloud/schulcloud-server i…

…nto BC-6854-basic-load-tests
hpi-schul-cloud · Jul 9, 2024 · ffe7077 · ffe7077
2 parents 02f5c47 + 8389184
commit ffe7077
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 15 deletions.
diff --git a/backup/setup/classes.json b/backup/setup/classes.json
@@ -150,6 +150,36 @@
 			"$date": "2023-07-31T10:01:29.382Z"
 		},
 		"__v": 0
+	},
+		{
+		"_id": {
+			"$oid": "668c0a7b46c42b79f6034ff0"
+		},
+		"userIds": [
+			{
+				"$oid": "5fa2cccab229544f2c696917"
+			}
+		],
+		"teacherIds": [
+			{
+				"$oid": "5fa2c71bb229544f2c6966d9"
+			}
+		],
+		"schoolId": {
+			"$oid": "5fa2c5ccb229544f2c69666c"
+		},
+		"name": "b",
+		"gradeLevel": 9,
+		"year": {
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
+		},
+		"createdAt": {
+			"$date": "2024-07-08T10:00:26.985Z"
+		},
+		"updatedAt": {
+			"$date": "2024-07-08T10:01:29.382Z"
+		},
+		"__v": 0
 	},
 	{
 		"_id": {

diff --git a/backup/setup/schools.json b/backup/setup/schools.json
@@ -25,7 +25,7 @@
 		"__v": 0,
 		"fileStorageType": "awsS3",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"permissions": {
@@ -53,7 +53,7 @@
 		},
 		"__v": 0,
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"permissions": {
@@ -89,7 +89,7 @@
 		},
 		"__v": 0,
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"features": [
@@ -131,7 +131,7 @@
 		"__v": 0,
 		"fileStorageType": "awsS3",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "expert",
         "features" : [
@@ -167,7 +167,7 @@
 		},
 		"fileStorageType": "awsS3",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"createdAt": {
 			"$date": "2020-11-04T15:16:28.827Z"
@@ -216,7 +216,7 @@
 		},
 		"fileStorageType": "awsS3",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"createdAt": {
 			"$date": "2020-11-04T21:11:14.312Z"
@@ -258,7 +258,7 @@
 		"fileStorageType": "awsS3",
 		"timezone": "America/Belem",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"createdAt": {
 			"$date": "2020-11-04T21:38:05.110Z"
@@ -303,7 +303,7 @@
 		},
 		"fileStorageType": "awsS3",
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"createdAt": {
 			"$date": "2020-12-08T16:58:36.527Z"
@@ -370,7 +370,7 @@
 		},
 		"__v": 0,
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"features": [
@@ -412,7 +412,7 @@
 		},
 		"__v": 0,
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"features": [
@@ -454,7 +454,7 @@
 		},
 		"__v": 0,
 		"currentYear": {
-			"$oid": "5ebd6dc14a431f75ec9a3e79"
+			"$oid": "5ebd6dc14a431f75ec9a3e7a"
 		},
 		"purpose": "demo",
 		"features": [

diff --git a/test/services/sync/strategies/LDAPSyncerConsumer.integration.test.js b/test/services/sync/strategies/LDAPSyncerConsumer.integration.test.js
@@ -69,10 +69,10 @@ describe('Ldap Syncer Consumer Integration', () => {
 		it('should create school by the data', async () => {
 			const schoolName = 'test school';
 			const currentYear = {
-				_id: '5ebd6dc14a431f75ec9a3e77',
-				name: '2023/24',
-				startDate: '2023-08-01T00:00:00.000Z',
-				endDate: '2024-07-31T00:00:00.000Z',
+				_id: '5ebd6dc14a431f75ec9a3e7a',
+				name: '2024/25',
+				startDate: '2024-08-01T00:00:00.000Z',
+				endDate: '2025-07-31T00:00:00.000Z',
 			};
 			const states = await app.service('federalStates').find({ query: { abbreviation: 'NI' } });
 			const federalStateId = states.data[0]._id;