From 8385db83117367179addab33e67c4d920b1ce467 Mon Sep 17 00:00:00 2001
From: jaeyeon <wodus2854@korea.ac.kr>
Date: Mon, 9 Aug 2021 14:30:18 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B8=EC=A7=80=ED=95=98=EC=84=B8=EC=9A=A9?=
 =?UTF-8?q?=20=E3=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/apis/room.api.js                  |  8 ++
 client/src/components/Header.js              |  2 +-
 client/src/components/Home/CreateRoom.js     |  2 +-
 client/src/components/Home/HomeProfile.js    |  2 +-
 client/src/components/Home/JoinRoom.js       |  2 +-
 client/src/components/Home/RoomSingle.js     |  2 +-
 client/src/components/KakaoShareButton.js    |  2 +-
 client/src/components/Login.js               |  2 +-
 client/src/components/Profile/Info.js        |  2 +-
 client/src/components/Profile/InfoUpdate.js  |  2 +-
 client/src/components/Profile/Profile.js     |  2 +-
 client/src/components/Room/ChannelList.js    |  2 +-
 client/src/components/Room/ChannelSingle.js  |  2 +-
 client/src/components/Room/RightHamburger.js | 43 ++++++++++-
 client/src/context/auth.js                   |  6 +-
 client/src/context/auth_context.js           |  4 +-
 client/src/pages/InvitePage.js               |  2 +-
 server/controllers/room.controller.js        | 78 +++++++++++---------
 server/routes/room.route.js                  |  1 +
 19 files changed, 111 insertions(+), 55 deletions(-)

diff --git a/client/src/apis/room.api.js b/client/src/apis/room.api.js
index 1ed7a59..8c24314 100644
--- a/client/src/apis/room.api.js
+++ b/client/src/apis/room.api.js
@@ -37,6 +37,13 @@ const doubleJoin = async (payload) => {
   return data;
 };
 
+const removeRoom = async (ID)=>{
+  const { data } = await axios.delete(
+    `/api/room/removeRoom/${ID.roomId}`
+  );
+  return data;
+}
+
 // const makeChannel = async (payload) => {
 //   const { data } = await axios.post("/api/room/makeChannel", payload);
 //   return data;
@@ -50,6 +57,7 @@ const roomApi = {
   changename,
   joinChannel,
   doubleJoin,
+  removeRoom
 };
 
 export default roomApi;
diff --git a/client/src/components/Header.js b/client/src/components/Header.js
index 75d35c6..52e4e69 100644
--- a/client/src/components/Header.js
+++ b/client/src/components/Header.js
@@ -2,7 +2,7 @@ import { Link } from 'react-router-dom'
 import { handleLogout } from '../context/auth'
 
 const Header = () => {
-  const id = localStorage.getItem('user');
+  const id = sessionStorage.getItem('user');
   return (
     <div>
       <form
diff --git a/client/src/components/Home/CreateRoom.js b/client/src/components/Home/CreateRoom.js
index 43b2377..cb384d8 100644
--- a/client/src/components/Home/CreateRoom.js
+++ b/client/src/components/Home/CreateRoom.js
@@ -3,7 +3,7 @@ import { Redirect } from "react-router-dom";
 import roomApi from "../../apis/room.api";
 import catchErrors from "../../context/catchError";
 
-const id = localStorage.getItem('user');
+const id = sessionStorage.getItem('user');
 const INIT_ROOM = {
     name: '',
     profileimg: '',
diff --git a/client/src/components/Home/HomeProfile.js b/client/src/components/Home/HomeProfile.js
index f6e75d9..631cbb7 100644
--- a/client/src/components/Home/HomeProfile.js
+++ b/client/src/components/Home/HomeProfile.js
@@ -3,7 +3,7 @@ import { useState, useEffect } from "react";
 import userApi from "../../apis/user.api";
 import catchErrors from "../../context/catchError";
 
-const userprofile = localStorage.getItem("user");
+const userprofile = sessionStorage.getItem("user");
 const INIT_USER = {
   id: userprofile,
   email: "",
diff --git a/client/src/components/Home/JoinRoom.js b/client/src/components/Home/JoinRoom.js
index 935929d..78c9dec 100644
--- a/client/src/components/Home/JoinRoom.js
+++ b/client/src/components/Home/JoinRoom.js
@@ -3,7 +3,7 @@ import { Redirect } from "react-router-dom";
 import roomApi from "../../apis/room.api";
 import catchErrors from "../../context/catchError";
 
-const id = localStorage.getItem("user");
+const id = sessionStorage.getItem("user");
 
 const JoinRoom = () => {
     const [roomId, setRoomId] = useState("");
diff --git a/client/src/components/Home/RoomSingle.js b/client/src/components/Home/RoomSingle.js
index 1737dba..9c0b69a 100644
--- a/client/src/components/Home/RoomSingle.js
+++ b/client/src/components/Home/RoomSingle.js
@@ -4,7 +4,7 @@ import roomApi from "../../apis/room.api";
 import userApi from "../../apis/user.api";
 import catchErrors from "../../context/catchError";
 
-const id = localStorage.getItem("user");
+const id = sessionStorage.getItem("user");
 const INIT_ROOM = {
   roomId: "",
   name: "",
diff --git a/client/src/components/KakaoShareButton.js b/client/src/components/KakaoShareButton.js
index c941312..42469b0 100644
--- a/client/src/components/KakaoShareButton.js
+++ b/client/src/components/KakaoShareButton.js
@@ -13,7 +13,7 @@ const KakaoShareButton = (porps) => {
   const [inviteperson, setProfile] = useState(INIT_invite);
   const [error, setError] = useState("");
   const { roomId } = useParams();
-  const invitepersonId = localStorage.getItem("user");
+  const invitepersonId = sessionStorage.getItem("user");
 
   async function getProfile(userID) {
     try {
diff --git a/client/src/components/Login.js b/client/src/components/Login.js
index 3d07a32..53f598c 100644
--- a/client/src/components/Login.js
+++ b/client/src/components/Login.js
@@ -46,7 +46,7 @@ const Login = () => {
   }
   if (success) {
     alert('로그인 되었습니다')
-    return <Redirect to={`/user/${id}`} />;
+    window.location.href=`/user/${id}`
   }
 
   const { email, password } = user
diff --git a/client/src/components/Profile/Info.js b/client/src/components/Profile/Info.js
index ed54fce..a89d3df 100644
--- a/client/src/components/Profile/Info.js
+++ b/client/src/components/Profile/Info.js
@@ -2,7 +2,7 @@ import userApi from "../../apis/user.api";
 import { useEffect, useState } from "react";
 import catchErrors from "../../context/catchError";
 
-const userprofile = localStorage.getItem("user");
+const userprofile = sessionStorage.getItem("user");
 const INIT_PROFILE = {
   name: "",
   email: "a",
diff --git a/client/src/components/Profile/InfoUpdate.js b/client/src/components/Profile/InfoUpdate.js
index b063708..cebe222 100644
--- a/client/src/components/Profile/InfoUpdate.js
+++ b/client/src/components/Profile/InfoUpdate.js
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react";
 import userApi from "../../apis/user.api";
 import catchErrors from "../../context/catchError";
 
-const userprofile = localStorage.getItem("user");
+const userprofile = sessionStorage.getItem("user");
 const INIT_PROFILE = {
   id: userprofile,
   name:"",
diff --git a/client/src/components/Profile/Profile.js b/client/src/components/Profile/Profile.js
index 47cf831..eff76fc 100644
--- a/client/src/components/Profile/Profile.js
+++ b/client/src/components/Profile/Profile.js
@@ -3,7 +3,7 @@ import { useState, useEffect } from "react";
 import userApi from "../../apis/user.api";
 import catchErrors from "../../context/catchError";
 
-const userprofile = localStorage.getItem("user");
+const userprofile = sessionStorage.getItem("user");
 const INIT_PROFILE = {
   img:"",
 };
diff --git a/client/src/components/Room/ChannelList.js b/client/src/components/Room/ChannelList.js
index 5b57529..c7a4329 100644
--- a/client/src/components/Room/ChannelList.js
+++ b/client/src/components/Room/ChannelList.js
@@ -15,7 +15,7 @@ const ChannelList = () => {
   const { roomId } = useParams();
   const [error, setError] = useState("");
   const [channel, setChannel] = useState([INIT_CHANNEL]);
-  const id = localStorage.getItem('user');
+  const id = sessionStorage.getItem('user');
 
   async function getChannel(roomId) {
     try {
diff --git a/client/src/components/Room/ChannelSingle.js b/client/src/components/Room/ChannelSingle.js
index 79874dd..ae19267 100644
--- a/client/src/components/Room/ChannelSingle.js
+++ b/client/src/components/Room/ChannelSingle.js
@@ -9,7 +9,7 @@ const ChannelSingle = (props) => {
   const [success, setSuccess] = useState(false);
   const [roomName, setRoomName] = useState('');
   const { roomId, channelId } = useParams();
-  const userId = localStorage.getItem('user')
+  const userId = sessionStorage.getItem('user')
 
 
   async function joinChannel(e) {
diff --git a/client/src/components/Room/RightHamburger.js b/client/src/components/Room/RightHamburger.js
index 59bc76b..b98a6c6 100644
--- a/client/src/components/Room/RightHamburger.js
+++ b/client/src/components/Room/RightHamburger.js
@@ -5,6 +5,8 @@ import RoomApi from "../../apis/room.api";
 import catchErrors from "../../context/catchError";
 import KakaoShareButton from "../KakaoShareButton";
 import Roomnamechange from "./Roomnamechange";
+import userApi from "../../apis/user.api";
+import roomApi from "../../apis/room.api";
 
 const INIT_ROOM = {
   name: "",
@@ -20,7 +22,7 @@ const RightHamburger = () => {
   const [room, setRoom] = useState([INIT_ROOM]);
   const { roomId } = useParams();
   const [error, setError] = useState("");
-  const id = localStorage.getItem("user");
+  const id = sessionStorage.getItem("user");
 
   async function getRoom(roomId) {
     try {
@@ -30,7 +32,6 @@ const RightHamburger = () => {
         name: data[0].name,
         owner: data[0].owner,
       });
-      console.log(roomdata);
       setRoom(roomdata);
     } catch (error) {
       catchErrors(error, setError);
@@ -38,9 +39,12 @@ const RightHamburger = () => {
   }
 
   async function exitRoom() {
-    console.log("id, roomid정보", id, roomId);
     try {
       const data = await RoomApi.exitRoom({ id, roomId });
+      if (data.owner === Number(id)){
+        const room = await RoomApi.removeRoom({roomId : roomId})
+        console.log(room)
+      }
     } catch (error) {
       catchErrors(error, setError);
     }
@@ -65,6 +69,38 @@ const RightHamburger = () => {
       catchErrors(error, setError);
     }
   }
+  async function exitChannel() {
+    try {
+      const data = await userApi.getUser(id);
+      const A = doubleJoinCheck(data.name);
+      if (A) {
+        await roomApi.doubleJoin({
+          roomId: roomId,
+          index1: A.index1,
+          index2: A.index2,
+          joinChName: A.joinChName,
+        });
+      }
+    } catch (error) {
+      catchErrors(error, setError);
+    }
+  }
+
+  function doubleJoinCheck(e) {
+    for (const index in channel) {
+      for (const el in channel[index].joinUser) {
+        if (channel[index].joinUser[el] === e) {
+          const doublejoinCh = channel[index].channelName;
+          const A = {
+            index1: index,
+            index2: el,
+            joinChName: doublejoinCh,
+          };
+          return A;
+        }
+      }
+    }
+  }
 
   // console.log(channel)
 
@@ -289,6 +325,7 @@ const RightHamburger = () => {
                           <button
                             type="button"
                             onClick={exitRoom}
+                            onSubmit={exitChannel}
                             className="btn btn-primary"
                             data-bs-dismiss="modal"
                           >
diff --git a/client/src/context/auth.js b/client/src/context/auth.js
index 8540632..7f55d11 100644
--- a/client/src/context/auth.js
+++ b/client/src/context/auth.js
@@ -1,18 +1,18 @@
 import axios from 'axios'
 
 export function handleLogin(userId) {
-  localStorage.setItem("user", userId)
+  sessionStorage.setItem("user", userId)
 }
 
 export async function handleLogout() {
   alert("로그아웃되었습니다.")
-  localStorage.removeItem("user")
+  sessionStorage.removeItem("user")
   await axios.get('/api/auth/logout') 
   window.location.href='/'
 }
 
 export function isAuthenticated() {
-  const userId = localStorage.getItem('loginStatus')
+  const userId = sessionStorage.getItem('loginStatus')
   if (userId) {
       return userId
   }else{
diff --git a/client/src/context/auth_context.js b/client/src/context/auth_context.js
index ac4312b..ebc560c 100644
--- a/client/src/context/auth_context.js
+++ b/client/src/context/auth_context.js
@@ -36,7 +36,7 @@ const AuthProvider = ({ children }) => {
       setError("");
       setLoading(true);
       const user = await authApi.login(email, password);
-      localStorage.setItem(config.loginUser, JSON.stringify(user));
+      sessionStorage.setItem(config.loginUser, JSON.stringify(user));
       setUser(user);
 
       return true;
@@ -53,7 +53,7 @@ const AuthProvider = ({ children }) => {
       setError("");
       setUser(null);
       alert("로그아웃되었습니다.");
-      localStorage.removeItem(config.loginUser);
+      sessionStorage.removeItem(config.loginUser);
       setLoading(true);
       await axios.get(`${baseUrl}/api/auth/logout`);
     } catch (error) {
diff --git a/client/src/pages/InvitePage.js b/client/src/pages/InvitePage.js
index 62b6bd9..21a128b 100644
--- a/client/src/pages/InvitePage.js
+++ b/client/src/pages/InvitePage.js
@@ -1,7 +1,7 @@
 import Header from "../components/Header";
 
 const InvitePage = () => {
-  const usercheck = localStorage.getItem("user");
+  const usercheck = sessionStorage.getItem("user");
 
   function goInvitedroom() {
     let check1= null;
diff --git a/server/controllers/room.controller.js b/server/controllers/room.controller.js
index cff049a..d956684 100644
--- a/server/controllers/room.controller.js
+++ b/server/controllers/room.controller.js
@@ -13,13 +13,10 @@ const joinRoom = async (req, res) => {
     //roomId에 일치하는 방의 member정보에 userId 저장하기
     //member정보에 userId가 이미 저장되어 있는지 확인 -> 이미 참여된 방인지 확인
     const includeUserId = room_Id.member.includes(parseInt(userId));
-    // console.log('Include확인:',includeUserId)
     if (!includeUserId) {
       //아직 참여되지 않은 방인경우
       room_Id.member.push(userId); //member에 userId추가
-      // console.log('room_Id.member2:', room_Id.member)
       await Room.update({ member: room_Id.member }, { where: { id: roomId } });
-
       //userId에 일치하는 사용자의 roomNumber에 roomId저장하기
       const user_Id = await User.findOne({ where: { id: userId } });
       if (Boolean(user_Id.roomNumber)) {
@@ -29,7 +26,6 @@ const joinRoom = async (req, res) => {
         //첫 roomNumber인 경우
         user_Id.roomNumber = [roomId];
       }
-      // console.log('user_Id.roomNumber2:', user_Id.roomNumber)
       await User.update(
         { roomNumber: user_Id.roomNumber },
         { where: { id: userId } }
@@ -54,7 +50,6 @@ const createRoom = async (req, res) => {
   const img = avatar.filename;
   const id = nanoid();
   const Id = await Room.findOne({ where: { id: id } });
-  // console.log('id:', id)
   while (Id) {
     const id = nanoid();
     const Id = await Room.findOne({ where: { id: id } });
@@ -71,7 +66,6 @@ const createRoom = async (req, res) => {
       member: [userId],
       profileimg: img,
     };
-    // console.log('newRoom:', newRoom)
     await Room.create(newRoom);
 
     //user.roomNumber에 id추가
@@ -83,7 +77,6 @@ const createRoom = async (req, res) => {
       //첫 roomNumber인 경우
       user_Id.roomNumber = [id];
     }
-    // console.log('user_Id.roomNumber2:', user_Id.roomNumber)
     await User.update(
       { roomNumber: user_Id.roomNumber },
       { where: { id: userId } }
@@ -96,62 +89,78 @@ const createRoom = async (req, res) => {
 };
 
 const getRoom = async (req, res) => {
-  // console.log("fhgfghdgfdgf:", req.body);
   try {
     const roomlist = await Room.findAll({ where: { id: req.body } });
-    // console.log(roomlist);
     res.json(roomlist);
   } catch (error) {
-    console.log(error);
     res.status(500).send("에러");
   }
 };
 
 const exitRoom = async (req, res) => {
   const { id, roomId } = req.params;
-  console.log(id, roomId);
-  const room = await Room.findOne({ where: { id: roomId } });
-  console.log(room.member);
-  const index = room.member.indexOf(id);
-  console.log("index", index);
-  room.member.splice(index, 1);
-  await Room.update({ member: room.member }, { where: { id: roomId } });
+  try {
+    const room = await Room.findOne({ where: { id: roomId } });
+    const index = room.member.indexOf(id);
+    room.member.splice(index, 1);
+    const newRoom = await Room.update(
+      { member: room.member },
+      { where: { id: roomId } }
+    );
 
-  const user = await User.findOne({ where: { id: id } });
-  console.log(user.roomNumber);
-  const index2 = user.roomNumber.indexOf(id);
-  console.log("index", index2);
-  user.roomNumber.splice(index2, 1);
-  await User.update({ roomNumber: user.roomNumber }, { where: { id: id } });
+    const user = await User.findOne({ where: { id: id } });
+    const index2 = user.roomNumber.indexOf(id);
+    user.roomNumber.splice(index2, 1);
+    const newUser = await User.update(
+      { roomNumber: user.roomNumber },
+      { where: { id: id } }
+    );
+    return res.json(room);
+  } catch (error) {
+    res.status(500).send("에러");
+  }
 };
 
 const changename = async (req, res) => {
   const { id, name } = req.body;
-  console.log(req.body);
   try {
     await Room.update({ name: name }, { where: { id: id } });
     const room1 = await Room.findOne({ where: { id: id } });
-    console.log("Room:", room1);
   } catch (error) {
-    console.log(error);
     res.status(500).send("에러");
   }
 };
 
 const joinChannel = async (req, res) => {
   const { roomId, channelName, plusUser, index } = req.body;
-  const room = await Room.findOne({ where: { id: roomId } });
-  room.channel[index][channelName].push(plusUser);
-  await Room.update({ channel: room.channel }, { where: { id: roomId } });
-  return res.json(true);
+  try {
+    const room = await Room.findOne({ where: { id: roomId } });
+    room.channel[index][channelName].push(plusUser);
+    await Room.update({ channel: room.channel }, { where: { id: roomId } });
+  } catch (error) {
+    res.status(500).send("error");
+  }
 };
 
 const doubleJoin = async (req, res) => {
   const { roomId, index1, index2, joinChName } = req.body;
-  const room = await Room.findOne({ where: { id: roomId } });
-  room.channel[index1][joinChName].splice(index2, 1);
-  await Room.update({ channel: room.channel }, { where: { id: roomId } });
-  return res.json(true);
+  try {
+    const room = await Room.findOne({ where: { id: roomId } });
+    room.channel[index1][joinChName].splice(index2, 1);
+    await Room.update({ channel: room.channel }, { where: { id: roomId } });
+  } catch (error) {
+    res.status(500).send("error");
+  }
+};
+
+const removeRoom = async (req, res) => {
+  const { roomId } = req.params;
+  console.log('서버연결성공!!!!',roomId)
+  try {
+    const room = await Room.destroy({ where: { id: roomId } });
+  } catch (error) {
+    res.status(500).send("error");
+  }
 };
 
 // const makeChannel = async (req, res) => {
@@ -168,4 +177,5 @@ export default {
   changename,
   joinChannel,
   doubleJoin,
+  removeRoom,
 };
diff --git a/server/routes/room.route.js b/server/routes/room.route.js
index 8659082..3c8963c 100644
--- a/server/routes/room.route.js
+++ b/server/routes/room.route.js
@@ -9,6 +9,7 @@ router.route("/join").put(roomCrtl.joinRoom);
 router.route("/changename").put(roomCrtl.changename);
 router.route("/joinChannel").post(roomCrtl.joinChannel);
 router.route("/doubleJoin").post(roomCrtl.doubleJoin);
+router.route("/removeRoom/:roomId").delete(roomCrtl.removeRoom);
 // router.route("/makeChannel").post(roomCrtl.makeChannel);
 
 export default router;
\ No newline at end of file
-- 
GitLab