Merge remote-tracking branch 'origin/young' into jiweon827

client/src/Components/ClosedList.js

@@ -3,6 +3,7 @@ import { ListGroup, Row, Col } from 'react-bootstrap';
 import axios from 'axios'
 
 function ClosedList(props) {
+
   const [list, setList] = useState([]);
 
   useEffect(() => {
@@ -12,7 +13,9 @@ function ClosedList(props) {
   const userId = sessionStorage.getItem('userId');
 
   async function getClosedList() {
-    let res = await axios.get('/room/closedlist')
+    const userid = sessionStorage.getItem('userId')
+    console.log('id가져오기', userid)
+    let res = await axios.get('/room/closedlist', { params: { '_id': userid } })
     console.log('가져온거', res)
     setList(res.data)
   }

client/src/Components/OpenList.js

-import axios from 'axios';
-import React, { useEffect, useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { ListGroup } from 'react-bootstrap';
+import axios from 'axios'
 
 function OpenList(props) {
   const [list, setList] = useState([]);
@@ -10,11 +10,12 @@ function OpenList(props) {
   }, []);
 
   async function getOpenList() {
-    let res = await axios.get('/room/Openlist')
+    let res = await axios.get('/room/openlist')
     console.log('가져온거', res)
     setList(res.data)
   }
 
+
   function enterChatroomCH(e) {
     console.log(e.target.name)
     console.log(e.target)
@@ -30,8 +31,8 @@ function OpenList(props) {
     <div>
       {list.map((item, index) =>
         <ListGroup key={index}>
-          <ListGroup.Item action onClick={enterChatroomCH} name={item.roomName}>
-            {item.roomName}
+          <ListGroup.Item action onClick={enterChatroomCH} name={list.roomName}>
+            {list.roomName}
           </ListGroup.Item>
         </ListGroup>
       )}

server/controllers/room.controller.js

@@ -40,19 +40,21 @@ const makeRoom = async (req, res) => {
 
 const getClosedList = async (req, res) => {
     try {
-        let list = await Room.find({ isOpen: false })
-        console.log({userId})
-        console.log('list가져오기', list)
+        console.log('req확인',req.query._id)
+        let list = await Room.find({ moderator
+            : req.query._id })
+        console.log('c_list가져오기', list)
         return res.json(list)
     } catch (error) {
         res.status(500).send('리스트 불러오기를 실패하였습니다!')
     }
 }
 
+
 const getOpenList = async (req, res) => {
     try {
         let list = await Room.find({ isOpen: true })
-        console.log('list가져오기', list)
+        console.log('o_list가져오기', list)
         return res.json(list)
     } catch (error) {
         res.status(500).send('리스트 불러오기를 실패하였습니다!')

server/routes/room.routers.js

@@ -11,5 +11,4 @@ router.route('/room/closedlist')
 
 router.route('/room/openlist')
     .get(roomCtrl.getOpenList)
-
 export default router
\ No newline at end of file