fix: bug #1

src/controller/area.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(areaData);
+      res.send(areaData);
     } catch (error) {
       next(error);
     }
@@ -49,7 +49,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(areaData);
+      res.send(areaData);
     } catch (error) {
       next(error);
     }
@@ -86,7 +86,7 @@ module.exports = {
       if (zone_id) areaData.zone_id = mongoose.Types.ObjectId(zone_id);
 
       await areaData.save();
-      req.send(areaData);
+      res.send(areaData);
     } catch (error) {
       next(error);
     }

src/controller/bay.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(bayData);
+      res.send(bayData);
     } catch (error) {
       next(error);
     }
@@ -50,7 +50,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(bayData);
+      res.send(bayData);
     } catch (error) {
       next(error);
     }
@@ -88,7 +88,7 @@ module.exports = {
       if (row_id) bayData.row_id = mongoose.Types.ObjectId(row_id);
 
       await bayData.save();
-      req.send(bayData);
+      res.send(bayData);
     } catch (error) {
       next(error);
     }

src/controller/company.controller.js

@@ -18,7 +18,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(companyData);
+      res.send(companyData);
     } catch (error) {
       next(error);
     }
@@ -48,7 +48,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(companyData);
+      res.send(companyData);
     } catch (error) {
       next(error);
     }
@@ -85,7 +85,7 @@ module.exports = {
       if (business_info) companyData.business_info = business_info;
 
       await companyData.save();
-      req.send(companyData);
+      res.send(companyData);
     } catch (error) {
       next(error);
     }

src/controller/index.js

@@ -12,6 +12,9 @@ const bayRouter = require("./bay.router");
 const rowRouter = require("./row.router");
 const levelRouter = require("./level.router");
 const dashboardRouter = require("./dashboard.router");
+const inventoryRouter = require("./inventory.router");
+const materialRouter = require("./material.router");
+const itemRouter = require("./item.router");
 
 router.use("/user-role", AuthenticateMiddleware, userRoleRouter);
 router.use("/user-permission", AuthenticateMiddleware, userPermissionRouter);
@@ -24,13 +27,16 @@ router.use("/bay", bayRouter);
 router.use("/row", rowRouter);
 router.use("/level", levelRouter);
 router.use("/dashboard", dashboardRouter);
+router.use("/inventory", inventoryRouter);
+router.use("/material", materialRouter);
+router.use("/item", itemRouter);
 
 router.get("/", (req, res) => {
   res.send({ success: true, message: "Hello world" });
 });
 
 router.use(function (err, req, res, next) {
-  console.error(err.stack);
+  console.error(err.message, err.stack);
   res.status(500).send({ success: false, error: `Error: ${err.message}` });
 });
 

src/controller/inventory.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: inventoryData });
+      res.send({ success: true, data: inventoryData });
     } catch (error) {
       next(error);
     }
@@ -47,7 +47,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: inventoryData });
+      res.send({ success: true, data: inventoryData });
     } catch (error) {
       next(error);
     }
@@ -82,7 +82,7 @@ module.exports = {
       if (type) inventoryData.type = type;
 
       await inventoryData.save();
-      req.send({ success: true, data: inventoryData });
+      res.send({ success: true, data: inventoryData });
     } catch (error) {
       next(error);
     }
@@ -92,11 +92,11 @@ module.exports = {
    */
   getInventoryByType: async (req, res, next) => {
     let { type, page, perPage } = req.query;
-    page = page || 0;
-    perPage = perPage || 10;
+    page = page ? parseInt(page) : 0;
+    perPage = perPage ? parseInt(perPage) : 10;
 
     if (!type || !InventoryTypes.includes(type)) {
-      res.status(400).send("Missing/Invalid type param");
+      res.status(400).send({ success: false, error: "Missing/Invalid type param" });
       return;
     }
 
@@ -104,13 +104,13 @@ module.exports = {
       const inventoryData = await Inventory.find(
         { type: type },
         { id: 1, name: 1, type: 1 },
-        { skip: page * perPage, limit: perPage }
+        { skip: parseInt(page) * parseInt(perPage), limit: parseInt(perPage) }
       );
       if (!inventoryData) {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: inventoryData });
+      res.send({ success: true, data: inventoryData });
     } catch (error) {
       next(error);
     }

src/controller/inventory.router.js

@@ -1,11 +1,6 @@
 const router = require("express").Router();
 const controller = require("./inventory.controller");
 
-/**
- * @route /inventory/:id
- */
-router.get("/:id", controller.getInventoryByID);
-
 /**
  * @route /inventory/
  */
@@ -21,4 +16,9 @@ router.patch("/:id", controller.updateInventoryByID);
  */
 router.get("/filter-by-type", controller.getInventoryByType);
 
+/**
+ * @route /inventory/:id
+ */
+router.get("/:id", controller.getInventoryByID);
+
 module.exports = router;

src/controller/item.controller.js

@@ -22,7 +22,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: itemData });
+      res.send({ success: true, data: itemData });
     } catch (error) {
       next(error);
     }
@@ -66,7 +66,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: itemData });
+      res.send({ success: true, data: itemData });
     } catch (error) {
       next(error);
     }
@@ -113,7 +113,7 @@ module.exports = {
       }
 
       await itemData.save();
-      req.send({ success: true, data: itemData });
+      res.send({ success: true, data: itemData });
     } catch (error) {
       next(error);
     }
@@ -124,8 +124,8 @@ module.exports = {
    */
   getItemsByFilter: async (req, res, next) => {
     let { family, type, page, perPage } = req.query;
-    page = page || 0;
-    perPage = perPage || 10;
+    page = page ? parseInt(page) : 0;
+    perPage = perPage ? parseInt(perPage) : 10;
     let inventories;
     let materials;
     let itemFilters;
@@ -181,7 +181,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: itemData });
+      res.send({ success: true, data: itemData });
     } catch (error) {
       next(error);
     }

src/controller/item.router.js

@@ -1,11 +1,6 @@
 const router = require("express").Router();
 const controller = require("./item.controller");
 
-/**
- * @route /item/:id
- */
-router.get("/:id", controller.getItemByID);
-
 /**
  * @route /item/
  */
@@ -21,4 +16,9 @@ router.patch("/:id", controller.updateItemByID);
  */
 router.get("/filter", controller.getItemsByFilter);
 
+/**
+ * @route /item/:id
+ */
+router.get("/:id", controller.getItemByID);
+
 module.exports = router;

src/controller/level.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(levelData);
+      res.send(levelData);
     } catch (error) {
       next(error);
     }
@@ -49,7 +49,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(levelData);
+      res.send(levelData);
     } catch (error) {
       next(error);
     }
@@ -86,7 +86,7 @@ module.exports = {
       if (bay_id) levelData.bay_id = mongoose.Types.ObjectId(bay_id);
 
       await levelData.save();
-      req.send(levelData);
+      res.send(levelData);
     } catch (error) {
       next(error);
     }

src/controller/material.controller.js

@@ -20,7 +20,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: materialData });
+      res.send({ success: true, data: materialData });
     } catch (error) {
       next(error);
     }
@@ -35,7 +35,7 @@ module.exports = {
     try {
       let parent;
       if (parentId && mongoose.isValidObjectId(parentId)) {
-        parent = await Material.findById(parent);
+        parent = await Material.findById(parentId);
       } else if (parentId && !mongoose.isValidObjectId(parentId)) {
         res.status(400).send("Invalid params parentId");
         return;
@@ -60,7 +60,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: materialData });
+      res.send({ success: true, data: materialData });
     } catch (error) {
       next(error);
     }
@@ -97,7 +97,7 @@ module.exports = {
 
       let parent;
       if (parentId && mongoose.isValidObjectId(parentId)) {
-        parent = await Material.findById(parent);
+        parent = await Material.findById(parentId);
         materialData.parent = parent;
       } else if (parentId && !mongoose.isValidObjectId(parentId)) {
         res.status(400).send("Invalid params parentId");
@@ -108,13 +108,13 @@ module.exports = {
       if (inventoryId && mongoose.isValidObjectId(inventoryId)) {
         inventory = await Inventory.findById(inventoryId);
         materialData.inventory = inventory;
-      } else {
+      } else if (inventoryId && !mongoose.isValidObjectId(inventoryId)) {
         res.status(400).send("Invalid params inventoryId");
         return;
       }
 
       await materialData.save();
-      req.send({ success: true, data: materialData });
+      res.send({ success: true, data: materialData });
     } catch (error) {
       next(error);
     }
@@ -124,8 +124,8 @@ module.exports = {
    */
   getMaterialByInventory: async (req, res, next) => {
     let { inventory, page, perPage } = req.query;
-    page = page || 0;
-    perPage = perPage || 10;
+    page = page ? parseInt(page) : 0;
+    perPage = perPage ? parseInt(perPage) : 0;
 
     if (!inventory || !mongoose.isValidObjectId(inventory)) {
       res.status(400).send("Missing inventory param");
@@ -144,7 +144,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send({ success: true, data: materialData });
+      res.send({ success: true, data: materialData });
     } catch (error) {
       next(error);
     }

src/controller/material.router.js

@@ -1,11 +1,6 @@
 const router = require("express").Router();
 const controller = require("./material.controller");
 
-/**
- * @route /material/:id
- */
-router.get("/:id", controller.getMaterialByID);
-
 /**
  * @route /material/
  */
@@ -21,4 +16,9 @@ router.patch("/:id", controller.updateMaterialByID);
  */
 router.get("/search-by-inventory", controller.getMaterialByInventory);
 
+/**
+ * @route /material/:id
+ */
+router.get("/:id", controller.getMaterialByID);
+
 module.exports = router;

src/controller/row.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(rowData);
+      res.send(rowData);
     } catch (error) {
       next(error);
     }
@@ -49,7 +49,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(rowData);
+      res.send(rowData);
     } catch (error) {
       next(error);
     }
@@ -86,7 +86,7 @@ module.exports = {
       if (area_id) rowData.area_id = mongoose.Types.ObjectId(area_id);
 
       await rowData.save();
-      req.send(rowData);
+      res.send(rowData);
     } catch (error) {
       next(error);
     }

src/controller/user.controller.js

@@ -3,11 +3,7 @@ const jwt = require("jsonwebtoken");
 const mongoose = require("mongoose");
 
 const User = require("./../models/User");
-const {
-  JWT_SECRET,
-  JWT_REFRESH_EXPIRY_TIME,
-  JWT_ACCESS_EXPIRY_TIME,
-} = require("./../config/env");
+const { JWT_SECRET, JWT_REFRESH_EXPIRY_TIME, JWT_ACCESS_EXPIRY_TIME } = require("./../config/env");
 const UserRole = require("../models/UserRole");
 const UserPermission = require("../models/UserPermission");
 
@@ -24,12 +20,11 @@ const createRefreshToken = (id) => {
 };
 
 const getValidIds = async (ids, model) => {
-  const verifiedIds = ids.filter((permission) =>
-    mongoose.isValidObjectId(permission)
-  );
+  if (!ids) return [];
+  const verifiedIds = ids.filter((permission) => mongoose.isValidObjectId(permission));
   const verifiedObjects = await model
     .find({
-      id: { $in: verifiedIds },
+      _id: { $in: verifiedIds },
     })
     .select({ _id: 1 });
   return verifiedObjects.map((_) => _._id);
@@ -84,40 +79,48 @@ module.exports = {
   },
 
   addUserAccessControl: async (req, res, next) => {
-    const { user, roles, permissions } = req.body;
+    const { user } = req.params;
+    const { roles, permissions } = req.body;
     if (!mongoose.isValidObjectId(user)) {
       throw new Error(`invalid format for user id field`);
     }
-    const verifiedRoleIds = await getValidIds(roles, UserRole);
-    const verifiedPermissionIds = await getValidIds(
-      permissions,
-      UserPermission
-    );
-    const response = await User.findByIdAndUpdate(user, {
-      $push: {
-        roles: { $each: verifiedRoleIds },
-        permissions: { $each: verifiedPermissionIds },
+
+    let verifiedRoleIds = await getValidIds(roles, UserRole);
+    let verifiedPermissionIds = await getValidIds(permissions, UserPermission);
+    verifiedRoleIds = verifiedRoleIds || [];
+    verifiedPermissionIds = verifiedPermissionIds || [];
+
+    const response = await User.findByIdAndUpdate(
+      user,
+      {
+        $push: {
+          roles: { $each: verifiedRoleIds },
+          permissions: { $each: verifiedPermissionIds },
+        },
       },
-    });
+      { returnDocument: "after" }
+    );
     res.send({ success: true, data: response });
   },
 
   removeUserAccessControl: async (req, res, next) => {
-    const { user, roles, permissions } = req.body;
+    const { user } = req.params;
+    const { roles, permissions } = req.body;
     if (!mongoose.isValidObjectId(user)) {
       throw new Error(`invalid format for user id field`);
     }
     const verifiedRoleIds = await getValidIds(roles, UserRole);
-    const verifiedPermissionIds = await getValidIds(
-      permissions,
-      UserPermission
-    );
-    const response = await User.findByIdAndUpdate(user, {
-      $pull: {
-        roles: { $in: verifiedRoleIds },
-        permissions: { $in: verifiedPermissionIds },
+    const verifiedPermissionIds = await getValidIds(permissions, UserPermission);
+    const response = await User.findByIdAndUpdate(
+      user,
+      {
+        $pull: {
+          roles: { $in: verifiedRoleIds },
+          permissions: { $in: verifiedPermissionIds },
+        },
       },
-    });
+      { returnDocument: "after" }
+    );
     res.send({ success: true, data: response });
   },
 };

src/controller/user.router.js

@@ -4,17 +4,7 @@ const { SuperAdminCheck, AuthenticateMiddleware } = require("./utils/authorize")
 
 router.post("/register", controller.registerUser);
 router.post("/login", controller.loginUser);
-router.post(
-  "/:id/addAccess",
-  AuthenticateMiddleware,
-  SuperAdminCheck,
-  controller.addUserAccessControl
-);
-router.post(
-  "/:id/removeAccess",
-  AuthenticateMiddleware,
-  SuperAdminCheck,
-  controller.removeUserAccessControl
-);
+router.post("/:user/add-access", AuthenticateMiddleware, SuperAdminCheck, controller.addUserAccessControl);
+router.post("/:user/remove-access", AuthenticateMiddleware, SuperAdminCheck, controller.removeUserAccessControl);
 
 module.exports = router;

src/controller/userPermission.controller.js

@@ -30,8 +30,8 @@ const getScopes = async (scopes, searchSet) => {
 module.exports = {
   getAllPermissions: async (req, res, next) => {
     let { page, perPage } = req.query;
-    page = page || 0;
-    perPage = perPage || 10;
+    page = page ? parseInt(page) : 0;
+    perPage = perPage ? parseInt(perPage) : 10;
 
     const result = await UserPermission.find(
       {},

src/controller/userRole.controller.js

@@ -3,9 +3,8 @@ const UserRole = require("../models/UserRole");
 const UserPermission = require("../models/UserPermission");
 
 const getValidPermissions = async (permissions) => {
-  const verifiedPermissions = permissions.filter((permission) =>
-    mongoose.isValidObjectId(permission)
-  );
+  const verifiedPermissions = permissions.filter((permission) => mongoose.isValidObjectId(permission));
+  if (verifiedPermissions.length === 0) return [];
   const permissionObjects = await UserPermission.find({
     id: { $in: verifiedPermissions },
   }).select({ _id: 1 });
@@ -15,8 +14,8 @@ const getValidPermissions = async (permissions) => {
 module.exports = {
   getAllRoles: async (req, res, next) => {
     let { page, perPage } = req.query;
-    page = page || 0;
-    perPage = perPage || 10;
+    page = page ? parseInt(page) : 0;
+    perPage = perPage ? parseInt(perPage) : 10;
 
     const result = await UserRole.find(
       {},

src/controller/utils/authorize.js

@@ -38,7 +38,7 @@ const authorize = async (
 module.exports = {
   SuperAdminCheck: async (req, res, next) => {
     const SuperAdmin = await UserRole.findOne({ name: SUPER_ADMIN_ROLE });
-    if (authorize(req.locals.user, [SuperAdmin.id])) {
+    if (authorize(res.locals.user, [SuperAdmin.id])) {
       next();
     } else {
       res
@@ -50,7 +50,7 @@ module.exports = {
     try {
       const token = req.headers.authorization || "";
       if (token) {
-        const user = authenticate(token);
+        const user = await authenticate(token);
         res.locals.user = user;
         next();
       } else {

src/controller/warehouse.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(warehouseData);
+      res.send(warehouseData);
     } catch (error) {
       next(error);
     }
@@ -49,7 +49,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(warehouseData);
+      res.send(warehouseData);
     } catch (error) {
       next(error);
     }
@@ -108,7 +108,7 @@ module.exports = {
       if (company_id) warehouseData.company_id = mongoose.Types.ObjectId(company_id);
 
       await warehouseData.save();
-      req.send(warehouseData);
+      res.send(warehouseData);
     } catch (error) {
       next(error);
     }

src/controller/zone.controller.js

@@ -19,7 +19,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(zoneData);
+      res.send(zoneData);
     } catch (error) {
       next(error);
     }
@@ -49,7 +49,7 @@ module.exports = {
         res.status(404);
         return;
       }
-      req.send(zoneData);
+      res.send(zoneData);
     } catch (error) {
       next(error);
     }
@@ -86,7 +86,7 @@ module.exports = {
       if (warehouse_id) zoneData.warehouse_id = mongoose.Types.ObjectId(warehouse_id);
 
       await zoneData.save();
-      req.send(zoneData);
+      res.send(zoneData);
     } catch (error) {
       next(error);
     }

src/models/Inventory.js

@@ -17,15 +17,12 @@ const schema = new mongoose.Schema(
     policies: {
       tracking: {
         type: Object, // Create a different model and reference it here once more details available
-        required: true,
       },
       alerting: {
         type: Object, // Create a different model and reference it here once more details available
-        required: true,
       },
       replenishment: {
         type: Object, // Create a different model and reference it here once more details available
-        required: true,
       },
     },
   },