feat. get all of bottle list -> get bottle list of hub

@@ -4,6 +4,7 @@ const Hub = require('../../models/hub');
 const Medicine = require('../../models/medicine');
 const Medicine = require('../../models/medicine');
 const Mqtt = require('../../lib/MqttModule');
 const Mqtt = require('../../lib/MqttModule');
 const jwt = require('jsonwebtoken');
 const jwt = require('jsonwebtoken');
+const { createIndexes } = require('../../models/bottle');
 
 
 //약병 등록
 //약병 등록
 exports.bottleConnect = async(ctx) => {
 exports.bottleConnect = async(ctx) => {
@@ -171,13 +172,20 @@ exports.getBottleList = async(ctx) => {
     }
     }
 
 
     const { userId } = jwt.verify(token, process.env.JWT_SECRET);
     const { userId } = jwt.verify(token, process.env.JWT_SECRET);
-    const hubList = await Hub.find({ userId })
-    if(!hubList || !hubList.length) {
+    const { hubId } = ctx.params;
+
+    const hub = await Hub.findByHubId(hubId);
+    if(!hub) {
         ctx.status = 404;
         ctx.status = 404;
         return;
         return;
     }
     }
 
 
-    const bottleList = await getBottleListByHub(hubList);
+    if(hub.getHub_UserId() !== userId) {
+        ctx.status = 403;
+        return;
+    }
+
+    const bottleList = await Bottle.find({ hubId });
     if(!bottleList || !bottleList.length) {
     if(!bottleList || !bottleList.length) {
         ctx.status = 404;
         ctx.status = 404;
         return;
         return;
@@ -185,17 +193,5 @@ exports.getBottleList = async(ctx) => {
 
 
     ctx.status = 200;
     ctx.status = 200;
     ctx.body = bottleList;
     ctx.body = bottleList;
-}
-
-const getBottleListByHub = async (hubList) => {
-    const result = []
-
-    for (const hub of hubList) {
-        const bottle = await Bottle.find({
-            hubId : hub.hubId
-        });
-        result.push(...bottle)
-    }
     
     
-    return result;
 }
 }
\ No newline at end of file

@@ -36,11 +36,11 @@ bottle.get('/:bottleId', bottleCtrl.lookupInfo);
 bottle.patch('/:bottleId', bottleCtrl.setMedicine);
 bottle.patch('/:bottleId', bottleCtrl.setMedicine);
 
 
 /**
 /**
- * 현재 로그인한 유저의 약병 리스트를 가져옴
+ * 현재 로그인한 유저의 허브 중, 해당 허브에 등록된 약병 리스트를 가져옴
  * request parameter : x
  * request parameter : x
- * url : http://localhost:4000/api/bottle
+ * url : http://localhost:4000/api/bottle/hub/:hubId
  * return : bottle List(json type List)
  * return : bottle List(json type List)
  */
  */
-bottle.get('/', bottleCtrl.getBottleList)
+bottle.get('/hub/:hubId', bottleCtrl.getBottleList)
 
 
 module.exports = bottle;
 module.exports = bottle;
\ No newline at end of file