From c2454f7e98de2bdfee3ac36e7193d58b1edd159d Mon Sep 17 00:00:00 2001 From: Molly Su Date: Sun, 21 Jan 2024 23:04:05 +0800 Subject: [PATCH] Update --- server/dist/controllers/order.controller.js | 10 ++-------- server/dist/controllers/order.controller.js.map | 2 +- server/dist/controllers/post.controller.js | 2 +- server/dist/controllers/post.controller.js.map | 2 +- server/src/controllers/order.controller.ts | 10 +++------- server/src/controllers/post.controller.ts | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/server/dist/controllers/order.controller.js b/server/dist/controllers/order.controller.js index eec10c5..e04e944 100644 --- a/server/dist/controllers/order.controller.js +++ b/server/dist/controllers/order.controller.js @@ -20,14 +20,8 @@ const getOrders = (req, res) => __awaiter(void 0, void 0, void 0, function* () { try { const userId = yield (0, auth_middleware_1.default)(req); const role = yield user_model_1.UserModel.findById(userId).select('role'); - if (role == 'admin') { - const orders = yield order_model_1.OrderModel.find(); - res.status(200).json({ message: 'Orders fetched successfully!', orders }); - } - else { - const orders = yield order_model_1.OrderModel.find({ userId }); - res.status(200).json({ message: 'Orders fetched successfully!', orders }); - } + const orders = role == 'admin' ? yield order_model_1.OrderModel.find() : yield order_model_1.OrderModel.find({ userId }); + res.status(200).json({ message: 'Orders fetched successfully!', orders }); } catch (err) { res.status(500).json({ message: err.message }); diff --git a/server/dist/controllers/order.controller.js.map b/server/dist/controllers/order.controller.js.map index b485629..bbeacff 100644 --- a/server/dist/controllers/order.controller.js.map +++ b/server/dist/controllers/order.controller.js.map @@ -1 +1 @@ -{"version":3,"file":"order.controller.js","sourceRoot":"","sources":["../../src/controllers/order.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAgD;AAChD,qFAAiD;AACjD,uDAAkD;AAGlD,MAAM,SAAS,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;IACvD,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,IAAI,GAAW,MAAM,sBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACpE,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,MAAM,wBAAU,CAAC,IAAI,EAAE,CAAA;YACtC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1E,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,GAAG,MAAM,wBAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAChD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1E,CAAC;IACF,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,CAAC;AACF,CAAC,CAAA,CAAA;AA+CQ,8BAAS;AA7ClB,MAAM,YAAY,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;IAC1D,IAAI,CAAC;QACJ,MAAM,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAA;QACf,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,CAAC;AACF,CAAC,CAAA,CAAA;AAqCmB,oCAAY;AAnChC,MAAM,WAAW,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;IACzD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;IAClE,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC;YAC5B,MAAM;YACN,IAAI;YACJ,KAAK;YACL,OAAO;YACP,UAAU;YACV,WAAW;SACX,CAAC,CAAA;QACF,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,CAAC;AACF,CAAC,CAAA,CAAA;AAiBiC,kCAAW;AAf7C,MAAM,WAAW,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;IACzD,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;IAC1D,IAAI,CAAC;QACJ,MAAM,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAA;QACf,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,iBAAiB,CAC/C,GAAG,CAAC,MAAM,CAAC,EAAE,EACb,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,EACzC,EAAE,GAAG,EAAE,IAAI,EAAE,CACb,CAAA;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,CAAC;AACF,CAAC,CAAA,CAAA;AAE8C,kCAAW"} \ No newline at end of file +{"version":3,"file":"order.controller.js","sourceRoot":"","sources":["../../src/controllers/order.controller.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/server/dist/controllers/post.controller.js b/server/dist/controllers/post.controller.js index 72c43a4..d74bc67 100644 --- a/server/dist/controllers/post.controller.js +++ b/server/dist/controllers/post.controller.js @@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); exports.updatePost = exports.getPostById = exports.getPost = exports.deletePostById = exports.addPost = void 0; const post_model_1 = require("../models/post.model"); -const getPost = (res) => __awaiter(void 0, void 0, void 0, function* () { +const getPost = (req, res) => __awaiter(void 0, void 0, void 0, function* () { try { const posts = yield post_model_1.PostModel.find(); res.status(200).json({ message: 'Posts fetched Successfully!', posts }); diff --git a/server/dist/controllers/post.controller.js.map b/server/dist/controllers/post.controller.js.map index a471370..8ef1ba3 100644 --- a/server/dist/controllers/post.controller.js.map +++ b/server/dist/controllers/post.controller.js.map @@ -1 +1 @@ -{"version":3,"file":"post.controller.js","sourceRoot":"","sources":["../../src/controllers/post.controller.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"post.controller.js","sourceRoot":"","sources":["../../src/controllers/post.controller.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/server/src/controllers/order.controller.ts b/server/src/controllers/order.controller.ts index 48d56c7..4d8355b 100644 --- a/server/src/controllers/order.controller.ts +++ b/server/src/controllers/order.controller.ts @@ -7,13 +7,9 @@ const getOrders = async (req: Request, res: Response) => { try { const userId = await auth(req) const role: string = await UserModel.findById(userId).select('role') - if (role == 'admin') { - const orders = await OrderModel.find() - res.status(200).json({ message: 'Orders fetched successfully!', orders }) - } else { - const orders = await OrderModel.find({ userId }) - res.status(200).json({ message: 'Orders fetched successfully!', orders }) - } + + const orders = role == 'admin' ? await OrderModel.find() : await OrderModel.find({ userId }) + res.status(200).json({ message: 'Orders fetched successfully!', orders }) } catch (err: any) { res.status(500).json({ message: err.message }) } diff --git a/server/src/controllers/post.controller.ts b/server/src/controllers/post.controller.ts index 31723fb..f53663d 100644 --- a/server/src/controllers/post.controller.ts +++ b/server/src/controllers/post.controller.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express' import { PostModel } from '../models/post.model' -const getPost = async (res: Response) => { +const getPost = async (req: Request, res: Response) => { try { const posts = await PostModel.find() res.status(200).json({ message: 'Posts fetched Successfully!', posts })