Skip to content

Commit 1187a50

Browse files
filter deleted user from room members list
1 parent 82f609a commit 1187a50

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

apps/server/src/modules/room/api/room.uc.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export class RoomUc {
122122
});
123123

124124
const userIds = roomMembershipAuthorizable.members.map((member) => member.userId);
125-
const users = await this.userService.findByIds(userIds);
125+
const users = (await this.userService.findByIds(userIds)).filter((user) => user.deletedAt === undefined);
126126

127127
const memberResponses = users.map((user) => {
128128
const member = roomMembershipAuthorizable.members.find((item) => item.userId === user.id);

apps/server/src/modules/user/domain/do/user.do.ts

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export class UserDo extends BaseDO {
2020

2121
public updatedAt?: Date;
2222

23+
public deletedAt?: Date;
24+
2325
public email: string;
2426

2527
public firstName: string;
@@ -75,6 +77,7 @@ export class UserDo extends BaseDO {
7577

7678
this.createdAt = domainObject.createdAt;
7779
this.updatedAt = domainObject.updatedAt;
80+
this.deletedAt = domainObject.deletedAt;
7881
this.email = domainObject.email;
7982
this.firstName = domainObject.firstName;
8083
this.lastName = domainObject.lastName;

apps/server/src/modules/user/repo/mikro-orm/user-do.repo.ts

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ export class UserDORepo extends BaseDORepo<UserDo, User> {
143143
id: entity.id,
144144
createdAt: entity.createdAt,
145145
updatedAt: entity.updatedAt,
146+
deletedAt: entity.deletedAt,
146147
email: entity.email,
147148
firstName: entity.firstName,
148149
lastName: entity.lastName,

0 commit comments

Comments
 (0)