Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bc7f9bf
membership service
Metauriel Jan 15, 2025
9da8ddb
add skeleton for controller and uc
Metauriel Jan 17, 2025
dcbaa82
define api for changing roles in rooms
Metauriel Jan 17, 2025
79c943a
make uc functional
Metauriel Jan 20, 2025
619bd48
prevent owner manipulation
Metauriel Jan 20, 2025
24dcc39
add ROOM_MEMBERS_CHANGE_ROLE to room admin and owner
Metauriel Jan 20, 2025
2689e74
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 20, 2025
e25dadb
update imports
Metauriel Jan 20, 2025
3410be1
BC-8545 - add school role to RoomMemberList (#5441)
NFriedo Jan 20, 2025
0a6ebbd
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 20, 2025
1e50fdf
fix build
Metauriel Jan 20, 2025
0357e4a
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 21, 2025
9d46859
test build fix
Metauriel Jan 21, 2025
7d311d2
fix tests after mergeconflict
Metauriel Jan 21, 2025
d8583ae
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 21, 2025
d4c8423
update import
Metauriel Jan 21, 2025
12e12ba
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 22, 2025
2669e2f
solve review comments
Metauriel Jan 22, 2025
cad88b0
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 22, 2025
814bba4
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 23, 2025
baf031f
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 23, 2025
2806037
BC-8508 - Remove exports from shared/*/index.ts (#5454)
bergatco Jan 23, 2025
29581dc
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 23, 2025
717b807
import fix after merge conflict
Metauriel Jan 23, 2025
a565139
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 23, 2025
4ce5c32
Merge branch 'main' into BC-8547-change-room-roles
Metauriel Jan 23, 2025
34ac7f2
more import fixes...
Metauriel Jan 23, 2025
1b3f8f5
Merge branch 'main' of https://github.com/hpi-schul-cloud/schulcloud-…
hoeppner-dataport Jan 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update imports
  • Loading branch information
Metauriel committed Jan 20, 2025
commit e25dadba0eab73d36c9f7cb11e9a095eb3a71f05
22 changes: 10 additions & 12 deletions apps/server/src/modules/room/api/test/room-change-role.api.spec.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { EntityManager } from '@mikro-orm/mongodb';
import { GroupEntityTypes } from '@modules/group/entity/group.entity';
import { ServerTestModule, serverConfig, type ServerConfig } from '@modules/server';
import { HttpStatus, INestApplication } from '@nestjs/common';
import { Test } from '@nestjs/testing';
import { RoleName } from '@shared/domain/interface/rolename.enum';
import {
TestApiClient,
UserAndAccountTestFactory,
cleanupCollections,
groupEntityFactory,
roleFactory,
schoolEntityFactory,
userFactory,
} from '@shared/testing';
import { GroupEntityTypes } from '@modules/group/entity/group.entity';
import { roomMembershipEntityFactory } from '@src/modules/room-membership/testing/room-membership-entity.factory';
import { ServerTestModule, serverConfig, type ServerConfig } from '@modules/server';
import { roomMembershipEntityFactory } from '@modules/room-membership/testing/room-membership-entity.factory';
import { groupEntityFactory } from '@testing/factory/group-entity.factory';
import { roleFactory } from '@testing/factory/role.factory';
import { schoolEntityFactory } from '@testing/factory/school-entity.factory';
import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory';
import { userFactory } from '@testing/factory/user.factory';
import { cleanupCollections } from '@testing/cleanup-collections';
import { TestApiClient } from '@testing/test-api-client';
import { roomEntityFactory } from '../../testing/room-entity.factory';
import { RoomRolesTestFactory } from '../../testing/room-roles.test.factory';
import { RoomMemberListResponse } from '../dto/response/room-member.response';