Merge pull request #72 from tscenping/jangcho

fix(channel): recover joinChannelRoom logic also add notice dto
tscenping · Dec 13, 2023 · d1b9756 · d1b9756
2 parents 544f7b7 + a633ffa
commit d1b9756
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/channels/channels.controller.ts b/src/channels/channels.controller.ts
@@ -70,6 +70,13 @@ export class ChannelsController {
 		const createChannelResponseDto =
 			await this.channelsService.createChannel(user.id, channelInfo);
 
+		if (user.channelSocketId) {
+			this.channelsGateway.joinChannelRoom(
+				createChannelResponseDto.channelId.toString(),
+				user.channelSocketId,
+			);
+		}
+
 		return createChannelResponseDto;
 	}
 
@@ -132,6 +139,13 @@ export class ChannelsController {
 
 		const channelUsersResponseDto =
 			await this.channelsService.createChannelUser(channelUserParamDto);
+
+		if (user.channelSocketId) {
+			this.channelsGateway.joinChannelRoom(
+				channelId.toString(),
+				user.channelSocketId,
+			);
+		}
 
 		return channelUsersResponseDto ;
 	}

diff --git a/src/channels/channels.gateway.ts b/src/channels/channels.gateway.ts
@@ -258,11 +258,14 @@ export class ChannelsGateway
 		const invitedUser = await this.usersRepository.findOne({
 			where: { id: data.invitedUserId },
 		});
-		const invitationId = data.invitationId;
 
+		const invitationEmitDto = {
+			invitationId: data.invitationId,
+		};
+
 		if (!invitedUser || invitedUser.status === UserStatus.OFFLINE || !invitedUser.channelSocketId) {
 			throw WSBadRequestException('유저가 유효하지 않습니다.');
 		}
-		this.server.to(invitedUser.channelSocketId).emit('privateAlert', invitationId);
+		this.server.to(invitedUser.channelSocketId).emit('privateAlert', invitationEmitDto);
 	}
 }
diff --git a/src/channels/dto/event-message-on.dto.ts b/src/channels/dto/event-message-on.dto.ts
@@ -9,4 +9,9 @@ export class EventMessageOnDto {
 	@IsPositive()
 	@IsNotEmpty()
 	channelId: number;
+
+	@IsString()
+	@IsNotEmpty()
+	// 따로 리터럴이 지정되지 않으면 디폴트로 'MESSAGE'가 들어간다.
+	notice: 'ADMIN' | 'BAN' | 'KICK' | 'MUTE'| 'JOIN' | 'EXIT' | 'MESSAGE' = 'MESSAGE';
 }