From 95f80f8a6635d1cba74d3c7ccbf794809af2d0bb Mon Sep 17 00:00:00 2001 From: Audrey Kon Date: Tue, 26 Oct 2021 02:17:42 +0800 Subject: [PATCH] fix: make packages/medusa/src/api/routes/admin/auth and 3 others pass eslint (#666) --- .eslintignore | 11 ------- .../api/routes/admin/regions/add-country.js | 18 ++++------- .../admin/regions/add-fulfillment-provider.js | 18 ++++------- .../admin/regions/add-payment-provider.js | 18 ++++------- .../api/routes/admin/regions/create-region.js | 18 ++++------- .../routes/admin/regions/delete-metadata.js | 18 ++++------- .../api/routes/admin/regions/delete-region.js | 20 ++++-------- .../admin/regions/get-fulfillment-options.js | 32 ++++++++----------- .../api/routes/admin/regions/get-region.js | 17 ++++------ .../src/api/routes/admin/regions/index.js | 2 +- .../api/routes/admin/regions/list-regions.js | 30 ++++++++--------- .../routes/admin/regions/remove-country.js | 19 ++++------- .../regions/remove-fulfillment-provider.js | 19 ++++------- .../admin/regions/remove-payment-provider.js | 19 ++++------- .../api/routes/admin/regions/set-metadata.js | 19 +++++------ .../api/routes/admin/regions/update-region.js | 18 ++++------- 16 files changed, 112 insertions(+), 184 deletions(-) diff --git a/.eslintignore b/.eslintignore index 9b032b65de..1103372084 100644 --- a/.eslintignore +++ b/.eslintignore @@ -10,7 +10,6 @@ /packages/medusa/src/subscribers/notification.js /packages/medusa/src/subscribers/order.js /packages/medusa/src/subscribers/product.js - /packages/medusa/src/loaders/api.js /packages/medusa/src/loaders/database.js /packages/medusa/src/loaders/defaults.js @@ -24,33 +23,24 @@ /packages/medusa/src/loaders/repositories.js /packages/medusa/src/loaders/services.js /packages/medusa/src/loaders/subscribers.js - /packages/medusa/src/api/routes/admin/apps /packages/medusa/src/api/routes/admin/auth /packages/medusa/src/api/routes/admin/collections /packages/medusa/src/api/routes/admin/customers /packages/medusa/src/api/routes/admin/discounts /packages/medusa/src/api/routes/admin/draft-orders - /packages/medusa/src/api/routes/admin/notes /packages/medusa/src/api/routes/admin/notifications /packages/medusa/src/api/routes/admin/orders -/packages/medusa/src/api/routes/admin/regions /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 - - - /packages/medusa/src/api/routes/store/carts - -/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/swaps # END OF FILES TODO @@ -61,7 +51,6 @@ /packages/medusa/src/helpers /packages/medusa/src/migrations /packages/medusa/src/utils - /integration-tests /docs /docs-util diff --git a/packages/medusa/src/api/routes/admin/regions/add-country.js b/packages/medusa/src/api/routes/admin/regions/add-country.js index ad0e8a15e1..62c9b45740 100644 --- a/packages/medusa/src/api/routes/admin/regions/add-country.js +++ b/packages/medusa/src/api/routes/admin/regions/add-country.js @@ -39,17 +39,13 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - await regionService.addCountry(region_id, value.country_code) + const regionService = req.scope.resolve("regionService") + await regionService.addCountry(region_id, value.country_code) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region }) - } catch (err) { - throw err - } + res.status(200).json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js b/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js index 09f618e9a1..59ce3a4f7c 100644 --- a/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js +++ b/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js @@ -39,16 +39,12 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - await regionService.addFulfillmentProvider(region_id, value.provider_id) + const regionService = req.scope.resolve("regionService") + await regionService.addFulfillmentProvider(region_id, value.provider_id) - const data = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) - res.status(200).json({ region: data }) - } catch (err) { - throw err - } + const data = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) + res.status(200).json({ region: data }) } diff --git a/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js b/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js index 424ec645b2..7c20afc41f 100644 --- a/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js +++ b/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js @@ -39,16 +39,12 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - await regionService.addPaymentProvider(region_id, value.provider_id) + const regionService = req.scope.resolve("regionService") + await regionService.addPaymentProvider(region_id, value.provider_id) - const data = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) - res.status(200).json({ region: data }) - } catch (err) { - throw err - } + const data = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) + res.status(200).json({ region: data }) } diff --git a/packages/medusa/src/api/routes/admin/regions/create-region.js b/packages/medusa/src/api/routes/admin/regions/create-region.js index 4c29350434..0071280301 100644 --- a/packages/medusa/src/api/routes/admin/regions/create-region.js +++ b/packages/medusa/src/api/routes/admin/regions/create-region.js @@ -66,17 +66,13 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - const result = await regionService.create(value) + const regionService = req.scope.resolve("regionService") + const result = await regionService.create(value) - const region = await regionService.retrieve(result.id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(result.id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region }) - } catch (err) { - throw err - } + res.status(200).json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/delete-metadata.js b/packages/medusa/src/api/routes/admin/regions/delete-metadata.js index b029c6820b..a8f17f1c01 100644 --- a/packages/medusa/src/api/routes/admin/regions/delete-metadata.js +++ b/packages/medusa/src/api/routes/admin/regions/delete-metadata.js @@ -23,17 +23,13 @@ import { defaultRelations, defaultFields } from "./" export default async (req, res) => { const { id, key } = req.params - try { - const regionService = req.scope.resolve("regionService") - await regionService.deleteMetadata(id, key) + const regionService = req.scope.resolve("regionService") + await regionService.deleteMetadata(id, key) - const region = await regionService.retrieve(id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region }) - } catch (err) { - throw err - } + res.status(200).json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/delete-region.js b/packages/medusa/src/api/routes/admin/regions/delete-region.js index d15f01d823..ab8a5246af 100644 --- a/packages/medusa/src/api/routes/admin/regions/delete-region.js +++ b/packages/medusa/src/api/routes/admin/regions/delete-region.js @@ -1,5 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" - /** * @oas [delete] /regions/{id} * operationId: "DeleteRegionsRegion" @@ -27,16 +25,12 @@ import { MedusaError, Validator } from "medusa-core-utils" */ export default async (req, res) => { const { region_id } = req.params - try { - const regionService = req.scope.resolve("regionService") - await regionService.delete(region_id) + const regionService = req.scope.resolve("regionService") + await regionService.delete(region_id) - res.status(200).json({ - id: region_id, - object: "region", - deleted: true, - }) - } catch (err) { - throw err - } + res.status(200).json({ + id: region_id, + object: "region", + deleted: true, + }) } diff --git a/packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js b/packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js index ea0aeac4e1..63525abea6 100644 --- a/packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js +++ b/packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js @@ -22,25 +22,21 @@ export default async (req, res) => { const { region_id } = req.params - try { - const fulfillmentProviderService = req.scope.resolve( - "fulfillmentProviderService" - ) - const regionService = req.scope.resolve("regionService") - const region = await regionService.retrieve(region_id, { - relations: ["fulfillment_providers"], - }) + const fulfillmentProviderService = req.scope.resolve( + "fulfillmentProviderService" + ) + const regionService = req.scope.resolve("regionService") + const region = await regionService.retrieve(region_id, { + relations: ["fulfillment_providers"], + }) - const fpsIds = region.fulfillment_providers.map(fp => fp.id) || [] + const fpsIds = region.fulfillment_providers.map((fp) => fp.id) || [] - const options = await fulfillmentProviderService.listFulfillmentOptions( - fpsIds - ) + const options = await fulfillmentProviderService.listFulfillmentOptions( + fpsIds + ) - res.status(200).json({ - fulfillment_options: options, - }) - } catch (err) { - throw err - } + res.status(200).json({ + fulfillment_options: options, + }) } diff --git a/packages/medusa/src/api/routes/admin/regions/get-region.js b/packages/medusa/src/api/routes/admin/regions/get-region.js index 14b78ccb79..094c06afa8 100644 --- a/packages/medusa/src/api/routes/admin/regions/get-region.js +++ b/packages/medusa/src/api/routes/admin/regions/get-region.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -22,15 +21,11 @@ import { defaultRelations, defaultFields } from "./" */ export default async (req, res) => { const { region_id } = req.params - try { - const regionService = req.scope.resolve("regionService") - const data = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const regionService = req.scope.resolve("regionService") + const data = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region: data }) - } catch (err) { - throw err - } + res.status(200).json({ region: data }) } diff --git a/packages/medusa/src/api/routes/admin/regions/index.js b/packages/medusa/src/api/routes/admin/regions/index.js index 0aab12bacf..c38ba24357 100644 --- a/packages/medusa/src/api/routes/admin/regions/index.js +++ b/packages/medusa/src/api/routes/admin/regions/index.js @@ -3,7 +3,7 @@ import middlewares from "../../../middlewares" const route = Router() -export default app => { +export default (app) => { app.use("/regions", route) route.get("/", middlewares.wrap(require("./list-regions").default)) diff --git a/packages/medusa/src/api/routes/admin/regions/list-regions.js b/packages/medusa/src/api/routes/admin/regions/list-regions.js index c1369f6aca..b4aae7a181 100644 --- a/packages/medusa/src/api/routes/admin/regions/list-regions.js +++ b/packages/medusa/src/api/routes/admin/regions/list-regions.js @@ -20,25 +20,21 @@ import { defaultFields, defaultRelations } from "./" * $ref: "#/components/schemas/region" */ export default async (req, res) => { - try { - const regionService = req.scope.resolve("regionService") + const regionService = req.scope.resolve("regionService") - 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 = { - select: defaultFields, - relations: defaultRelations, - skip: offset, - take: limit, - } - - let regions = await regionService.list(selector, listConfig) - - res.json({ regions, count: regions.length, offset, limit }) - } catch (err) { - throw err + const listConfig = { + select: defaultFields, + relations: defaultRelations, + skip: offset, + take: limit, } + + const regions = await regionService.list(selector, listConfig) + + res.json({ regions, count: regions.length, offset, limit }) } diff --git a/packages/medusa/src/api/routes/admin/regions/remove-country.js b/packages/medusa/src/api/routes/admin/regions/remove-country.js index 9c132666a5..944f41a118 100644 --- a/packages/medusa/src/api/routes/admin/regions/remove-country.js +++ b/packages/medusa/src/api/routes/admin/regions/remove-country.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -23,17 +22,13 @@ import { defaultRelations, defaultFields } from "./" */ export default async (req, res) => { const { region_id, country_code } = req.params - try { - const regionService = req.scope.resolve("regionService") - await regionService.removeCountry(region_id, country_code) + const regionService = req.scope.resolve("regionService") + await regionService.removeCountry(region_id, country_code) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.json({ region }) - } catch (err) { - throw err - } + res.json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js b/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js index 9e28f89a09..596617cad6 100644 --- a/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js +++ b/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -23,18 +22,14 @@ import { defaultRelations, defaultFields } from "./" */ export default async (req, res) => { const { region_id, provider_id } = req.params - try { - const regionService = req.scope.resolve("regionService") + const regionService = req.scope.resolve("regionService") - await regionService.removeFulfillmentProvider(region_id, provider_id) + await regionService.removeFulfillmentProvider(region_id, provider_id) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.json({ region }) - } catch (err) { - throw err - } + res.json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js b/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js index 4c029e8965..09da196323 100644 --- a/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js +++ b/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js @@ -1,4 +1,3 @@ -import { MedusaError, Validator } from "medusa-core-utils" import { defaultRelations, defaultFields } from "./" /** @@ -23,17 +22,13 @@ import { defaultRelations, defaultFields } from "./" */ export default async (req, res) => { const { region_id, provider_id } = req.params - try { - const regionService = req.scope.resolve("regionService") - await regionService.removePaymentProvider(region_id, provider_id) + const regionService = req.scope.resolve("regionService") + await regionService.removePaymentProvider(region_id, provider_id) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.json({ region }) - } catch (err) { - throw err - } + res.json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/set-metadata.js b/packages/medusa/src/api/routes/admin/regions/set-metadata.js index 36445b2dd5..42ad25be45 100644 --- a/packages/medusa/src/api/routes/admin/regions/set-metadata.js +++ b/packages/medusa/src/api/routes/admin/regions/set-metadata.js @@ -1,4 +1,5 @@ import { MedusaError, Validator } from "medusa-core-utils" +import { defaultFields, defaultRelations } from "." export default async (req, res) => { const { id } = req.params @@ -13,17 +14,13 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - await regionService.setMetadata(id, value.key, value.value) + const regionService = req.scope.resolve("regionService") + await regionService.setMetadata(id, value.key, value.value) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const region = await regionService.retrieve(id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region }) - } catch (err) { - throw err - } + res.status(200).json({ region }) } diff --git a/packages/medusa/src/api/routes/admin/regions/update-region.js b/packages/medusa/src/api/routes/admin/regions/update-region.js index f0d39dfd0d..ff6e4c317c 100644 --- a/packages/medusa/src/api/routes/admin/regions/update-region.js +++ b/packages/medusa/src/api/routes/admin/regions/update-region.js @@ -70,16 +70,12 @@ export default async (req, res) => { throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details) } - try { - const regionService = req.scope.resolve("regionService") - await regionService.update(region_id, value) - const region = await regionService.retrieve(region_id, { - select: defaultFields, - relations: defaultRelations, - }) + const regionService = req.scope.resolve("regionService") + await regionService.update(region_id, value) + const region = await regionService.retrieve(region_id, { + select: defaultFields, + relations: defaultRelations, + }) - res.status(200).json({ region }) - } catch (err) { - throw err - } + res.status(200).json({ region }) }