From 2f7deea1d0309b5a78d66b0dd0d3c2204717c02b Mon Sep 17 00:00:00 2001 From: Leo Leone Date: Tue, 26 Oct 2021 15:05:58 -0300 Subject: [PATCH] fix: make packages/medusa/src/api/routes/admin/returns pass eslint (#653) --- .eslintignore | 1 - .../api/routes/admin/returns/cancel-return.js | 38 +++++------ .../src/api/routes/admin/returns/index.js | 2 +- .../api/routes/admin/returns/list-returns.js | 32 ++++----- .../routes/admin/returns/receive-return.js | 68 +++++++++---------- 5 files changed, 61 insertions(+), 80 deletions(-) diff --git a/.eslintignore b/.eslintignore index a5fd6146ac..2160a063cc 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/returns /packages/medusa/src/api/routes/admin/shipping-profiles /packages/medusa/src/api/routes/admin/store /packages/medusa/src/api/routes/store/carts diff --git a/packages/medusa/src/api/routes/admin/returns/cancel-return.js b/packages/medusa/src/api/routes/admin/returns/cancel-return.js index c80ad6ddfc..0d6cee3661 100644 --- a/packages/medusa/src/api/routes/admin/returns/cancel-return.js +++ b/packages/medusa/src/api/routes/admin/returns/cancel-return.js @@ -1,5 +1,3 @@ -import { result } from "lodash" -import { MedusaError, Validator } from "medusa-core-utils" import { defaultFields, defaultRelations } from "../orders" /** @@ -24,27 +22,23 @@ import { defaultFields, defaultRelations } from "../orders" export default async (req, res) => { const { id } = req.params - try { - const returnService = req.scope.resolve("returnService") - const orderService = req.scope.resolve("orderService") + const returnService = req.scope.resolve("returnService") + const orderService = req.scope.resolve("orderService") - let result = await returnService.cancel(id) + let result = await returnService.cancel(id) - if (result.swap_id) { - const swapService = req.scope.resolve("swapService") - result = await swapService.retrieve(result.swap_id) - } else if (result.claim_order_id) { - const claimService = req.scope.resolve("claimService") - result = await claimService.retrieve(result.claim_order_id) - } - - const order = await orderService.retrieve(result.order_id, { - select: defaultFields, - relations: defaultRelations, - }) - - res.status(200).json({ order }) - } catch (err) { - throw err + if (result.swap_id) { + const swapService = req.scope.resolve("swapService") + result = await swapService.retrieve(result.swap_id) + } else if (result.claim_order_id) { + const claimService = req.scope.resolve("claimService") + result = await claimService.retrieve(result.claim_order_id) } + + const order = await orderService.retrieve(result.order_id, { + select: defaultFields, + relations: defaultRelations, + }) + + res.status(200).json({ order }) } diff --git a/packages/medusa/src/api/routes/admin/returns/index.js b/packages/medusa/src/api/routes/admin/returns/index.js index 49db9ca7bb..e90790ccdb 100644 --- a/packages/medusa/src/api/routes/admin/returns/index.js +++ b/packages/medusa/src/api/routes/admin/returns/index.js @@ -3,7 +3,7 @@ import middlewares from "../../../middlewares" const route = Router() -export default app => { +export default (app) => { app.use("/returns", route) /** diff --git a/packages/medusa/src/api/routes/admin/returns/list-returns.js b/packages/medusa/src/api/routes/admin/returns/list-returns.js index abda612d0b..a97f3b93dc 100644 --- a/packages/medusa/src/api/routes/admin/returns/list-returns.js +++ b/packages/medusa/src/api/routes/admin/returns/list-returns.js @@ -1,5 +1,3 @@ -import _ from "lodash" - /** * @oas [get] /returns * operationId: "GetReturns" @@ -20,25 +18,21 @@ import _ from "lodash" * $ref: "#/components/schemas/return" */ export default async (req, res) => { - try { - const returnService = req.scope.resolve("returnService") + const returnService = req.scope.resolve("returnService") - 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 = {} - const listConfig = { - relations: ["swap", "order"], - skip: offset, - take: limit, - order: { created_at: "DESC" }, - } - - const returns = await returnService.list(selector, { ...listConfig }) - - res.json({ returns, count: returns.length, offset, limit }) - } catch (error) { - throw error + const listConfig = { + relations: ["swap", "order"], + skip: offset, + take: limit, + order: { created_at: "DESC" }, } + + const returns = await returnService.list(selector, { ...listConfig }) + + res.json({ returns, count: returns.length, offset, limit }) } diff --git a/packages/medusa/src/api/routes/admin/returns/receive-return.js b/packages/medusa/src/api/routes/admin/returns/receive-return.js index 3d4974d41e..bd1c281d16 100644 --- a/packages/medusa/src/api/routes/admin/returns/receive-return.js +++ b/packages/medusa/src/api/routes/admin/returns/receive-return.js @@ -48,9 +48,7 @@ export default async (req, res) => { quantity: Validator.number().required(), }) .required(), - refund: Validator.number() - .integer() - .optional(), + refund: Validator.number().integer().optional(), }) const { value, error } = schema.validate(req.body) @@ -59,45 +57,41 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const returnService = req.scope.resolve("returnService") - const orderService = req.scope.resolve("orderService") - const swapService = req.scope.resolve("swapService") - const entityManager = req.scope.resolve("manager") + const returnService = req.scope.resolve("returnService") + const orderService = req.scope.resolve("orderService") + const swapService = req.scope.resolve("swapService") + const entityManager = req.scope.resolve("manager") - let receivedReturn - await entityManager.transaction(async manager => { - let refundAmount = value.refund + let receivedReturn + await entityManager.transaction(async (manager) => { + let refundAmount = value.refund - if (typeof value.refund !== "undefined" && value.refund < 0) { - refundAmount = 0 - } + if (typeof value.refund !== "undefined" && value.refund < 0) { + refundAmount = 0 + } - receivedReturn = await returnService + receivedReturn = await returnService + .withTransaction(manager) + .receive(id, value.items, refundAmount, true) + + if (receivedReturn.order_id) { + await orderService .withTransaction(manager) - .receive(id, value.items, refundAmount, true) + .registerReturnReceived( + receivedReturn.order_id, + receivedReturn, + refundAmount + ) + } - if (receivedReturn.order_id) { - await orderService - .withTransaction(manager) - .registerReturnReceived( - receivedReturn.order_id, - receivedReturn, - refundAmount - ) - } + if (receivedReturn.swap_id) { + await swapService + .withTransaction(manager) + .registerReceived(receivedReturn.swap_id) + } + }) - if (receivedReturn.swap_id) { - await swapService - .withTransaction(manager) - .registerReceived(receivedReturn.swap_id) - } - }) + receivedReturn = await returnService.retrieve(id, { relations: ["swap"] }) - receivedReturn = await returnService.retrieve(id, { relations: ["swap"] }) - - res.status(200).json({ return: receivedReturn }) - } catch (err) { - throw err - } + res.status(200).json({ return: receivedReturn }) }