From f01166272db7dc2d1b783223a7ea5c9e662a028b Mon Sep 17 00:00:00 2001 From: Asian Cat <0xsapphir3@gmail.com> Date: Sun, 31 Oct 2021 14:04:47 +0530 Subject: [PATCH] fix: make packages/medusa/src/api/routes/admin/notes pass eslint (#690) --- .eslintignore | 1 - .../src/api/routes/admin/notes/create-note.js | 20 +++++------- .../src/api/routes/admin/notes/delete-note.js | 10 ++---- .../src/api/routes/admin/notes/get-note.js | 10 ++---- .../src/api/routes/admin/notes/index.js | 2 +- .../src/api/routes/admin/notes/list-notes.js | 32 ++++++++----------- .../src/api/routes/admin/notes/update-note.js | 10 ++---- 7 files changed, 32 insertions(+), 53 deletions(-) diff --git a/.eslintignore b/.eslintignore index 0eb213a9c9..a3d1f0280a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -23,7 +23,6 @@ /packages/medusa/src/loaders/subscribers.js /packages/medusa/src/api/routes/admin/auth /packages/medusa/src/api/routes/admin/collections -/packages/medusa/src/api/routes/admin/notes /packages/medusa/src/api/routes/store/carts /packages/medusa/src/api/routes/store/return-reasons /packages/medusa/src/api/routes/store/returns diff --git a/packages/medusa/src/api/routes/admin/notes/create-note.js b/packages/medusa/src/api/routes/admin/notes/create-note.js index 518375876f..4fddaef1c3 100644 --- a/packages/medusa/src/api/routes/admin/notes/create-note.js +++ b/packages/medusa/src/api/routes/admin/notes/create-note.js @@ -46,18 +46,14 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const noteService = req.scope.resolve("noteService") + const noteService = req.scope.resolve("noteService") - const result = await noteService.create({ - resource_id: value.resource_id, - resource_type: value.resource_type, - value: value.value, - author_id: userId, - }) + const result = await noteService.create({ + resource_id: value.resource_id, + resource_type: value.resource_type, + value: value.value, + author_id: userId, + }) - res.status(200).json({ note: result }) - } catch (err) { - throw err - } + res.status(200).json({ note: result }) } diff --git a/packages/medusa/src/api/routes/admin/notes/delete-note.js b/packages/medusa/src/api/routes/admin/notes/delete-note.js index a9d079d5e6..8cc8f99078 100644 --- a/packages/medusa/src/api/routes/admin/notes/delete-note.js +++ b/packages/medusa/src/api/routes/admin/notes/delete-note.js @@ -24,12 +24,8 @@ export default async (req, res) => { const { id } = req.params - try { - const noteService = req.scope.resolve("noteService") - await noteService.delete(id) + const noteService = req.scope.resolve("noteService") + await noteService.delete(id) - res.status(200).json({ id, deleted: true }) - } catch (err) { - throw err - } + res.status(200).json({ id, deleted: true }) } diff --git a/packages/medusa/src/api/routes/admin/notes/get-note.js b/packages/medusa/src/api/routes/admin/notes/get-note.js index 831b4f6b9e..555634fc1b 100644 --- a/packages/medusa/src/api/routes/admin/notes/get-note.js +++ b/packages/medusa/src/api/routes/admin/notes/get-note.js @@ -20,12 +20,8 @@ export default async (req, res) => { const { id } = req.params - try { - const noteService = req.scope.resolve("noteService") - const note = await noteService.retrieve(id, { relations: ["author"] }) + const noteService = req.scope.resolve("noteService") + const note = await noteService.retrieve(id, { relations: ["author"] }) - res.status(200).json({ note }) - } catch (err) { - throw err - } + res.status(200).json({ note }) } diff --git a/packages/medusa/src/api/routes/admin/notes/index.js b/packages/medusa/src/api/routes/admin/notes/index.js index 3bbf13f1e6..9c14d0eac2 100644 --- a/packages/medusa/src/api/routes/admin/notes/index.js +++ b/packages/medusa/src/api/routes/admin/notes/index.js @@ -3,7 +3,7 @@ import middlewares from "../../../middlewares" const route = Router() -export default app => { +export default (app) => { app.use("/notes", route) route.get("/:id", middlewares.wrap(require("./get-note").default)) diff --git a/packages/medusa/src/api/routes/admin/notes/list-notes.js b/packages/medusa/src/api/routes/admin/notes/list-notes.js index ba2369866e..7c709699a7 100644 --- a/packages/medusa/src/api/routes/admin/notes/list-notes.js +++ b/packages/medusa/src/api/routes/admin/notes/list-notes.js @@ -18,25 +18,21 @@ * $ref: "#/components/schemas/note" */ export default async (req, res) => { - try { - const limit = parseInt(req.query.limit) || 50 - const offset = parseInt(req.query.offset) || 0 + const limit = parseInt(req.query.limit) || 50 + const offset = parseInt(req.query.offset) || 0 - const selector = {} + const selector = {} - if ("resource_id" in req.query) { - selector.resource_id = req.query.resource_id - } - - const noteService = req.scope.resolve("noteService") - const notes = await noteService.list(selector, { - take: limit, - skip: offset, - relations: ["author"], - }) - - res.status(200).json({ notes }) - } catch (err) { - throw err + if ("resource_id" in req.query) { + selector.resource_id = req.query.resource_id } + + const noteService = req.scope.resolve("noteService") + const notes = await noteService.list(selector, { + take: limit, + skip: offset, + relations: ["author"], + }) + + res.status(200).json({ notes }) } diff --git a/packages/medusa/src/api/routes/admin/notes/update-note.js b/packages/medusa/src/api/routes/admin/notes/update-note.js index eca3822e05..6eca56aee9 100644 --- a/packages/medusa/src/api/routes/admin/notes/update-note.js +++ b/packages/medusa/src/api/routes/admin/notes/update-note.js @@ -40,12 +40,8 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const noteService = req.scope.resolve("noteService") - const result = await noteService.update(id, value.value) + const noteService = req.scope.resolve("noteService") + const result = await noteService.update(id, value.value) - res.status(200).json({ note: result }) - } catch (err) { - throw err - } + res.status(200).json({ note: result }) }