Sync-up PR (Prakhar)

dbTools.js

@@ -31,15 +31,21 @@ async function clearFiles() {
 
 sequelize.sync({ alter: true })
     .then(() => {
-        if (!process.argv[2] || process.argv[2].length == 0) { console.log("No tool activated."); return; }
-        if (process.argv[2].toLowerCase() == "reset") {
-            resetDB()
-        } else if (process.argv[2].toLowerCase() == "clearfiles") {
-            clearFiles()
-        } else {
+        const tools = process.argv.slice(2)
+        if (tools.length == 0) {
             console.log("No tool activated.")
             return
         }
+        console.log(`Tools activated: ${tools.join(", ")}`)
+        console.log()
+
+        if (tools.includes("reset")) {
+            resetDB()
+        }
+
+        if (tools.includes("clearfiles")) {
+            clearFiles()
+        }
     })
     .catch(err => {
         console.error(err)

index.js

@@ -2,7 +2,8 @@ require('./services/BootCheck').check()
 const express = require('express');
 const cors = require('cors');
 const { v4: uuidv4 } = require('uuid')
-const { FoodListing, Host } = require('./models')
+const { FoodListing, Guest, Host } = require('./models')
+const Encryption = require("./services/Encryption")
 require('dotenv').config()
 
 const env = process.env.DB_CONFIG || 'development';
@@ -12,7 +13,6 @@ const SEQUELIZE_ACTIVE = true;
 
 // Set up services
 const Universal = require('./services/Universal')
-const FileOps = require('./services/FileOps')
 
 const Logger = require('./services/Logger')
 Logger.setup()
@@ -26,17 +26,21 @@ Cache.load();
 const FileManager = require('./services/FileManager');
 FileManager.setup().catch(err => { Logger.logAndThrow(err) })
 
+
+
 // Import middleware
 const checkHeaders = require('./middleware/headersCheck');
 const logRoutes = require('./middleware/logRoutes');
 
-// Configure express app
+// Configure express app and chat web socket server
 const app = express();
 app.use(cors())
 app.use(express.json())
 app.use(express.urlencoded({ extended: true }))
 // app.use(express.static('public'))
 app.set("view engine", "ejs");
+const startWebSocketServer = require('./routes/chat/WebSocketServer');
+startWebSocketServer(app);
 
 // Top-level middleware
 if (config["routeLogging"] !== false) { app.use(logRoutes) }
@@ -57,42 +61,43 @@ app.use("/reviews", require("./routes/reviews/reviews"));
 app.use("/createAccount", require('./routes/identity/createAccount'));
 app.use("/loginAccount", require('./routes/identity/loginAccount'));
 app.use("/accountRecovery", require('./routes/identity/accountRecovery'));
+app.use("/identity/emailVerification", require('./routes/identity/emailVerification'));
+app.use("/identity/myAccount", require("./routes/identity/myAccount"));
 app.use("/listings", require("./routes/listings/listings"));
 app.use("/", require("./routes/orders/listingDetails"));
 
 async function onDBSynchronise() {
-    const currentDatetime = new Date()
-    const datetime = new Date(currentDatetime.getTime() + 24 * 60 * 60 * 1000).toISOString();
-
-    const listings = await FoodListing.findAll()
-    if (listings.length > 0) {
-        Universal.data["DUMMY_LISTING_ID"] = listings[0].listingID
-        console.log(`Found existing listing, using as dummy. Listing ID: ${listings[0].listingID}`)
+    const guests = await Guest.findAll()
+    if (guests.length > 0) {
+        Universal.data["DUMMY_GUEST_ID"] = guests[0].userID
+        Universal.data["DUMMY_GUEST_USERNAME"] = guests[0].username
+        console.log(`Found existing guest, using as dummy. Guest User ID: ${guests[0].userID}`)
     } else {
-        const newListing = await FoodListing.create({
-            listingID: uuidv4(),
-            title: "Chili Crab for Dinner",
-            images: "sample3.jpg",
-            shortDescription: "Making chili crab for dinner again! Come join!",
-            longDescription: "Seeing that chili crab last time was a hit, cooking some again! Bought fresh groceries from the market today for it too. Come join me for dinner!",
-            portionPrice: "5.00",
-            approxAddress: "Near Tampines West Community Centre, Singapore",
-            address: "Block 67, Tampines Avenue 10, Singapore 520678",
-            totalSlots: "5",
-            datetime: datetime,
-            published: false
+        const newGuest = await Guest.create({
+            userID: "47f4497b-1331-4b8a-97a4-095a79a1fd48",
+            username: "Susie Jones",
+            email: "susie_jones@gmail.com",
+            password: await Encryption.hash("SusieJones123"),
+            contactNum: "82228111",
+            address: "Block 321, Hougang Avenue 10, #10-567",
+            emailVerified: false,
+            favCuisine: "",
+            mealsMatched: 0,
+            resetKey: "265c18",
+            resetKeyExpiration: "2024-06-22T14:30:00.000Z"
         })
-        Universal.data["DUMMY_LISTING_ID"] = newListing.listingID
-        console.log(`Created dummy listing with ID: ${newListing.listingID}`)
+        Universal.data["DUMMY_GUEST_ID"] = newGuest.userID
+        Universal.data["DUMMY_GUEST_USERNAME"] = newGuest.username
+        console.log(`Created dummy guest with User ID: ${newGuest.userID}`)
     }
-
+  
     const joshuasHost = await Host.findByPk("272d3d17-fa63-49c4-b1ef-1a3b7fe63cf4")
     if (!joshuasHost) {
         const newHost = await Host.create({
             "userID": "272d3d17-fa63-49c4-b1ef-1a3b7fe63cf4",
             "username": "Jamie Oliver",
             "email": "jamie_oliver@gmail.com",
-            "password": "123456789",
+            "password": await Encryption.hash("123456789"),
             "contactNum": "81118222",
             "address": "12 Washington Avenue",
             "emailVerified": false,
@@ -106,9 +111,15 @@ async function onDBSynchronise() {
         if (!newHost) {
             console.log("WARNING: Failed to create dummy host.")
         } else {
+            Universal.data["DUMMY_HOST_ID"] = newHost.userID
+            Universal.data["DUMMY_HOST_USERNAME"] = newHost.username
+            Universal.data["DUMMY_HOST_FOODRATING"] = newHost.foodRating
             console.log("Created dummy host.")
         }
     } else {
+        Universal.data["DUMMY_HOST_ID"] = joshuasHost.userID
+        Universal.data["DUMMY_HOST_USERNAME"] = joshuasHost.username
+        Universal.data["DUMMY_HOST_FOODRATING"] = joshuasHost.foodRating
         console.log("Found dummy host existing already, skipping creation.")
     }
 }
@@ -121,7 +132,7 @@ if (!SEQUELIZE_ACTIVE) {
 } else {
     // Server initialisation with sequelize
     const db = require("./models");
-    db.sequelize.sync({ alter: true })
+    db.sequelize.sync()
         .then(() => {
             // Create sample FoodListing
             onDBSynchronise()

middleware/auth.js

@@ -1,3 +1,27 @@
-require('dotenv').config()
+const jwt = require('jsonwebtoken');
+require('dotenv').config();
 
-// TODO
+const validateToken = (req, res, next) => {
+    const authHeader = req.headers.authorization;
+    if (!authHeader) {
+        console.error('No authorization header');
+        return res.sendStatus(401);
+    }
+
+    const token = authHeader.split(' ')[1];
+    if (!token) {
+        console.error('No token found in authorization header');
+        return res.sendStatus(401);
+    }
+
+    jwt.verify(token, process.env.JWT_KEY, (err, user) => {
+        if (err) {
+            console.error('Token verification failed:', err);
+            return res.sendStatus(403);
+        }
+        // console.log("Decoded this user: " + user)
+        req.user = user;
+        next();
+    });
+};
+module.exports = { validateToken };

package.json

@@ -12,20 +12,23 @@
   "dependencies": {
     "axios": "^1.7.2",
     "bcrypt": "^5.1.1",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "ejs": "^3.1.10",
     "express": "^4.19.2",
+    "express-ws": "^5.0.2",
     "firebase": "^10.12.2",
     "firebase-admin": "^12.1.1",
     "fs": "^0.0.1-security",
+    "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
     "mysql2": "^3.10.0",
     "nodemailer": "^6.9.13",
     "sequelize": "^6.37.3",
     "sqlite3": "^5.1.7",
     "uuid": "^10.0.0",
-    "yup": "^1.4.0",
-    "uuidv4": "^6.2.13"
+    "uuidv4": "^6.2.13",
+    "yup": "^1.4.0"
   }
 }

routes/cdn/coreData.js

@@ -2,7 +2,39 @@ const express = require("express");
 const router = express.Router();
 const path = require("path");
 const FileManager = require("../../services/FileManager");
-const { FoodListing, Host, Guest, Admin } = require("../../models");
+const { FoodListing, Host, Guest, Admin, Review } = require("../../models");
+const Logger = require("../../services/Logger");
+const { Sequelize } = require('sequelize');
+const Universal = require("../../services/Universal");
+const { validateToken } = require("../../middleware/auth");
+
+router.get('/MyAccount', validateToken, (req, res) => {
+    const userInfo = req.user;
+    console.log(userInfo)
+    res.json(userInfo);
+});
+
+router.get("/fetchHostDetails", async (req, res) => {
+    const hostDetails = {
+        hostUsername: Universal.data["DUMMY_HOST_USERNAME"],
+        hostFoodRating: Universal.data["DUMMY_HOST_FOODRATING"]
+    }
+    res.status(200).json(hostDetails);
+})
+
+router.get("/fetchGuestDetails", async (req, res) => {
+    const targetGuest = await Guest.findByPk(Universal.data["DUMMY_GUEST_ID"])
+    if (!targetGuest) {
+        return res.status(404).send("Dummy Guest not found.");
+    }
+    const guestFavCuisine = targetGuest.favCuisine;
+    const guestDetails = {
+        guestUserID: Universal.data["DUMMY_GUEST_ID"],
+        guestUsername: Universal.data["DUMMY_GUEST_USERNAME"],
+        guestFavCuisine: guestFavCuisine
+    }
+    res.status(200).json(guestDetails);
+})
 
 router.get("/listings", async (req, res) => { // GET all food listings
     try {
@@ -14,6 +46,25 @@ router.get("/listings", async (req, res) => { // GET all food listings
     }
 });
 
+router.get("/checkFavouriteListing", async (req, res) => { // GET favourite listing
+    try {
+        const listingID = req.query.listingID;
+        const userID = req.query.userID;
+        const guest = await Guest.findByPk(userID);
+        if (!guest) {
+            return res.status(404).send("Guest not found.");
+        }
+        const favouriteCuisines = guest.favCuisine.split("|");
+        if (favouriteCuisines.includes(listingID)) {
+            res.status(200).json({ message: "SUCCESS: Listing is a favourite", listingIsFavourite: true });
+        } else {
+            res.status(200).json({ message: "SUCCESS: Listing is not a favourite", listingIsFavourite: false });
+        }
+    } catch (error) {
+        res.status(500).send("ERROR: Internal server error");
+    }
+});
+
 router.get("/getListing", async (req, res) => {
     const listingID = req.query.id || req.body.listingID;
     if (!listingID) {
@@ -80,26 +131,84 @@ router.get("/accountInfo", async (req, res) => { // GET account information
             accountInfo.mealsMatched = user.mealsMatched;
         }
 
-        // console.log(`Account info for userID ${targetUserID}: ${JSON.stringify(accountInfo)}`)
         res.status(200).json(accountInfo);
 
     } catch (err) {
         res.status(500).send("An error occured while fetching the account information.")
     }
 })
 
-router.get("/getReviews", (req, res) => { // GET full reviews list
-    res.json({}); // Placeholder, change later
+router.get("/getReviews", async (req, res) => { // GET full reviews list
+    try {
+        const where = {};
+        const order = [];
+
+        if (!req.query.hostID) {
+            return res.status(400).send("UERROR: Missing host ID or order.");
+        } else {
+            where.hostID = req.query.hostID;
+        }
+
+        if (req.query.order) {
+            if (req.query.order === "mostRecent") {
+                order.push(['dateCreated', 'DESC']);
+            } else if (req.query.order === "highestRating") {
+                order.push([
+                    Sequelize.literal('foodRating + hygieneRating'), 'DESC'
+                ])
+            } else if (req.query.order === "lowestRating") {
+                order.push([
+                    Sequelize.literal('foodRating + hygieneRating'), 'ASC'
+                ])
+            } else {
+                order.push(['dateCreated', 'DESC']);
+            }
+        }
+
+        try {
+            const host = await Host.findByPk(req.query.hostID);
+            if (!host) {
+                return res.status(404).send("UERROR: Host not found.");
+            } else {
+                const reviews = await Review.findAll({
+                    where,
+                    order,
+                })
+
+                if (req.query.order === "images") {
+                    reviews.sort((a, b) => {
+                        const imageCountA = a.images ? a.images.split("|").length : 0;
+                        const imageCountB = b.images ? b.images.split("|").length : 0;
+                        return imageCountB - imageCountA;
+                    });
+                }
+
+                if (reviews.length > 0) {
+                    res.json(reviews);
+                }
+            }
+        } catch (err) {
+            Logger.log(`CDN COREDATA GETREVIEWS ERROR: Failed to retrieve reviews; error: ${err}.`);
+            return res.status(404).send("ERROR: No reviews found.");
+        }
+
+    } catch (err) {
+        Logger.log(`CDN COREDATA GETREVIEWS ERROR: Failed to retrieve reviews; error: ${err}.`);
+        return res.status(500).send("ERROR: An error occured while fetching reviews.");
+    }
 })
 
-router.get("/reviews", (req, res) => { // GET review from review id
-    res.send("TBC")
-    // const review = reviews[req.query.id];
-    // if (review) {
-    //     res.json(review);
-    // } else {
-    //     res.status(404).send(`Review with ID ${req.params.id} not found`);
-    // }
+router.get("/reviews", async (req, res) => { // GET review from review id
+    if (!req.query.id) {
+        return res.status(400).send("UERROR: Missing review ID");
+    } else {
+        const review = await Review.findByPk(req.query.id);
+        if (review) {
+            res.json(review);
+        } else {
+            return res.status(404).send(`ERROR: Review with ID ${req.params.id} not found`);
+        }
+    }
 })
 
 module.exports = router;