UPDATE: setup routes in app.js

pratik9333 · Jun 8, 2022 · 3d9f2fa · 3d9f2fa
1 parent 1234188
commit 3d9f2fa
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 49 deletions.
diff --git a/api/friend.api.js b/api/friend.api.js
@@ -8,9 +8,9 @@ const {
 const isLoggedIn = require("../middlewares/authenticate.middleware");
 
 //send friend request
-router.route("/user/request/friend/:userId").put(isLoggedIn, sendFriendRequest);
+router.route("/request/:userId").put(isLoggedIn, sendFriendRequest);
 
 //add friend
-router.route("/user/add/friend/:userId").put(isLoggedIn, addFriend);
+router.route("/add/:userId").put(isLoggedIn, addFriend);
 
 module.exports = router;
diff --git a/api/user.api.js b/api/user.api.js
@@ -4,17 +4,21 @@ const {
   getUserDashboard,
   updateUserDetails,
   getUsers,
+  getLeaderBoardData,
 } = require("../controllers/user.controller");
 
 const isLoggedIn = require("../middlewares/authenticate.middleware");
 
 //get user dashboard
-router.route("/user/dashboard").get(isLoggedIn, getUserDashboard);
+router.route("/dashboard").get(isLoggedIn, getUserDashboard);
 
 //update user
-router.route("/user").put(isLoggedIn, updateUserDetails);
+router.route("/").put(isLoggedIn, updateUserDetails);
 
 //get users
-router.route("/users").get(isLoggedIn, getUsers);
+router.route("/").get(isLoggedIn, getUsers);
+
+// get leaderboard data
+router.route("/leaderboard").get(isLoggedIn, getLeaderBoardData);
 
 module.exports = router;
diff --git a/api/vote.api.js b/api/vote.api.js
@@ -8,9 +8,6 @@ const {
 const isLoggedIn = require("../middlewares/authenticate.middleware");
 
 //rate friend
-router.route("/user/rate/:action/:userId").put(isLoggedIn, rateUser);
-
-// get leaderboard data
-router.route("/users/leaderboard").get(isLoggedIn, getLeaderBoardData);
+router.route("/user/:action/:userId").put(isLoggedIn, rateUser);
 
 module.exports = router;
diff --git a/app.js b/app.js
@@ -4,7 +4,6 @@ const express = require("express");
 const app = express();
 const cookieParser = require("cookie-parser");
 const fileUpload = require("express-fileupload");
-const AppError = require("./utils/Errors/customError");
 
 //regular middleware
 app.use(express.json());
@@ -29,12 +28,11 @@ app.get("/", (req, res) => {
 
 //import all routes here
 const user = require("./api/user.api");
-const User = require("./models/User.model");
+const friend = require("./api/friend.api");
+const vote = require("./api/vote.api");
+const auth = require("./api/auth.api");
 
-// handling error if any of routes does not match
-app.all("*", (req, res, next) => {
-  next(new AppError(`Can't find ${req.originalUrl} on this server!`, 404));
-});
+const User = require("./models/User.model");
 
 // scheduler to remove expired rated users
 app.put("/api/task", async (req, res) => {
@@ -62,6 +60,9 @@ app.put("/api/task", async (req, res) => {
 });
 
 //router middleware
-app.use("/api/v1", user);
+app.use("/api/v1/user", user);
+app.use("/api/v1/friend", friend);
+app.use("/api/v1/rate", user);
+app.use("/api/v1", auth);
 
 module.exports = app;
diff --git a/controllers/user.controller.js b/controllers/user.controller.js
@@ -130,3 +130,32 @@ exports.getUsers = async (req, res) => {
       .json({ error: "Server has occured some problem, please try again" });
   }
 };
+
+exports.getLeaderBoardData = async (req, res) => {
+  try {
+    const usersCount = await User.countDocuments();
+    const resultPerPage = 10;
+
+    const userObj = new Query(User.find(), req.query);
+
+    userObj.sort();
+
+    userObj.pager(resultPerPage);
+
+    let Users = await userObj.base;
+    let filteredUsers = Users.length;
+
+    return res.status(200).json({
+      success: true,
+      data: Users,
+      filteredUsers,
+      usersCount,
+    });
+  } catch (error) {
+    console.log(error);
+    return res.status(400).json({
+      success: false,
+      data: error.message,
+    });
+  }
+};
diff --git a/controllers/vote.controller.js b/controllers/vote.controller.js
@@ -1,6 +1,9 @@
 const Query = require("../utils/query");
 const User = require("../models/User.model");
 
+// 1 min = 60,000 milliseconds
+const oneMinToMilli = 60_000;
+
 const updateExpiryTimeForRating = 2 * oneMinToMilli;
 
 exports.rateUser = async (req, res) => {
@@ -58,32 +61,3 @@ exports.rateUser = async (req, res) => {
       .json({ error: "Server has occured some problem, please try again" });
   }
 };
-
-exports.getLeaderBoardData = async (req, res) => {
-  try {
-    const usersCount = await User.countDocuments();
-    const resultPerPage = 10;
-
-    const userObj = new Query(User.find(), req.query);
-
-    userObj.sort();
-
-    userObj.pager(resultPerPage);
-
-    let Users = await userObj.base;
-    let filteredUsers = Users.length;
-
-    return res.status(200).json({
-      success: true,
-      data: Users,
-      filteredUsers,
-      usersCount,
-    });
-  } catch (error) {
-    console.log(error);
-    return res.status(400).json({
-      success: false,
-      data: error.message,
-    });
-  }
-};
diff --git a/models/Friends.model.js b/models/Friends.model.js
@@ -3,8 +3,8 @@ const mongoose = require("mongoose");
 
 const friendSchema = new mongoose.Schema(
   {
-    requester: { type: Schema.Types.ObjectId, ref: "User" },
-    recipient: { type: Schema.Types.ObjectId, ref: "User" },
+    requester: { type: mongoose.Schema.ObjectId, ref: "User" },
+    recipient: { type: mongoose.Schema.ObjectId, ref: "User" },
     status: {
       type: Number,
       enums: [

diff --git a/models/Votes.model.js b/models/Votes.model.js
@@ -3,8 +3,8 @@ const mongoose = require("mongoose");
 
 const votingSchema = new mongoose.Schema(
   {
-    user: { type: Schema.Types.ObjectId, ref: "User" },
-    voter: { type: Schema.Types.ObjectId, ref: "User" },
+    user: { type: mongoose.Schema.ObjectId, ref: "User" },
+    voter: { type: mongoose.Schema.ObjectId, ref: "User" },
     status: {
       type: Number,
       enums: [