asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Sebastian Rindom
2021-10-25 21:14:45 +02:00
committed by GitHub
parent a6a612c941 8f5ea026e1
commit d0733e0b63
48 changed files with 627 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.eslintignore
View File

@@ -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,34 +23,21 @@
/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/products
/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/swaps
/packages/medusa/src/api/routes/store/auth
/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
@@ -62,7 +48,6 @@
/packages/medusa/src/helpers
/packages/medusa/src/migrations
/packages/medusa/src/utils
/integration-tests
/docs
/docs-util

33
.github/actions/cache-bootstrap/action.yml vendored Normal file
View File

@@ -0,0 +1,33 @@
name: cache-bootstrap
description: Creates a cache with the given extension for lerna packages
inputs:
extension:
description: Extension for cache name
partial:
description: Boolean flag to describe whether or not to run a partial bootstrap when finding cache
default: false
runs:
using: composite
steps:
# for always overriding cache, use: pat-s/always-upload-cache@v2.1.5
- uses: actions/cache@v2
id: cache
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-yarn-${{inputs.extension}}-v8-${{ hashFiles('**/yarn.lock') }}
# We want to only bootstrap and install if no cache is found.
# Futhermore, we might want to do a partial, hoisted, bootstrap towards
# the base branch if it exists, otherwise we choose develop for this.
# yarn install --frozen-lockfile
- run: |
if [[ "${{steps.cache.outputs.cache-hit}}" != "true" || "${{inputs.partial}}" != "true" ]]; then
yarn install --frozen-lockfile
yarn bootstrap --concurrency=2
elif [[ "${{inputs.partial}}" = "true" ]]; then
[[ ! -z "${GITHUB_BASE_REF}" ]] && ref="${GITHUB_BASE_REF#refs/heads/}" || ref="develop"
yarn bootstrap --npm-client=npm --hoist --since "origin/${ref}...HEAD" --concurrency=2
fi
shell: bash

82
.github/workflows/action.yml vendored Normal file
View File

@@ -0,0 +1,82 @@
name: Medusa Pipeline
on: [push, pull_request]
jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.5
with:
fetch-depth: 0
- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
with:
node-version: '14'
cache: 'yarn'
- name: Assert changed
run: ./scripts/assert-changed-files-actions.sh "packages"
- name: Bootstrap packages
uses: ./.github/actions/cache-bootstrap
with:
extension: unit-tests
- name: Run unit tests
run: node --max-old-space-size=2048 ./node_modules/.bin/jest -w 1
integration-tests:
runs-on: ubuntu-latest
services:
postgres:
image: postgres
env:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
steps:
- name: Checkout
uses: actions/checkout@v2.3.5
with:
fetch-depth: 0
- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
with:
node-version: '14'
cache: 'yarn'
- name: Bootstrap packages
uses: ./.github/actions/cache-bootstrap
with:
extension: integration-tests
- name: Install dev cli
run: sudo npm i -g medusa-dev-cli
- name: Set path to medusa repo
run: medusa-dev --set-path-to-repo `pwd`
- name: Force install
run: medusa-dev --force-install
working-directory: integration-tests/api
- name: Build integration tests
run: yarn build
working-directory: integration-tests/api
- name: Run integration tests
run: yarn test
working-directory: integration-tests/api
env:
DB_PASSWORD: postgres

2
packages/medusa/src/api/routes/admin/notifications/index.js
View File

@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/notifications", route)
/**

106
packages/medusa/src/api/routes/admin/notifications/list-notifications.js
View File

@@ -21,63 +21,59 @@ import { defaultRelations, defaultFields } from "./"
* $ref: "#/components/schemas/notification"
*/
export default async (req, res) => {
try {
const notificationService = req.scope.resolve("notificationService")
const notificationService = req.scope.resolve("notificationService")
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
let selector = {}
const selector = {}
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
}
if ("event_name" in req.query) {
const values = req.query.event_name.split(",")
selector.event_name = values.length > 1 ? values : values[0]
}
if ("resource_type" in req.query) {
const values = req.query.resource_type.split(",")
selector.resource_type = values.length > 1 ? values : values[0]
}
if ("resource_id" in req.query) {
const values = req.query.resource_id.split(",")
selector.resource_id = values.length > 1 ? values : values[0]
}
if ("to" in req.query) {
const values = req.query.to.split(",")
selector.to = values.length > 1 ? values : values[0]
}
if (!("include_resends" in req.query)) {
selector.parent_id = null
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const notifications = await notificationService.list(selector, listConfig)
const fields = [...listConfig.select, ...listConfig.relations]
const data = notifications.map(o => _.pick(o, fields))
res.json({ notifications: data, offset, limit })
} catch (error) {
throw error
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
}
if ("event_name" in req.query) {
const values = req.query.event_name.split(",")
selector.event_name = values.length > 1 ? values : values[0]
}
if ("resource_type" in req.query) {
const values = req.query.resource_type.split(",")
selector.resource_type = values.length > 1 ? values : values[0]
}
if ("resource_id" in req.query) {
const values = req.query.resource_id.split(",")
selector.resource_id = values.length > 1 ? values : values[0]
}
if ("to" in req.query) {
const values = req.query.to.split(",")
selector.to = values.length > 1 ? values : values[0]
}
if (!("include_resends" in req.query)) {
selector.parent_id = null
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const notifications = await notificationService.list(selector, listConfig)
const fields = [...listConfig.select, ...listConfig.relations]
const data = notifications.map((o) => _.pick(o, fields))
res.json({ notifications: data, offset, limit })
}

30
packages/medusa/src/api/routes/admin/notifications/resend-notification.js
View File

@@ -32,24 +32,20 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const notificationService = req.scope.resolve("notificationService")
const notificationService = req.scope.resolve("notificationService")
const config = {}
const config = {}
if (value.to) {
config.to = value.to
}
await notificationService.resend(id, config)
const notification = await notificationService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ notification })
} catch (error) {
throw error
if (value.to) {
config.to = value.to
}
await notificationService.resend(id, config)
const notification = await notificationService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ notification })
}

18
packages/medusa/src/api/routes/admin/products/add-option.js
View File

@@ -39,17 +39,13 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
await productService.addOption(id, value.title)
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
await productService.addOption(id, value.title)
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
res.json({ product })
}

179
packages/medusa/src/api/routes/admin/products/create-product.js
View File

@@ -188,9 +188,7 @@ export default async (req, res) => {
description: Validator.string().allow(""),
is_giftcard: Validator.boolean().default(false),
discountable: Validator.boolean().default(true),
images: Validator.array()
.items(Validator.string())
.optional(),
images: Validator.array().items(Validator.string()).optional(),
thumbnail: Validator.string().optional(),
handle: Validator.string().optional(),
status: Validator.string()
@@ -203,9 +201,7 @@ export default async (req, res) => {
})
.allow(null)
.optional(),
collection_id: Validator.string()
.allow(null)
.optional(),
collection_id: Validator.string().allow(null).optional(),
tags: Validator.array()
.items({
id: Validator.string().optional(),
@@ -225,30 +221,13 @@ export default async (req, res) => {
inventory_quantity: Validator.number().default(0),
allow_backorder: Validator.boolean().optional(),
manage_inventory: Validator.boolean().optional(),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
origin_country: Validator.string()
.optional()
.allow("")
.allow(null),
mid_code: Validator.string()
.optional()
.allow("")
.allow(null),
material: Validator.string()
.optional()
.allow("")
.allow(null),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
origin_country: Validator.string().optional().allow("").allow(null),
mid_code: Validator.string().optional().allow("").allow(null),
material: Validator.string().optional().allow("").allow(null),
metadata: Validator.object().optional(),
prices: Validator.array()
.items(
@@ -256,9 +235,7 @@ export default async (req, res) => {
.keys({
region_id: Validator.string(),
currency_code: Validator.string(),
amount: Validator.number()
.integer()
.required(),
amount: Validator.number().integer().required(),
sale_amount: Validator.number().optional(),
})
.xor("region_id", "currency_code")
@@ -270,30 +247,14 @@ export default async (req, res) => {
})
.default([]),
}),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
hs_code: Validator.string()
.optional()
.allow(""),
origin_country: Validator.string()
.optional()
.allow(""),
mid_code: Validator.string()
.optional()
.allow(""),
material: Validator.string()
.optional()
.allow(""),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
hs_code: Validator.string().optional().allow(""),
origin_country: Validator.string().optional().allow(""),
mid_code: Validator.string().optional().allow(""),
material: Validator.string().optional().allow(""),
metadata: Validator.object().optional(),
})
@@ -302,66 +263,64 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
const shippingProfileService = req.scope.resolve("shippingProfileService")
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
const shippingProfileService = req.scope.resolve("shippingProfileService")
const entityManager = req.scope.resolve("manager")
const entityManager = req.scope.resolve("manager")
let newProduct
await entityManager.transaction(async manager => {
const { variants } = value
delete value.variants
let newProduct
await entityManager.transaction(async (manager) => {
const { variants } = value
delete value.variants
if (!value.thumbnail && value.images && value.images.length) {
value.thumbnail = value.images[0]
if (!value.thumbnail && value.images && value.images.length) {
value.thumbnail = value.images[0]
}
let shippingProfile
// Get default shipping profile
if (value.is_giftcard) {
shippingProfile = await shippingProfileService.retrieveGiftCardDefault()
} else {
shippingProfile = await shippingProfileService.retrieveDefault()
}
newProduct = await productService
.withTransaction(manager)
.create({ ...value, profile_id: shippingProfile.id })
if (variants) {
for (const [i, variant] of variants.entries()) {
variant.variant_rank = i
}
let shippingProfile
// Get default shipping profile
if (value.is_giftcard) {
shippingProfile = await shippingProfileService.retrieveGiftCardDefault()
} else {
shippingProfile = await shippingProfileService.retrieveDefault()
}
const optionIds = value.options.map(
(o) => newProduct.options.find((newO) => newO.title === o.title).id
)
newProduct = await productService
.withTransaction(manager)
.create({ ...value, profile_id: shippingProfile.id })
await Promise.all(
variants.map(async (v) => {
const variant = {
...v,
options: v.options.map((o, index) => ({
...o,
option_id: optionIds[index],
})),
}
if (variants) {
for (const [i, variant] of variants.entries()) variant.variant_rank = i
await productVariantService
.withTransaction(manager)
.create(newProduct.id, variant)
})
)
}
})
const optionIds = value.options.map(
o => newProduct.options.find(newO => newO.title === o.title).id
)
const product = await productService.retrieve(newProduct.id, {
select: defaultFields,
relations: defaultRelations,
})
await Promise.all(
variants.map(async v => {
const variant = {
...v,
options: v.options.map((o, index) => ({
...o,
option_id: optionIds[index],
})),
}
await productVariantService
.withTransaction(manager)
.create(newProduct.id, variant)
})
)
}
})
const product = await productService.retrieve(newProduct.id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
res.json({ product })
}

40
packages/medusa/src/api/routes/admin/products/create-variant.js
View File

@@ -115,18 +115,10 @@ export default async (req, res) => {
inventory_quantity: Validator.number().default(0),
allow_backorder: Validator.boolean().optional(),
manage_inventory: Validator.boolean().optional(),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
origin_country: Validator.string().allow(""),
mid_code: Validator.string().allow(""),
material: Validator.string().allow(""),
@@ -137,9 +129,7 @@ export default async (req, res) => {
.keys({
region_id: Validator.string().empty(null),
currency_code: Validator.string().required(),
amount: Validator.number()
.integer()
.required(),
amount: Validator.number().integer().required(),
sale_amount: Validator.number().optional(),
})
.xor("region_id", "currency_code")
@@ -158,19 +148,15 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productVariantService = req.scope.resolve("productVariantService")
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
const productService = req.scope.resolve("productService")
await productVariantService.create(id, value)
await productVariantService.create(id, value)
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
res.json({ product })
}

28
packages/medusa/src/api/routes/admin/products/delete-option.js
View File

@@ -31,21 +31,17 @@ import { defaultRelations, defaultFields } from "."
export default async (req, res) => {
const { id, option_id } = req.params
try {
const productService = req.scope.resolve("productService")
await productService.deleteOption(id, option_id)
const data = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const productService = req.scope.resolve("productService")
await productService.deleteOption(id, option_id)
const data = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({
option_id,
object: "option",
deleted: true,
product: data,
})
} catch (err) {
throw err
}
res.json({
option_id,
object: "option",
deleted: true,
product: data,
})
}

18
packages/medusa/src/api/routes/admin/products/delete-product.js
View File

@@ -26,15 +26,11 @@
export default async (req, res) => {
const { id } = req.params
try {
const productService = req.scope.resolve("productService")
await productService.delete(id)
res.json({
id,
object: "product",
deleted: true,
})
} catch (err) {
throw err
}
const productService = req.scope.resolve("productService")
await productService.delete(id)
res.json({
id,
object: "product",
deleted: true,
})
}

30
packages/medusa/src/api/routes/admin/products/delete-variant.js
View File

@@ -29,24 +29,20 @@ import { defaultRelations, defaultFields } from "."
export default async (req, res) => {
const { id, variant_id } = req.params
try {
const productVariantService = req.scope.resolve("productVariantService")
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
const productService = req.scope.resolve("productService")
await productVariantService.delete(variant_id)
await productVariantService.delete(variant_id)
const data = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const data = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({
variant_id,
object: "product-variant",
deleted: true,
product: data,
})
} catch (err) {
throw err
}
res.json({
variant_id,
object: "product-variant",
deleted: true,
product: data,
})
}

2
packages/medusa/src/api/routes/admin/products/index.js
View File

@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/products", route)
route.post("/", middlewares.wrap(require("./create-product").default))

85
packages/medusa/src/api/routes/admin/products/list-products.js
View File

@@ -1,4 +1,3 @@
import _ from "lodash"
import { MedusaError, Validator } from "medusa-core-utils"
import { defaultFields, defaultRelations, filterableFields } from "./"
@@ -42,52 +41,48 @@ export default async (req, res) => {
)
}
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
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 = {}
if ("q" in req.query) {
selector.q = req.query.q
}
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
}
for (const k of filterableFields) {
if (k in value) {
selector[k] = value[k]
}
}
if (selector.status?.indexOf("null") > -1) {
selector.status.splice(selector.status.indexOf("null"), 1)
if (selector.status.length === 0) {
delete selector.status
}
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
}
let products = await productService.list(selector, listConfig)
res.json({ products, count: products.length, offset, limit })
} catch (error) {
throw error
if ("q" in req.query) {
selector.q = req.query.q
}
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
}
for (const k of filterableFields) {
if (k in value) {
selector[k] = value[k]
}
}
if (selector.status?.indexOf("null") > -1) {
selector.status.splice(selector.status.indexOf("null"), 1)
if (selector.status.length === 0) {
delete selector.status
}
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
}
const products = await productService.list(selector, listConfig)
res.json({ products, count: products.length, offset, limit })
}

10
packages/medusa/src/api/routes/admin/products/list-tag-usage-count.js
View File

@@ -1,11 +1,7 @@
export default async (req, res) => {
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
const tags = await productService.listTagsByUsage()
const tags = await productService.listTagsByUsage()
res.json({ tags })
} catch (error) {
throw error
}
res.json({ tags })
}

10
packages/medusa/src/api/routes/admin/products/list-types.js
View File

@@ -18,13 +18,9 @@
* $ref: "#/components/schemas/product_type"
*/
export default async (req, res) => {
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
const types = await productService.listTypes()
const types = await productService.listTypes()
res.json({ types })
} catch (error) {
throw error
}
res.json({ types })
}

22
packages/medusa/src/api/routes/admin/products/set-metadata.js
View File

@@ -14,19 +14,15 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
await productService.update(id, {
metadata: { [value.key]: value.value },
})
const productService = req.scope.resolve("productService")
await productService.update(id, {
metadata: { [value.key]: value.value },
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.status(200).json({ product })
} catch (err) {
throw err
}
res.status(200).json({ product })
}

18
packages/medusa/src/api/routes/admin/products/update-option.js
View File

@@ -41,18 +41,14 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
await productService.updateOption(id, option_id, value)
await productService.updateOption(id, option_id, value)
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
res.json({ product })
}

77
packages/medusa/src/api/routes/admin/products/update-product.js
View File

@@ -188,9 +188,7 @@ export default async (req, res) => {
const schema = Validator.object().keys({
title: Validator.string().optional(),
subtitle: Validator.string()
.optional()
.allow(null, ""),
subtitle: Validator.string().optional().allow(null, ""),
description: Validator.string().optional(),
discountable: Validator.boolean().optional(),
status: Validator.string().valid(
@@ -206,9 +204,7 @@ export default async (req, res) => {
})
.allow(null)
.optional(),
collection_id: Validator.string()
.allow(null)
.optional(),
collection_id: Validator.string().allow(null).optional(),
tags: Validator.array()
.items({
id: Validator.string().optional(),
@@ -216,26 +212,15 @@ export default async (req, res) => {
})
.optional(),
handle: Validator.string().optional(),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
origin_country: Validator.string().allow(null, ""),
hs_code: Validator.string().allow(null, ""),
mid_code: Validator.string().allow(null, ""),
material: Validator.string().allow(null, ""),
images: Validator.array()
.items(Validator.string())
.optional()
.optional(),
images: Validator.array().items(Validator.string()).optional().optional(),
thumbnail: Validator.string().optional(),
variants: Validator.array()
.items({
@@ -249,9 +234,7 @@ export default async (req, res) => {
.keys({
region_id: Validator.string(),
currency_code: Validator.string(),
amount: Validator.number()
.integer()
.required(),
amount: Validator.number().integer().required(),
sale_amount: Validator.number().optional(),
})
.xor("region_id", "currency_code")
@@ -266,21 +249,11 @@ export default async (req, res) => {
inventory_quantity: Validator.number().allow(null),
allow_backorder: Validator.boolean().allow(null),
manage_inventory: Validator.boolean().allow(null),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
hs_code: Validator.string()
.optional()
.allow(null, ""),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
hs_code: Validator.string().optional().allow(null, ""),
origin_country: Validator.string().allow(null, ""),
mid_code: Validator.string().allow(null, ""),
material: Validator.string().allow(null, ""),
@@ -295,21 +268,17 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
const entityManager = req.scope.resolve("manager")
const productService = req.scope.resolve("productService")
const entityManager = req.scope.resolve("manager")
await entityManager.transaction(async manager => {
await productService.withTransaction(manager).update(id, value)
})
await entityManager.transaction(async (manager) => {
await productService.withTransaction(manager).update(id, value)
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
res.json({ product })
}

58
packages/medusa/src/api/routes/admin/products/update-variant.js
View File

@@ -1,4 +1,3 @@
import _ from "lodash"
import { MedusaError, Validator } from "medusa-core-utils"
import { defaultFields, defaultRelations } from "./"
@@ -116,9 +115,7 @@ export default async (req, res) => {
.keys({
region_id: Validator.string().empty(null),
currency_code: Validator.string(),
amount: Validator.number()
.integer()
.required(),
amount: Validator.number().integer().required(),
sale_amount: Validator.number().optional(),
})
.xor("region_id", "currency_code")
@@ -133,30 +130,14 @@ export default async (req, res) => {
inventory_quantity: Validator.number().optional(),
allow_backorder: Validator.boolean().optional(),
manage_inventory: Validator.boolean().optional(),
weight: Validator.number()
.allow(null)
.optional(),
length: Validator.number()
.allow(null)
.optional(),
height: Validator.number()
.allow(null)
.optional(),
width: Validator.number()
.allow(null)
.optional(),
hs_code: Validator.string()
.optional()
.allow(null, ""),
origin_country: Validator.string()
.optional()
.allow(null, ""),
mid_code: Validator.string()
.optional()
.allow(null, ""),
material: Validator.string()
.optional()
.allow(null, ""),
weight: Validator.number().allow(null).optional(),
length: Validator.number().allow(null).optional(),
height: Validator.number().allow(null).optional(),
width: Validator.number().allow(null).optional(),
hs_code: Validator.string().optional().allow(null, ""),
origin_country: Validator.string().optional().allow(null, ""),
mid_code: Validator.string().optional().allow(null, ""),
material: Validator.string().optional().allow(null, ""),
metadata: Validator.object().optional(),
})
@@ -165,18 +146,15 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
const productService = req.scope.resolve("productService")
const productVariantService = req.scope.resolve("productVariantService")
await productVariantService.update(variant_id, value)
await productVariantService.update(variant_id, value)
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
} catch (err) {
throw err
}
const product = await productService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ product })
}

18
packages/medusa/src/api/routes/admin/regions/add-country.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/regions/add-payment-provider.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/regions/create-region.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/regions/delete-metadata.js
View File

@@ -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 })
}

20
packages/medusa/src/api/routes/admin/regions/delete-region.js
View File

@@ -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,
})
}

32
packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js
View File

@@ -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,
})
}

17
packages/medusa/src/api/routes/admin/regions/get-region.js
View File

@@ -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 })
}

2
packages/medusa/src/api/routes/admin/regions/index.js
View File

@@ -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))

30
packages/medusa/src/api/routes/admin/regions/list-regions.js
View File

@@ -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 })
}

19
packages/medusa/src/api/routes/admin/regions/remove-country.js
View File

@@ -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 })
}

19
packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js
View File

@@ -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 })
}

19
packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js
View File

@@ -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 })
}

19
packages/medusa/src/api/routes/admin/regions/set-metadata.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/regions/update-region.js
View File

@@ -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 })
}

40
packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js
View File

@@ -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 })
}

18
packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js
View File

@@ -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,
})
}

10
packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js
View File

@@ -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 })
}

2
packages/medusa/src/api/routes/admin/shipping-options/index.js
View File

@@ -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))

18
packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js
View File

@@ -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 })
}

27
packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js
View File

@@ -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 })
}

16
packages/medusa/src/api/routes/admin/swaps/get-swap.js
View File

@@ -22,16 +22,12 @@ import { defaultFields, defaultRelations } from "./"
export default async (req, res) => {
const { id } = req.params
try {
const swapService = req.scope.resolve("swapService")
const swapService = req.scope.resolve("swapService")
const swap = await swapService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const swap = await swapService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ swap })
} catch (error) {
throw error
}
res.json({ swap })
}

2
packages/medusa/src/api/routes/admin/swaps/index.js
View File

@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/swaps", route)
/**

30
packages/medusa/src/api/routes/admin/swaps/list-swaps.js
View File

@@ -1,5 +1,3 @@
import _ from "lodash"
/**
* @oas [get] /swaps
* operationId: "GetSwaps"
@@ -20,24 +18,20 @@ import _ from "lodash"
* $ref: "#/components/schemas/swap"
*/
export default async (req, res) => {
try {
const swapService = req.scope.resolve("swapService")
const swapService = req.scope.resolve("swapService")
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 = {
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const swaps = await swapService.list(selector, { ...listConfig })
res.json({ swaps, count: swaps.length, offset, limit })
} catch (error) {
throw error
const listConfig = {
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const swaps = await swapService.list(selector, { ...listConfig })
res.json({ swaps, count: swaps.length, offset, limit })
}

2
packages/medusa/src/api/routes/store/auth/exists.js
View File

@@ -1,5 +1,3 @@
import { Validator, MedusaError } from "medusa-core-utils"
/**
* @oas [get] /auth/{email}
* operationId: "GetAuthEmail"

20
packages/medusa/src/api/routes/store/auth/get-session.js
View File

@@ -16,17 +16,13 @@
* $ref: "#/components/schemas/customer"
*/
export default async (req, res) => {
try {
if (req.user && req.user.customer_id) {
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieve(req.user.customer_id, {
relations: ["shipping_addresses", "orders", "orders.items"],
})
res.json({ customer })
} else {
res.sendStatus(401)
}
} catch (err) {
throw err
if (req.user && req.user.customer_id) {
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieve(req.user.customer_id, {
relations: ["shipping_addresses", "orders", "orders.items"],
})
res.json({ customer })
} else {
res.sendStatus(401)
}
}

1
packages/medusa/src/api/routes/store/variants/__tests__/get-variant.js
View File

@@ -1,4 +1,3 @@
import { IdMap } from "../../../../../../../medusa-test-utils/dist"
import { request } from "../../../../../helpers/test-request"
import { ProductVariantServiceMock } from "../../../../../services/__mocks__/product-variant"

40
scripts/assert-changed-files-actions.sh Executable file
View File

@@ -0,0 +1,40 @@
#!/bin/bash
IS_CI="${CI:-false}"
GREP_PATTERN=$1
if [ "$IS_CI" = true ]; then
git config --local url."https://github.com/".insteadOf git@github.com:
git config --local user.name "Medusajs Bot"
git config --local user.email "core@medusa-commerce.com"
git fetch origin
git merge --no-edit origin/master
if [ $? -ne 0 ]; then
echo "Branch has conflicts with master, rolling back test."
git merge --abort
fi
git config --local --unset user.name
git config --local --unset user.email
git config --local --unset url."https://github.com/".insteadOf
fi
# Make sure that we are diffing towards the right branch, in github actions this is different
# depending on whether or not we are creating a pull request or not.
[ ! -z ${GITHUB_BASE_REF} ] && HAS_BASE=true || HAS_BASE=false
[ HAS_BASE = true ] && COMPARE="${GITHUB_BASE_REF#refs/heads/}" || COMPARE="develop"
FILES_COUNT="$(git diff-tree --no-commit-id --name-only -r origin/"$COMPARE" | grep -E "$GREP_PATTERN" -c)"
if [ "$IS_CI" = true ]; then
# reset to previous state
git reset --hard $GITHUB_SHA
fi
if [ "$FILES_COUNT" -eq 0 ]; then
echo "0 files matching '$GREP_PATTERN'; exiting and marking successful."
exit 0
else
echo "$FILES_COUNT file(s) matching '$GREP_PATTERN'; continuing."
fi