From 5cb1b5687ee80448dfecd0c8ba683ccdfc6900fc Mon Sep 17 00:00:00 2001 From: Penthaa Patel Date: Mon, 25 Oct 2021 11:52:17 +0530 Subject: [PATCH] fix: make packages/medusa/src/api/routes/store/shipping-options pass linting (#648) --- .eslintignore | 2 +- .../store/shipping-options/list-options.js | 49 +++++++++---------- .../shipping-options/list-shipping-options.js | 20 +++----- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/.eslintignore b/.eslintignore index d0809e8650..693b14c985 100644 --- a/.eslintignore +++ b/.eslintignore @@ -54,7 +54,7 @@ /packages/medusa/src/api/routes/store/regions /packages/medusa/src/api/routes/store/return-reasons /packages/medusa/src/api/routes/store/returns -/packages/medusa/src/api/routes/store/shipping-options + /packages/medusa/src/api/routes/store/swaps # END OF FILES TODO diff --git a/packages/medusa/src/api/routes/store/shipping-options/list-options.js b/packages/medusa/src/api/routes/store/shipping-options/list-options.js index ff9b139ec8..fe163731c1 100644 --- a/packages/medusa/src/api/routes/store/shipping-options/list-options.js +++ b/packages/medusa/src/api/routes/store/shipping-options/list-options.js @@ -25,34 +25,29 @@ export default async (req, res) => { const productIds = (req.query.product_ids && req.query.product_ids.split(",")) || [] const regionId = req.query.region_id + const productService = req.scope.resolve("productService") + const shippingOptionService = req.scope.resolve("shippingOptionService") - try { - const productService = req.scope.resolve("productService") - const shippingOptionService = req.scope.resolve("shippingOptionService") + const query = {} - const query = {} - - if ("is_return" in req.query) { - query.is_return = req.query.is_return === "true" - } - - if (regionId) { - query.region_id = regionId - } - - query.admin_only = false - - if (productIds.length) { - const prods = await productService.list({ id: productIds }) - query.profile_id = prods.map((p) => p.profile_id) - } - - const options = await shippingOptionService.list(query, { - relations: ["requirements"], - }) - - res.status(200).json({ shipping_options: options }) - } catch (err) { - throw err + if ("is_return" in req.query) { + query.is_return = req.query.is_return === "true" } + + if (regionId) { + query.region_id = regionId + } + + query.admin_only = false + + if (productIds.length) { + const prods = await productService.list({ id: productIds }) + query.profile_id = prods.map((p) => p.profile_id) + } + + const options = await shippingOptionService.list(query, { + relations: ["requirements"], + }) + + res.status(200).json({ shipping_options: options }) } diff --git a/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js b/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js index e89a9d92f0..38234764a4 100644 --- a/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js +++ b/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js @@ -31,19 +31,15 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const cartService = req.scope.resolve("cartService") - const shippingProfileService = req.scope.resolve("shippingProfileService") + const cartService = req.scope.resolve("cartService") + const shippingProfileService = req.scope.resolve("shippingProfileService") - const cart = await cartService.retrieve(value.cart_id, { - select: ["subtotal"], - relations: ["region", "items", "items.variant", "items.variant.product"], - }) + const cart = await cartService.retrieve(value.cart_id, { + select: ["subtotal"], + relations: ["region", "items", "items.variant", "items.variant.product"], + }) - const options = await shippingProfileService.fetchCartOptions(cart) + const options = await shippingProfileService.fetchCartOptions(cart) - res.status(200).json({ shipping_options: options }) - } catch (err) { - throw err - } + res.status(200).json({ shipping_options: options }) }