BC-8362 - RoomMember groups are shown in class administration and dur…

…ing sync of courses with groups (#5333) * allow more group types in filtering for class groups * specifying which groups can be chosen for course synch
hpi-schul-cloud · Nov 11, 2024 · d1547f4 · d1547f4
1 parent ac0f0dc
commit d1547f4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/apps/server/src/modules/group/domain/group-aggregate.scope.spec.ts b/apps/server/src/modules/group/domain/group-aggregate.scope.spec.ts
@@ -99,6 +99,15 @@ describe(GroupAggregateScope.name, () => {
 				const result = new GroupAggregateScope().byAvailableForSync(true).build();
 
 				expect(result).toEqual([
+					{
+						$match: {
+							$or: [
+								{ type: { $eq: GroupTypes.CLASS } },
+								{ type: { $eq: GroupTypes.COURSE } },
+								{ type: { $eq: GroupTypes.OTHER } },
+							],
+						},
+					},
 					{
 						$lookup: {
 							from: 'courses',

diff --git a/apps/server/src/modules/group/domain/group-aggregate.scope.ts b/apps/server/src/modules/group/domain/group-aggregate.scope.ts
@@ -29,6 +29,15 @@ export class GroupAggregateScope extends MongoDbScope<GroupEntity> {
 	byAvailableForSync(value: boolean | undefined): this {
 		if (value) {
 			this.pipeline.push(
+				{
+					$match: {
+						$or: [
+							{ type: { $eq: GroupTypes.CLASS } },
+							{ type: { $eq: GroupTypes.COURSE } },
+							{ type: { $eq: GroupTypes.OTHER } },
+						],
+					},
+				},
 				{
 					$lookup: {
 						from: 'courses',

diff --git a/apps/server/src/modules/group/uc/class-group.uc.spec.ts b/apps/server/src/modules/group/uc/class-group.uc.spec.ts
@@ -414,7 +414,7 @@ describe('ClassGroupUc', () => {
 
 					expect(groupService.findGroups).toHaveBeenCalledWith<[GroupFilter]>({
 						userId: teacherUser.id,
-						groupTypes: [GroupTypes.CLASS],
+						groupTypes: [GroupTypes.CLASS, GroupTypes.COURSE, GroupTypes.OTHER],
 					});
 				});
 			});
@@ -777,7 +777,7 @@ describe('ClassGroupUc', () => {
 
 					expect(groupService.findGroups).toHaveBeenCalledWith<[GroupFilter]>({
 						schoolId: teacherUser.school.id,
-						groupTypes: [GroupTypes.CLASS],
+						groupTypes: [GroupTypes.CLASS, GroupTypes.COURSE, GroupTypes.OTHER],
 					});
 				});
 			});

diff --git a/apps/server/src/modules/group/uc/class-group.uc.ts b/apps/server/src/modules/group/uc/class-group.uc.ts
@@ -217,7 +217,7 @@ export class ClassGroupUc {
 	}
 
 	private async findGroupsForSchool(schoolId: EntityId): Promise<ClassInfoDto[]> {
-		const filter: GroupFilter = { schoolId, groupTypes: [GroupTypes.CLASS] };
+		const filter: GroupFilter = { schoolId, groupTypes: [GroupTypes.CLASS, GroupTypes.COURSE, GroupTypes.OTHER] };
 
 		const groups: Page<Group> = await this.groupService.findGroups(filter);
 
@@ -227,7 +227,7 @@ export class ClassGroupUc {
 	}
 
 	private async findGroupsForUser(userId: EntityId): Promise<ClassInfoDto[]> {
-		const filter: GroupFilter = { userId, groupTypes: [GroupTypes.CLASS] };
+		const filter: GroupFilter = { userId, groupTypes: [GroupTypes.CLASS, GroupTypes.COURSE, GroupTypes.OTHER] };
 
 		const groups: Page<Group> = await this.groupService.findGroups(filter);