From a8fc89af066836224e4f760115d13ba85f89a359 Mon Sep 17 00:00:00 2001 From: Leo Leone Date: Tue, 26 Oct 2021 15:01:30 -0300 Subject: [PATCH] fix: make packages/medusa/src/api/routes/admin/return-reasons pass eslint (#654) --- .eslintignore | 1 - .../admin/return-reasons/create-reason.js | 22 +++++++------------ .../admin/return-reasons/delete-reason.js | 18 ++++++--------- .../routes/admin/return-reasons/get-reason.js | 17 +++++--------- .../api/routes/admin/return-reasons/index.js | 2 +- .../admin/return-reasons/list-reasons.js | 19 ++++++---------- .../admin/return-reasons/update-reason.js | 22 +++++++------------ 7 files changed, 37 insertions(+), 64 deletions(-) diff --git a/.eslintignore b/.eslintignore index 95ac4c79d1..a5fd6146ac 100644 --- a/.eslintignore +++ b/.eslintignore @@ -28,7 +28,6 @@ /packages/medusa/src/api/routes/admin/collections /packages/medusa/src/api/routes/admin/notes /packages/medusa/src/api/routes/admin/orders -/packages/medusa/src/api/routes/admin/return-reasons /packages/medusa/src/api/routes/admin/returns /packages/medusa/src/api/routes/admin/shipping-profiles /packages/medusa/src/api/routes/admin/store diff --git a/packages/medusa/src/api/routes/admin/return-reasons/create-reason.js b/packages/medusa/src/api/routes/admin/return-reasons/create-reason.js index d089865088..ebd00c8ae0 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/create-reason.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/create-reason.js @@ -40,9 +40,7 @@ export default async (req, res) => { value: Validator.string().required(), label: Validator.string().required(), parent_return_reason_id: Validator.string().optional(), - description: Validator.string() - .optional() - .allow(""), + description: Validator.string().optional().allow(""), metadata: Validator.object().optional(), }) @@ -51,17 +49,13 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const returnReasonService = req.scope.resolve("returnReasonService") - const result = await returnReasonService.create(value) + const returnReasonService = req.scope.resolve("returnReasonService") + const result = await returnReasonService.create(value) - const reason = await returnReasonService.retrieve(result.id, { - select: defaultFields, - relations: defaultRelations, - }) + const reason = await returnReasonService.retrieve(result.id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ return_reason: reason }) - } catch (err) { - throw err - } + res.status(200).json({ return_reason: reason }) } diff --git a/packages/medusa/src/api/routes/admin/return-reasons/delete-reason.js b/packages/medusa/src/api/routes/admin/return-reasons/delete-reason.js index 9688d69205..73fd74800a 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/delete-reason.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/delete-reason.js @@ -26,16 +26,12 @@ export default async (req, res) => { const { id } = req.params - try { - const returnReasonService = req.scope.resolve("returnReasonService") - await returnReasonService.delete(id) + const returnReasonService = req.scope.resolve("returnReasonService") + await returnReasonService.delete(id) - res.json({ - id: id, - object: "return_reason", - deleted: true, - }) - } catch (err) { - throw err - } + res.json({ + id: id, + object: "return_reason", + deleted: true, + }) } diff --git a/packages/medusa/src/api/routes/admin/return-reasons/get-reason.js b/packages/medusa/src/api/routes/admin/return-reasons/get-reason.js index 53a1cf40dd..55275a4b4e 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/get-reason.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/get-reason.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -22,16 +21,12 @@ import { defaultRelations, defaultFields } from "./" */ export default async (req, res) => { const { id } = req.params - try { - const returnReasonService = req.scope.resolve("returnReasonService") + const returnReasonService = req.scope.resolve("returnReasonService") - const data = await returnReasonService.retrieve(id, { - select: defaultFields, - relations: defaultRelations, - }) + const data = await returnReasonService.retrieve(id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ return_reason: data }) - } catch (err) { - throw err - } + res.status(200).json({ return_reason: data }) } diff --git a/packages/medusa/src/api/routes/admin/return-reasons/index.js b/packages/medusa/src/api/routes/admin/return-reasons/index.js index b535b488f5..011719af63 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/index.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/index.js @@ -3,7 +3,7 @@ import middlewares from "../../../middlewares" const route = Router() -export default app => { +export default (app) => { app.use("/return-reasons", route) /** diff --git a/packages/medusa/src/api/routes/admin/return-reasons/list-reasons.js b/packages/medusa/src/api/routes/admin/return-reasons/list-reasons.js index 2c1f8664ed..c89623e1c7 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/list-reasons.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/list-reasons.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -21,17 +20,13 @@ import { defaultRelations, defaultFields } from "./" * $ref: "#/components/schemas/return_reason" */ export default async (req, res) => { - try { - const returnReasonService = req.scope.resolve("returnReasonService") + const returnReasonService = req.scope.resolve("returnReasonService") - const query = { parent_return_reason_id: null } - const data = await returnReasonService.list(query, { - select: defaultFields, - relations: defaultRelations, - }) + const query = { parent_return_reason_id: null } + const data = await returnReasonService.list(query, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ return_reasons: data }) - } catch (err) { - throw err - } + res.status(200).json({ return_reasons: data }) } diff --git a/packages/medusa/src/api/routes/admin/return-reasons/update-reason.js b/packages/medusa/src/api/routes/admin/return-reasons/update-reason.js index 398c661a9d..b38b19dd62 100644 --- a/packages/medusa/src/api/routes/admin/return-reasons/update-reason.js +++ b/packages/medusa/src/api/routes/admin/return-reasons/update-reason.js @@ -43,9 +43,7 @@ export default async (req, res) => { const schema = Validator.object().keys({ label: Validator.string().optional(), parent_return_reason_id: Validator.string().optional(), - description: Validator.string() - .optional() - .allow(""), + description: Validator.string().optional().allow(""), metadata: Validator.object().optional(), }) @@ -54,18 +52,14 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const returnReasonService = req.scope.resolve("returnReasonService") + const returnReasonService = req.scope.resolve("returnReasonService") - await returnReasonService.update(id, value) + await returnReasonService.update(id, value) - const reason = await returnReasonService.retrieve(id, { - select: defaultFields, - relations: defaultRelations, - }) + const reason = await returnReasonService.retrieve(id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ return_reason: reason }) - } catch (err) { - throw err - } + res.status(200).json({ return_reason: reason }) }