MVP2-6 - Allow non-logged in user to fetch events and latest chat mes…

…sages
lcsouzamenezes · Aug 10, 2021 · a28b272 · a28b272
1 parent 16f570f
commit a28b272
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 96 deletions.
diff --git a/index.js b/index.js
@@ -104,15 +104,18 @@ server.get('/', (req, res) => {
 });
 
 // Import Routes
-const userRoute       = require('./routes/users/users-routes');
-const eventRoute      = require('./routes/users/events-routes');
-const secureUserRoute = require('./routes/users/secure-users-routes');
+const userRoute         = require('./routes/users/users-routes');
+const secureEventRoutes = require('./routes/users/secure-events-routes');
+const eventRoutes       = require('./routes/users/events-routes');
+const secureUserRoute   = require('./routes/users/secure-users-routes');
 
 server.use(cors());
 
 // Using Routes
+server.use('/api/event', eventRoutes);
+server.use('/api/event', passport.authenticate('jwt', { session: false }), secureEventRoutes);
+
 server.use('/api/user', userRoute);
-server.use('/api/event', passport.authenticate('jwt', { session: false }), eventRoute);
 server.use('/api/user', passport.authenticate('jwt', { session: false }), secureUserRoute);
 
 io.use(socketioJwt.authorize({

diff --git a/routes/users/events-routes.js b/routes/users/events-routes.js
@@ -1,103 +1,13 @@
 // Import the express Router to create routes
 const router = require("express").Router();
-
-// Imports from express validator to validate user input
 const { check } = require("express-validator");
-
-// Import controllers
 const eventController = require("../../controllers/events-controller");
-const betController = require("../../controllers/bets-controller");
 
-//Login does register & login
 router.get(
     "/list",
     eventController.listEvents
 );
 
-router.get(
-    "/list/:type/:category/:count/:page/:sortby",
-    eventController.filterEvents
-);
-
-router.get(
-    "/list/:type/:category/:count/:page/:sortby/:searchQuery",
-    eventController.filterEvents
-);
-
-router.get(
-    "/get/:id",
-    [
-        check("id").notEmpty()
-    ],
-    eventController.getEvent
-);
-
-router.post(
-    "/create",
-    [
-        check("name"),
-        check("tags"),
-        check("streamUrl"),
-        check("previewImageUrl"),
-        check("date"),
-    ],
-    eventController.createEvent
-);
-
-router.post(
-    "/bet/create",
-    [
-        check("eventId").notEmpty(),
-        check("marketQuestion").notEmpty(),
-        check("description"),
-        check("hot"),
-        check("outcomes").isArray(),
-        check("endDate")
-    ],
-    betController.createBet
-);
-
-router.post(
-    "/bet/:id/place",
-    [
-        check("amount").isNumeric(),
-        check("outcome").isNumeric(),
-        check("minOutcomeTokens").isNumeric().default(0).optional()
-    ],
-    betController.placeBet
-);
-
-router.post(
-    "/bet/:id/pullout",
-    [
-        check("amount").isNumeric(),
-        check("outcome").isNumeric(),
-        check("minReturnAmount").isNumeric().default(Number.MAX_SAFE_INTEGER).optional()
-    ],
-    betController.pullOutBet
-);
-
-router.post(
-    "/bet/:id/outcomes/buy",
-    [
-        check("amount").isNumeric()
-    ],
-    betController.calculateBuyOutcome
-);
-
-router.post(
-    "/bet/:id/outcomes/sell",
-    [
-        check("amount").isNumeric()
-    ],
-    betController.calculateSellOutcome
-);
-
-router.get(
-    "/bet/:id/payout",
-    betController.payoutBet
-);
-
 router.get(
     "/chat-messages/:id",
     [
@@ -106,4 +16,4 @@ router.get(
     eventController.getChatMessagesByEventId
 );
 
-module.exports = router;
+module.exports = router;
diff --git a/routes/users/secure-events-routes.js b/routes/users/secure-events-routes.js
@@ -0,0 +1,96 @@
+// Import the express Router to create routes
+const router = require("express").Router();
+
+// Imports from express validator to validate user input
+const { check } = require("express-validator");
+
+// Import controllers
+const eventController = require("../../controllers/events-controller");
+const betController = require("../../controllers/bets-controller");
+
+//Login does register & login
+router.get(
+    "/list/:type/:category/:count/:page/:sortby",
+    eventController.filterEvents
+);
+
+router.get(
+    "/list/:type/:category/:count/:page/:sortby/:searchQuery",
+    eventController.filterEvents
+);
+
+router.get(
+    "/get/:id",
+    [
+        check("id").notEmpty()
+    ],
+    eventController.getEvent
+);
+
+router.post(
+    "/create",
+    [
+        check("name"),
+        check("tags"),
+        check("streamUrl"),
+        check("previewImageUrl"),
+        check("date"),
+    ],
+    eventController.createEvent
+);
+
+router.post(
+    "/bet/create",
+    [
+        check("eventId").notEmpty(),
+        check("marketQuestion").notEmpty(),
+        check("description"),
+        check("hot"),
+        check("outcomes").isArray(),
+        check("endDate")
+    ],
+    betController.createBet
+);
+
+router.post(
+    "/bet/:id/place",
+    [
+        check("amount").isNumeric(),
+        check("outcome").isNumeric(),
+        check("minOutcomeTokens").isNumeric().default(0).optional()
+    ],
+    betController.placeBet
+);
+
+router.post(
+    "/bet/:id/pullout",
+    [
+        check("amount").isNumeric(),
+        check("outcome").isNumeric(),
+        check("minReturnAmount").isNumeric().default(Number.MAX_SAFE_INTEGER).optional()
+    ],
+    betController.pullOutBet
+);
+
+router.post(
+    "/bet/:id/outcomes/buy",
+    [
+        check("amount").isNumeric()
+    ],
+    betController.calculateBuyOutcome
+);
+
+router.post(
+    "/bet/:id/outcomes/sell",
+    [
+        check("amount").isNumeric()
+    ],
+    betController.calculateSellOutcome
+);
+
+router.get(
+    "/bet/:id/payout",
+    betController.payoutBet
+);
+
+module.exports = router;
diff --git a/services/chat-message-service.js b/services/chat-message-service.js
@@ -1,3 +1,4 @@
+const mongoose = require("mongoose");
 // Import ChatMessage model
 const ChatMessage = require("../models/ChatMessage");
 
@@ -6,7 +7,44 @@ exports.getChatMessagesByEvent = async (eventId) => {
 };
 
 exports.getNewestChatMessagesByEvent = async (eventId, limit=100, skip=0) => {
-    return ChatMessage.find({eventId}, null, {sort: {date: -1}, limit, skip});
+    return ChatMessage.aggregate([
+        {
+            $match: { eventId: mongoose.Types.ObjectId(eventId) }
+        },
+        { $sort: { date: -1 }},
+        { $limit : limit },
+        { $skip : skip },
+        {
+          $lookup: {
+            localField: "userId",
+            from: "users",
+            foreignField: "_id",
+            as: "user"
+          }
+        },
+        {
+            $replaceRoot: { 
+                newRoot: { 
+                    $mergeObjects: [ 
+                        { 
+                            $arrayElemAt: [ "$user", 0 ] 
+                        }, 
+                        "$$ROOT" 
+                    ] 
+                } 
+            }
+        },
+        { $project: 
+            { 
+                userId: 1, 
+                eventId: 1, 
+                type: 1, 
+                message: 1, 
+                date: 1, 
+                name: 1 
+            } 
+        }
+      ])
 };
 
 exports.createChatMessage = async (data) => {