Pull Request - branch dev

controllers/profile/postProfile.ts

@@ -1,6 +1,8 @@
 import { Request, Response } from 'express';
+import { getRepository } from 'typeorm';
 import { Users } from '../../src/entity/Users';
 import { Stacks } from '../../src/entity/Stacks';
+import { Projects } from '../../src/entity/Projects';
 import * as fs from 'fs';
 import randomColorGenerator from '../login/randomColorGenerator';
 
@@ -66,10 +68,26 @@ const postProfile = async (req: Request, res: Response) => {
 		}
 		foundUser.stacks = stackArray;
 		const saved = await foundUser.save();
+		// project 데이터 가져오기
+		const allProjects = await getRepository(Projects).find({
+			relations: ['members'],
+			order: {
+				createdAt: 'DESC', // 순서: 최신순
+			},
+		});
+		let projectList = [];
+		for (let idx = 0; idx < allProjects.length; idx++) {
+			let members: number[] = allProjects[idx].members.map(el => el.id);
+			if (members.includes(foundUser.id)) {
+				let obj = { ...allProjects[idx], members };
+				projectList.push(obj);
+			}
+		}
 		res.status(200).json({
 			...saved,
 			career: career !== undefined && career !== '' ? JSON.parse(saved.career) : '{}',
 			stacks: stackArray.map(el => el.name),
+			projectList,
 		});
 	} else {
 		res.status(400).json({

controllers/project/deleteProject.ts

@@ -21,7 +21,9 @@ const deleteProject = async (req: Request, res: Response) => {
 					project: foundProject,
 				},
 			});
-			await delRooms.forEach(el => el.remove());
+			for (let idx = 0; idx < delRooms.length; idx++) {
+				await delRooms[idx].remove();
+			}
 			// chats 정보 삭제
 			const foundChats = await getRepository(Chats).find({
 				join: {

controllers/recruit/deleteComment.ts

@@ -12,7 +12,7 @@ const deleteComment = async (req: Request, res: Response) => {
 	let boardInfo;
 	try {
 		boardInfo = await getRepository(Recruits).findOne({
-			relations: ['writer'],
+			relations: ['writer', 'stacks'],
 			where: {
 				id: boardId,
 			},

controllers/recruit/registerComment.ts

@@ -18,7 +18,7 @@ const registerComment = async (req: Request, res: Response) => {
 	});
 	if (foundUser) {
 		const foundBoard = await getRepository(Recruits).findOne({
-			relations: ['writer'],
+			relations: ['writer', 'stacks'],
 			where: {
 				id: boardId,
 			},

controllers/workspace/socketWebRTC.ts

@@ -24,6 +24,21 @@ const socketWebRTC = async (socket: Socket) => {
 
 		socket.emit('all users', usersInThisRoom);
 	});
+	socket.on('leave room', roomID => {
+		console.log('리브!!!', roomID);
+
+		for (let i = 0; i < users[roomID].length; i++) {
+			if (users[roomID][i] === socket.id) {
+				users[roomID].splice(i, 1);
+				i--;
+			}
+		}
+
+		delete socketToRoom[socket.id];
+		const usersInThisRoom = users[roomID].filter((id: string) => id !== socket.id);
+
+		socket.emit('all users', usersInThisRoom);
+	});
 
 	socket.on('sending signal', payload => {
 		socket.to(payload.userToSignal).emit('user joined', { signal: payload.signal, callerID: payload.callerID });