Merge branch 'dev-be' into bug/#315

packages/backend/src/auth/session/session.serializer.ts

@@ -1,24 +1,26 @@
 import { Injectable } from '@nestjs/common';
 import { PassportSerializer } from '@nestjs/passport';
 import { User } from '@/user/domain/user.entity';
+import { UserService } from '@/user/user.service';
 
 @Injectable()
 export class SessionSerializer extends PassportSerializer {
-  constructor() {
+  constructor(private readonly userService: UserService) {
     super();
   }
 
   async serializeUser(
     user: User,
-    done: (err: Error | null, user: User) => void,
+    done: (err: Error | null, userId: number) => void,
   ) {
-    done(null, user);
+    done(null, user.id);
   }
 
   async deserializeUser(
-    user: User,
+    userId: number,
     done: (err: Error | null, user: User | null) => void,
   ): Promise<void> {
+    const user = await this.userService.findUserById(userId);
     return user ? done(null, user) : done(null, null);
   }
 }

packages/backend/src/auth/session/webSocketSession.guard.ts

@@ -10,25 +10,31 @@ import { Socket } from 'socket.io';
 import { websocketCookieParse } from '@/auth/session/cookieParser';
 import { MEMORY_STORE } from '@/auth/session.module';
 import { User } from '@/user/domain/user.entity';
+import { UserService } from '@/user/user.service';
 
 export interface SessionSocket extends Socket {
   session?: User;
 }
 
 export interface PassportSession extends SessionData {
-  passport: { user: User };
+  passport: { user: number };
 }
 
 @Injectable()
 export class WebSocketSessionGuard implements CanActivate {
   constructor(
     @Inject(MEMORY_STORE) private readonly sessionStore: MemoryStore,
+    private readonly userService: UserService,
   ) {}
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const socket: SessionSocket = context.switchToHttp().getRequest();
     const cookieValue = websocketCookieParse(socket);
     const session = await this.getSession(cookieValue);
-    socket.session = session.passport.user;
+    const user = await this.userService.findUserById(session.passport.user);
+    if (!user) {
+      return false;
+    }
+    socket.session = user;
     return true;
   }
 

packages/backend/src/auth/session/websocketSession.service.ts

@@ -2,15 +2,21 @@ import { MemoryStore } from 'express-session';
 import { Socket } from 'socket.io';
 import { websocketCookieParse } from '@/auth/session/cookieParser';
 import { PassportSession } from '@/auth/session/webSocketSession.guard';
+import { UserService } from '@/user/user.service';
 
 export class WebsocketSessionService {
-  constructor(private readonly sessionStore: MemoryStore) {}
+  constructor(
+    private readonly sessionStore: MemoryStore,
+    private readonly userService: UserService,
+  ) {}
 
   async getAuthenticatedUser(socket: Socket) {
     try {
       const cookieValue = websocketCookieParse(socket);
       const session = await this.getSession(cookieValue);
-      return session ? session.passport.user : null;
+      return session
+        ? await this.userService.findUserById(session.passport.user)
+        : null;
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return null;

packages/backend/src/chat/chat.gateway.ts

@@ -45,10 +45,13 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     private readonly stockService: StockService,
     private readonly chatService: ChatService,
     private readonly mentionService: MentionService,
-    private readonly UserService: UserService,
+    private readonly userService: UserService,
     @Inject(MEMORY_STORE) sessionStore: MemoryStore,
   ) {
-    this.websocketSessionService = new WebsocketSessionService(sessionStore);
+    this.websocketSessionService = new WebsocketSessionService(
+      sessionStore,
+      userService,
+    );
   }
 
   @UseGuards(WebSocketSessionGuard)
@@ -169,7 +172,7 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
   }
 
   private async searchMentionedUser(nickname: string, subName: string) {
-    return await this.UserService.searchOneUserByNicknameAndSubName(
+    return await this.userService.searchOneUserByNicknameAndSubName(
       nickname,
       subName,
     );

packages/backend/src/stock/stock.gateway.ts

@@ -13,6 +13,8 @@ import { LiveData } from '@/scraper/openapi/liveData.service';
 
 @WebSocketGateway({
   namespace: '/api/stock/realtime',
+  pingInterval: 5000,
+  pingTimeout: 5000,
 })
 @Injectable()
 export class StockGateway {
@@ -33,26 +35,29 @@ export class StockGateway {
     client.join(stockId);
 
     await this.mutex.runExclusive(async () => {
-      const connectedSockets = await this.server.in(stockId).fetchSockets();
+      const connectedSockets = await this.server.to(stockId).fetchSockets();
 
       if (connectedSockets.length > 0 && !this.liveData.isSubscribe(stockId)) {
         await this.liveData.subscribe(stockId);
         this.logger.info(`${stockId} is subscribed`);
       }
     });
 
+    client.on('disconnecting', () => {
+      client.rooms.delete(client.id);
+      const stocks = Array.from(client.rooms.values());
+      for (const stock of stocks) {
+        this.handleDisconnectStock(stock);
+      }
+    });
+
     client.emit('connectionSuccess', {
       message: `Successfully connected to stock room: ${stockId}`,
       stockId,
     });
   }
 
-  async handleDisconnectStock(
-    @MessageBody() stockId: string,
-    @ConnectedSocket() client: Socket,
-  ) {
-    client.leave(stockId);
-
+  async handleDisconnectStock(stockId: string) {
     await this.mutex.runExclusive(async () => {
       const connectedSockets = await this.server.in(stockId).fetchSockets();
 
@@ -61,11 +66,6 @@ export class StockGateway {
         this.logger.info(`${stockId} is unsubscribed`);
       }
     });
-
-    client.emit('disconnectionSuccess', {
-      message: `Successfully disconnected to stock room: ${stockId}`,
-      stockId,
-    });
   }
 
   onUpdateStock(

packages/backend/src/stock/stock.service.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { plainToInstance } from 'class-transformer';
-import { DataSource, EntityManager } from 'typeorm';
+import { DataSource, EntityManager, Like } from 'typeorm';
 import { Logger } from 'winston';
 import { Stock } from './domain/stock.entity';
 import {
@@ -87,15 +87,13 @@ export class StockService {
   }
 
   async searchStock(stockName: string) {
-    const result = await this.datasource
-      .getRepository(Stock)
-      .createQueryBuilder('stock')
-      .where('stock.is_trading = :isTrading and stock.stock_name LIKE :name', {
+    const result = await this.datasource.manager.find(Stock, {
+      where: {
         isTrading: true,
-        name: `%${stockName}%`,
-      })
-      .limit(10)
-      .getMany();
+        name: Like(`%${stockName}%`),
+      },
+      take: 10,
+    });
     return new StockSearchResponse(result);
   }
 

packages/backend/src/user/user.service.ts

@@ -70,6 +70,10 @@ export class UserService {
     });
   }
 
+  async findUserById(id: number) {
+    return await this.dataSource.manager.findOne(User, { where: { id } });
+  }
+
   async getUserInfo(id: number) {
     const user = await this.dataSource.manager.findOne(User, { where: { id } });
     if (!user) {