requested changes WIP 3

hpi-schul-cloud · Apr 3, 2024 · d9caccb · d9caccb
1 parent c8e59f4
commit d9caccb
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 20 deletions.
diff --git a/apps/server/src/modules/group/controller/api-test/group.api.spec.ts b/apps/server/src/modules/group/controller/api-test/group.api.spec.ts
@@ -381,6 +381,8 @@ describe('Group (API)', () => {
 							},
 							expectGroup,
 						],
+						limit: 10,
+						skip: 0,
 						total: 2,
 					});
 				});
@@ -393,6 +395,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 1,
+						skip: 1,
 						total: 2,
 					});
 				});
@@ -405,6 +409,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});
@@ -419,6 +425,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});
@@ -429,7 +437,7 @@ describe('Group (API)', () => {
 					const response = await loggedInClient.get().query({ availableGroupsForCourseSync: true, skip: 1, limit: 1 });
 
 					expect(response.status).toEqual(HttpStatus.OK);
-					expect(response.body).toEqual({ data: [], total: 1 });
+					expect(response.body).toEqual({ data: [], limit: 1, skip: 1, total: 1 });
 				});
 
 				it('should return available groups according to name query', async () => {
@@ -440,6 +448,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});
@@ -538,6 +548,8 @@ describe('Group (API)', () => {
 							},
 							expectGroup,
 						],
+						limit: 10,
+						skip: 0,
 						total: 2,
 					});
 				});
@@ -550,6 +562,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 1,
+						skip: 1,
 						total: 2,
 					});
 				});
@@ -562,6 +576,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});
@@ -576,6 +592,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});
@@ -586,7 +604,7 @@ describe('Group (API)', () => {
 					const response = await loggedInClient.get().query({ availableGroupsForCourseSync: true, skip: 1, limit: 1 });
 
 					expect(response.status).toEqual(HttpStatus.OK);
-					expect(response.body).toEqual({ data: [], total: 1 });
+					expect(response.body).toEqual({ data: [], limit: 1, skip: 1, total: 1 });
 				});
 
 				it('should return all available groups according to name query', async () => {
@@ -597,6 +615,8 @@ describe('Group (API)', () => {
 					expect(response.status).toEqual(HttpStatus.OK);
 					expect(response.body).toEqual({
 						data: [expectGroup],
+						limit: 10,
+						skip: 0,
 						total: 1,
 					});
 				});

diff --git a/apps/server/src/modules/group/controller/group.controller.ts b/apps/server/src/modules/group/controller/group.controller.ts
@@ -93,7 +93,7 @@ export class GroupController {
 			params.availableGroupsForCourseSync,
 			params.nameQuery
 		);
-		const response: GroupListResponse = GroupResponseMapper.mapToGroupListResponse(groups);
+		const response: GroupListResponse = GroupResponseMapper.mapToGroupListResponse(groups, pagination);
 
 		return response;
 	}

diff --git a/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts b/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts
@@ -6,6 +6,7 @@ import {
 	ClassInfoSearchListResponse,
 	ExternalSourceResponse,
 	GroupListResponse,
+	GroupPaginationParams,
 	GroupResponse,
 	GroupTypeResponse,
 	GroupUserResponse,
@@ -82,12 +83,17 @@ export class GroupResponseMapper {
 		return mapped;
 	}
 
-	static mapToGroupListResponse(groups: Page<ResolvedGroupDto>): GroupListResponse {
-		const mapped: GroupResponse[] = groups.data.map(
+	static mapToGroupListResponse(groups: Page<ResolvedGroupDto>, pagination: GroupPaginationParams): GroupListResponse {
+		const groupResponseData: GroupResponse[] = groups.data.map(
 			(group: ResolvedGroupDto): GroupResponse => this.mapToGroupResponse(group)
 		);
 
-		const response: GroupListResponse = { data: mapped, total: groups.total };
+		const response: GroupListResponse = new GroupListResponse(
+			groupResponseData,
+			groups.total,
+			pagination.skip,
+			pagination.limit
+		); // { data: mapped, total: groups.total };
 
 		return response;
 	}

diff --git a/apps/server/src/modules/group/repo/group.repo.ts b/apps/server/src/modules/group/repo/group.repo.ts
@@ -205,16 +205,18 @@ export class GroupRepo extends BaseDomainObjectRepo<Group, GroupEntity> {
 			});
 		}
 
-		const mongoEntities = await this.em.aggregate(GroupEntity, pipeline);
+		const mongoEntitiesFacet = (await this.em.aggregate(GroupEntity, pipeline)) as [
+			{ total: [{ count: number }]; data: GroupEntity[] }
+		];
 
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
-		const total: number = mongoEntities[0]?.total[0]?.count ?? 0;
+		const total: number = mongoEntitiesFacet[0]?.total[0]?.count ?? 0;
 
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
-		const entities: GroupEntity[] = mongoEntities[0].data.map((entity: GroupEntity) => {
-			const { ...newGroupEntity } = entity;
-			return this.em.map(GroupEntity, newGroupEntity);
-		});
+		const entities: GroupEntity[] = mongoEntitiesFacet[0].data.map((entity: GroupEntity) =>
+			// const { ...newGroupEntity } = entity;
+			this.em.map(GroupEntity, entity)
+		);
 
 		const domainObjects: Group[] = entities.map((entity) => GroupDomainMapper.mapEntityToDo(entity));
 

diff --git a/apps/server/src/modules/group/uc/group.uc.spec.ts b/apps/server/src/modules/group/uc/group.uc.spec.ts
@@ -786,11 +786,11 @@ describe('GroupUc', () => {
 
 					await uc.findAllClasses(teacherUser.id, teacherUser.school.id);
 
-					expect(groupService.findGroupsBySchoolIdAndGroupTypes).toHaveBeenCalledWith<[School, GroupTypes[], number]>(
-						school,
-						[GroupTypes.CLASS, GroupTypes.COURSE, GroupTypes.OTHER],
-						0
-					);
+					expect(groupService.findGroupsBySchoolIdAndGroupTypes).toHaveBeenCalledWith<[School, GroupTypes[]]>(school, [
+						GroupTypes.CLASS,
+						GroupTypes.COURSE,
+						GroupTypes.OTHER,
+					]);
 				});
 			});
 

diff --git a/apps/server/src/modules/group/uc/group.uc.ts b/apps/server/src/modules/group/uc/group.uc.ts
@@ -228,8 +228,7 @@ export class GroupUc {
 	private async findGroupsForSchool(school: School): Promise<ClassInfoDto[]> {
 		const groups: Page<Group> = await this.groupService.findGroupsBySchoolIdAndGroupTypes(
 			school,
-			this.ALLOWED_GROUP_TYPES,
-			0
+			this.ALLOWED_GROUP_TYPES
 		);
 
 		const classInfosFromGroups: ClassInfoDto[] = await this.getClassInfosFromGroups(groups.data);
@@ -416,7 +415,7 @@ export class GroupUc {
 		} else {
 			foundGroups = await this.groupService.findGroupsBySchoolIdAndGroupTypes(
 				school,
-				this.ALLOWED_GROUP_TYPES,
+				undefined,
 				skip,
 				limit,
 				nameQuery