Merge remote-tracking branch 'origin/main' into main

src/chat/chat.gateway.ts

@@ -1,3 +1,4 @@
+import { UnauthorizedException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import {
 	SubscribeMessage,
@@ -34,6 +35,8 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
 		// JWT 유효성 검사
 		const { userID } = await this.userService.validateAccess(socket.handshake.headers.authorization);
 
+		if(!userID) throw new UnauthorizedException()
+
 		// 유저가 속한 채팅방 찾기
 		const groupList = await this.groupMappingEntity.findBy({ userID });
 
@@ -60,9 +63,9 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
 			message: string,
 			room: string
 		}): Promise<null> {
-		const thisUser = (await this.userService.validateAccess(client.client.request.headers.authorization)).userID
+		const { userID } = (await this.userService.validateAccess(client.client.request.headers.authorization))
 		this.server.to(data.room).emit('message', {
-			userID: thisUser,
+			userID,
 			message: data.message,
 			room: data.room
 		})

src/chat/chat.service.ts

@@ -340,9 +340,12 @@ export class ChatService {
             .orderBy('isManager', 'DESC')
             .getRawMany();
 
+        const isOrganization: boolean = count.length == 2 ? false: true
+
         return {
             thisGroup,
             member: count,
+            isOrganization
         };
     }
 

src/profile/profile.service.ts

@@ -37,10 +37,10 @@ export class ProfileService {
         const thisUser = await this.userEntity.findOneBy({ userID });
         const thisStudent = await this.studentEntity.findOneBy({ userID });
 
-        let isOnline = 0;
+        let isOnline = false;
 
         if (!thisUser || !thisStudent) throw new NotFoundException('존재하지 않는 유저');
-        if(await this.redis.get(`${userID}AccessToken`)) isOnline = 1
+        if(await this.redis.get(`${userID}AccessToken`)) isOnline = true
 
         return Object.assign(thisUser, thisStudent, {isOnline});
     }
@@ -173,10 +173,10 @@ export class ProfileService {
         const thisUser = await this.userEntity.findOneBy({ userID });
         const thisTeacher = await this.teacherEntity.findOneBy({ userID });
 
-        let isOnline = 0;
+        let isOnline = false;
 
         if (!thisUser || !thisTeacher) throw new NotFoundException('존재하지 않는 유저');
-        if(await this.redis.get(`${userID}AccessToken`)) isOnline = 1
+        if(await this.redis.get(`${userID}AccessToken`)) isOnline = true
 
         return Object.assign(thisUser, thisTeacher, {isOnline});
     }