From 4e56bb6948e37d0e01320802f3c0ed046cec057f Mon Sep 17 00:00:00 2001 From: Llewellyn D'souza Date: Tue, 1 Feb 2022 16:46:15 +0530 Subject: [PATCH 1/3] Added: get all warehouses --- src/controller/warehouse.controller.js | 8 ++++++++ src/controller/warehouse.router.js | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/src/controller/warehouse.controller.js b/src/controller/warehouse.controller.js index 3b7803b..267bb1e 100644 --- a/src/controller/warehouse.controller.js +++ b/src/controller/warehouse.controller.js @@ -2,6 +2,14 @@ const Warehouse = require("../models/Warehouse"); const mongoose = require("mongoose"); module.exports = { + getAllWarehouses: async (req, res, next) => { + try { + const warehouses = await Warehouse.find(); + res.send({ success: true, data: warehouses }); + } catch (error) { + next(error); + } + }, /** * Gets the warehouse data by `id` */ diff --git a/src/controller/warehouse.router.js b/src/controller/warehouse.router.js index cd8bf99..56ec163 100644 --- a/src/controller/warehouse.router.js +++ b/src/controller/warehouse.router.js @@ -2,6 +2,11 @@ const router = require("express").Router(); const upload = require("../middleware/fileUpload"); const controller = require("./warehouse.controller"); +/** + * @route /warehouse/get-all + */ +router.get("/get-all", controller.getAllWarehouses); + /** * @route /warehouse/:id */ From b311bd2e700ca8915c556f5363aeee20493e196d Mon Sep 17 00:00:00 2001 From: Llewellyn D'souza Date: Tue, 1 Feb 2022 16:46:37 +0530 Subject: [PATCH 2/3] Fixed: return formats --- src/controller/warehouse.controller.js | 18 +++++++++--------- src/controller/warehouse.router.js | 6 +----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/controller/warehouse.controller.js b/src/controller/warehouse.controller.js index 267bb1e..0d72375 100644 --- a/src/controller/warehouse.controller.js +++ b/src/controller/warehouse.controller.js @@ -17,17 +17,17 @@ module.exports = { const { id } = req.params; if (!id) { - res.status(400).send("Missing id param"); + res.status(400).send({ success: false, message: "Missing id param" }); return; } try { const warehouseData = await Warehouse.findById(id); if (!warehouseData) { - res.status(404); + res.status(404).send({ success: false, message: "not found" }); return; } - res.send(warehouseData); + res.send({ success: true, data: warehouseData }); } catch (error) { next(error); } @@ -54,10 +54,10 @@ module.exports = { await warehouseData.save(); if (!warehouseData) { - res.status(404); + res.status(404).send({ success: false, message: "not found" }); return; } - res.send(warehouseData); + res.send({ success: true, message: warehouseData }); } catch (error) { next(error); } @@ -92,21 +92,21 @@ module.exports = { const { id } = req.params; if (!id) { - res.status(400).send("Missing id param"); + res.status(400).send({ success: false, message: "Missing ID param" }); return; } const { name, address, specs, company_id } = req.body; if (!(name || address || specs || company_id)) { - res.status(400).send("Missing data in body"); + res.status(400).send({ success: false, message: "Missing data in body" }); return; } try { const warehouseData = await Warehouse.findById(id); if (!warehouseData) { - res.status(404); + res.status(404).send({ success: false, message: "not found" }); return; } @@ -116,7 +116,7 @@ module.exports = { if (company_id) warehouseData.company_id = mongoose.Types.ObjectId(company_id); await warehouseData.save(); - res.send(warehouseData); + res.send({ success: true, data: warehouseData }); } catch (error) { next(error); } diff --git a/src/controller/warehouse.router.js b/src/controller/warehouse.router.js index 56ec163..9e099aa 100644 --- a/src/controller/warehouse.router.js +++ b/src/controller/warehouse.router.js @@ -20,11 +20,7 @@ router.post("/", controller.createWarehouse); /** * @route /warehouse/add-image */ -router.post( - "/add-image/:id", - upload.single("warehouse-image"), - controller.addWarehouseImage -); +router.post("/add-image/:id", upload.single("warehouse-image"), controller.addWarehouseImage); /** * @route /warehouse/ From 9065c0b2a37d61529f7fecac2dd5cc5063b7679b Mon Sep 17 00:00:00 2001 From: Llewellyn D'souza Date: Tue, 1 Feb 2022 16:46:54 +0530 Subject: [PATCH 3/3] Removed: unnecessary log --- src/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.js b/src/index.js index 726f7a0..0f2369b 100644 --- a/src/index.js +++ b/src/index.js @@ -13,8 +13,6 @@ const { const db = require("./config/db/connect"); (async () => { - console.log("Connecting to MongoDB ..."); - await db.connect(); const app = express();