unit tests

hpi-schul-cloud · Nov 1, 2023 · 417509c · 417509c
1 parent 670ac36
commit 417509c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/apps/server/src/modules/group/uc/group.uc.spec.ts b/apps/server/src/modules/group/uc/group.uc.spec.ts
@@ -215,7 +215,8 @@ describe('GroupUc', () => {
 
 					throw new Error();
 				});
-				schoolYearService.findById.mockResolvedValue(schoolYear);
+				schoolYearService.findById.mockResolvedValueOnce(schoolYear);
+				schoolYearService.findById.mockResolvedValueOnce(nextSchoolYear);
 				schoolYearService.getCurrentSchoolYear.mockResolvedValue(schoolYear);
 
 				return {
@@ -227,6 +228,7 @@ describe('GroupUc', () => {
 					groupWithSystem,
 					system,
 					schoolYear,
+					nextSchoolYear,
 				};
 			};
 
@@ -247,12 +249,13 @@ describe('GroupUc', () => {
 
 			describe('when no pagination is given', () => {
 				it('should return all classes sorted by name', async () => {
-					const { teacherUser, clazz, group, groupWithSystem, system, schoolYear } = setup();
+					const { teacherUser, clazz, successorClass, group, groupWithSystem, system, schoolYear, nextSchoolYear } =
+						setup();
 
 					const result: Page<ClassInfoDto> = await uc.findAllClassesForSchool(
 						teacherUser.id,
 						teacherUser.school.id,
-						SchoolYearQueryType.CURRENT_YEAR
+						undefined
 					);
 
 					expect(result).toEqual<Page<ClassInfoDto>>({
@@ -267,6 +270,18 @@ describe('GroupUc', () => {
 								isUpgradable: false,
 								studentCount: 2,
 							},
+							{
+								id: successorClass.id,
+								name: successorClass.gradeLevel
+									? `${successorClass.gradeLevel}${successorClass.name}`
+									: successorClass.name,
+								externalSourceName: successorClass.source,
+								type: ClassRootType.CLASS,
+								teachers: [teacherUser.lastName],
+								schoolYear: nextSchoolYear.name,
+								isUpgradable: false,
+								studentCount: 2,
+							},
 							{
 								id: group.id,
 								name: group.name,
@@ -283,7 +298,7 @@ describe('GroupUc', () => {
 								studentCount: 1,
 							},
 						],
-						total: 3,
+						total: 4,
 					});
 				});
 			});
@@ -366,7 +381,7 @@ describe('GroupUc', () => {
 
 			describe('when querying for classes from next school year', () => {
 				it('should only return classes from next school year', async () => {
-					const { teacherUser, successorClass } = setup();
+					const { teacherUser, successorClass, nextSchoolYear } = setup();
 
 					const result: Page<ClassInfoDto> = await uc.findAllClassesForSchool(
 						teacherUser.id,
@@ -378,10 +393,15 @@ describe('GroupUc', () => {
 						data: [
 							{
 								id: successorClass.id,
-								name: successorClass.name,
+								name: successorClass.gradeLevel
+									? `${successorClass.gradeLevel}${successorClass.name}`
+									: successorClass.name,
+								externalSourceName: successorClass.source,
 								type: ClassRootType.CLASS,
 								teachers: [teacherUser.lastName],
-								studentCount: 0,
+								schoolYear: nextSchoolYear.name,
+								isUpgradable: false,
+								studentCount: 2,
 							},
 						],
 						total: 1,
@@ -396,7 +416,7 @@ describe('GroupUc', () => {
 					const result: Page<ClassInfoDto> = await uc.findAllClassesForSchool(
 						teacherUser.id,
 						teacherUser.school.id,
-						SchoolYearQueryType.NEXT_YEAR
+						SchoolYearQueryType.PREVIOUS_YEARS
 					);
 
 					expect(result).toEqual<Page<ClassInfoDto>>({

diff --git a/apps/server/src/modules/group/uc/group.uc.ts b/apps/server/src/modules/group/uc/group.uc.ts
@@ -67,7 +67,7 @@ export class GroupUc {
 
 		const classInfosFromClasses = await this.findClassesForSchool(schoolId, schoolYearQueryType);
 
-		if (schoolYearQueryType === SchoolYearQueryType.CURRENT_YEAR) {
+		if (schoolYearQueryType === SchoolYearQueryType.CURRENT_YEAR || schoolYearQueryType === undefined) {
 			classInfosFromGroups = await this.findGroupsOfTypeClassForSchool(schoolId);
 		}