diff --git a/.eslintignore b/.eslintignore index e379ab377c..146273c405 100644 --- a/.eslintignore +++ b/.eslintignore @@ -33,7 +33,6 @@ /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-options /packages/medusa/src/api/routes/admin/shipping-profiles /packages/medusa/src/api/routes/admin/store /packages/medusa/src/api/routes/admin/users diff --git a/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js index 5422db7ce0..8e44305392 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js @@ -72,16 +72,12 @@ export default async (req, res) => { profile_id: Validator.string(), data: Validator.object().required(), price_type: Validator.string().required(), - amount: Validator.number() - .integer() - .optional(), + amount: Validator.number().integer().optional(), requirements: Validator.array() .items( Validator.object({ type: Validator.string().required(), - amount: Validator.number() - .integer() - .required(), + amount: Validator.number().integer().required(), }) ) .optional(), @@ -94,24 +90,20 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const optionService = req.scope.resolve("shippingOptionService") - const shippingProfileService = req.scope.resolve("shippingProfileService") + const optionService = req.scope.resolve("shippingOptionService") + const shippingProfileService = req.scope.resolve("shippingProfileService") - // Add to default shipping profile - if (!value.profile_id) { - const { id } = await shippingProfileService.retrieveDefault() - value.profile_id = id - } - - const result = await optionService.create(value) - const data = await optionService.retrieve(result.id, { - select: defaultFields, - relations: defaultRelations, - }) - - res.status(200).json({ shipping_option: data }) - } catch (err) { - throw err + // Add to default shipping profile + if (!value.profile_id) { + const { id } = await shippingProfileService.retrieveDefault() + value.profile_id = id } + + const result = await optionService.create(value) + const data = await optionService.retrieve(result.id, { + select: defaultFields, + relations: defaultRelations, + }) + + res.status(200).json({ shipping_option: data }) } diff --git a/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js index 9e3ae7d89b..f4b32caf43 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js @@ -25,17 +25,13 @@ */ export default async (req, res) => { const { option_id } = req.params - try { - const optionService = req.scope.resolve("shippingOptionService") + const optionService = req.scope.resolve("shippingOptionService") - await optionService.delete(option_id) + await optionService.delete(option_id) - res.json({ - id: option_id, - object: "shipping-option", - deleted: true, - }) - } catch (err) { - throw err - } + res.json({ + id: option_id, + object: "shipping-option", + deleted: true, + }) } diff --git a/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js index 44bdddd993..20508c9fe2 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js @@ -19,12 +19,8 @@ */ export default async (req, res) => { const { option_id } = req.params - try { - const optionService = req.scope.resolve("shippingOptionService") - const data = await optionService.retrieve(option_id) + const optionService = req.scope.resolve("shippingOptionService") + const data = await optionService.retrieve(option_id) - res.status(200).json({ shipping_option: data }) - } catch (err) { - throw err - } + res.status(200).json({ shipping_option: data }) } diff --git a/packages/medusa/src/api/routes/admin/shipping-options/index.js b/packages/medusa/src/api/routes/admin/shipping-options/index.js index 84dbfcde6d..14f79cb287 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/index.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/index.js @@ -3,7 +3,7 @@ import middlewares from "../../../middlewares" const route = Router() -export default app => { +export default (app) => { app.use("/shipping-options", route) route.get("/", middlewares.wrap(require("./list-shipping-options").default)) diff --git a/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js b/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js index 5caf463c88..406b447c52 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js @@ -21,17 +21,13 @@ import { defaultFields, defaultRelations } from "./" * $ref: "#/components/schemas/shipping_option" */ export default async (req, res) => { - try { - const query = _.pick(req.query, ["region_id", "is_return", "admin_only"]) + const query = _.pick(req.query, ["region_id", "is_return", "admin_only"]) - const optionService = req.scope.resolve("shippingOptionService") - const data = await optionService.list(query, { - select: defaultFields, - relations: defaultRelations, - }) + const optionService = req.scope.resolve("shippingOptionService") + const data = await optionService.list(query, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ shipping_options: data }) - } catch (err) { - throw err - } + res.status(200).json({ shipping_options: data }) } diff --git a/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js index 0bca080323..185444182d 100644 --- a/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js +++ b/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js @@ -1,4 +1,3 @@ -import _ from "lodash" import { MedusaError, Validator } from "medusa-core-utils" import { defaultFields, defaultRelations } from "./" @@ -50,17 +49,13 @@ export default async (req, res) => { const { option_id } = req.params const schema = Validator.object().keys({ name: Validator.string().optional(), - amount: Validator.number() - .integer() - .optional(), + amount: Validator.number().integer().optional(), requirements: Validator.array() .items( Validator.object({ id: Validator.string().optional(), type: Validator.string().required(), - amount: Validator.number() - .integer() - .required(), + amount: Validator.number().integer().required(), }) ) .optional(), @@ -73,18 +68,14 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const optionService = req.scope.resolve("shippingOptionService") + const optionService = req.scope.resolve("shippingOptionService") - await optionService.update(option_id, value) + await optionService.update(option_id, value) - const data = await optionService.retrieve(option_id, { - select: defaultFields, - relations: defaultRelations, - }) + const data = await optionService.retrieve(option_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ shipping_option: data }) - } catch (err) { - throw err - } + res.status(200).json({ shipping_option: data }) }