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

Merge branch 'medusajs:develop' into develop

Browse Source
This commit is contained in:
Ronaldo Caetano
2021-10-25 22:07:36 -03:00
committed by GitHub
parent 3df2b4279f 42646c9813
commit 662b1ee670
76 changed files with 882 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/api/routes/admin/gift-cards/create-gift-card.js
+11 -17
View File
@@ -43,9 +43,7 @@ import { defaultFields, defaultRelations } from "./"
*/
export default async (req, res) => {
const schema = Validator.object().keys({
value: Validator.number()
.integer()
.optional(),
value: Validator.number().integer().optional(),
ends_at: Validator.date().optional(),
is_disabled: Validator.boolean().optional(),
region_id: Validator.string().optional(),
@@ -57,21 +55,17 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const giftCardService = req.scope.resolve("giftCardService")
const giftCardService = req.scope.resolve("giftCardService")
const newly = await giftCardService.create({
...value,
balance: value.value,
})
const newly = await giftCardService.create({
...value,
balance: value.value,
})
const giftCard = await giftCardService.retrieve(newly.id, {
select: defaultFields,
relations: defaultRelations,
})
const giftCard = await giftCardService.retrieve(newly.id, {
select: defaultFields,
relations: defaultRelations,
})
res.status(200).json({ gift_card: giftCard })
} catch (err) {
throw err
}
res.status(200).json({ gift_card: giftCard })
}
packages/medusa/src/api/routes/admin/gift-cards/delete-gift-card.js
+7 -11
View File
@@ -26,16 +26,12 @@
export default async (req, res) => {
const { id } = req.params
try {
const giftCardService = req.scope.resolve("giftCardService")
await giftCardService.delete(id)
const giftCardService = req.scope.resolve("giftCardService")
await giftCardService.delete(id)
res.json({
id,
object: "gift-card",
deleted: true,
})
} catch (err) {
throw err
}
res.json({
id,
object: "gift-card",
deleted: true,
})
}
packages/medusa/src/api/routes/admin/gift-cards/get-gift-card.js
+6 -10
View File
@@ -22,15 +22,11 @@ import { defaultFields, defaultRelations } from "./"
export default async (req, res) => {
const { id } = req.params
try {
const giftCardService = req.scope.resolve("giftCardService")
const giftCard = await giftCardService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const giftCardService = req.scope.resolve("giftCardService")
const giftCard = await giftCardService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.status(200).json({ gift_card: giftCard })
} catch (err) {
throw err
}
res.status(200).json({ gift_card: giftCard })
}
packages/medusa/src/api/routes/admin/gift-cards/index.js
+2 -5
View File
@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/gift-cards", route)
route.get("/", middlewares.wrap(require("./list-gift-cards").default))
@@ -33,10 +33,7 @@ export const defaultFields = [
"metadata",
]
export const defaultRelations = [
"region",
"order",
]
export const defaultRelations = ["region", "order"]
export const allowedFields = [
"id",
packages/medusa/src/api/routes/admin/gift-cards/list-gift-cards.js
+17 -22
View File
@@ -1,4 +1,3 @@
import { MedusaError, Validator } from "medusa-core-utils"
import { defaultFields, defaultRelations } from "./"
/**
@@ -21,28 +20,24 @@ import { defaultFields, defaultRelations } from "./"
* $ref: "#/components/schemas/gift_card"
*/
export default async (req, res) => {
try {
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
}
const giftCardService = req.scope.resolve("giftCardService")
const giftCards = await giftCardService.list(selector, {
select: defaultFields,
relations: defaultRelations,
order: { created_at: "DESC" },
limit: limit,
skip: offset,
})
res.status(200).json({ gift_cards: giftCards })
} catch (err) {
throw err
if ("q" in req.query) {
selector.q = req.query.q
}
const giftCardService = req.scope.resolve("giftCardService")
const giftCards = await giftCardService.list(selector, {
select: defaultFields,
relations: defaultRelations,
order: { created_at: "DESC" },
limit: limit,
skip: offset,
})
res.status(200).json({ gift_cards: giftCards })
}
packages/medusa/src/api/routes/admin/gift-cards/update-gift-card.js
+8 -14
View File
@@ -47,9 +47,7 @@ export default async (req, res) => {
const { id } = req.params
const schema = Validator.object().keys({
balance: Validator.number()
.precision(0)
.optional(),
balance: Validator.number().precision(0).optional(),
ends_at: Validator.date().optional(),
is_disabled: Validator.boolean().optional(),
region_id: Validator.string().optional(),
@@ -61,18 +59,14 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const giftCardService = req.scope.resolve("giftCardService")
const giftCardService = req.scope.resolve("giftCardService")
await giftCardService.update(id, value)
await giftCardService.update(id, value)
const giftCard = await giftCardService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
const giftCard = await giftCardService.retrieve(id, {
select: defaultFields,
relations: defaultRelations,
})
res.status(200).json({ gift_card: giftCard })
} catch (err) {
throw err
}
res.status(200).json({ gift_card: giftCard })
}
packages/medusa/src/api/routes/admin/notifications/index.js
+1 -1
View File
@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/notifications", route)
/**
packages/medusa/src/api/routes/admin/notifications/list-notifications.js
+51 -55
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 })
}
packages/medusa/src/api/routes/admin/notifications/resend-notification.js
+13 -17
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 })
}
packages/medusa/src/api/routes/admin/products/add-option.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/products/create-product.js
+69 -110
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 })
}
packages/medusa/src/api/routes/admin/products/create-variant.js
+13 -27
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 })
}
packages/medusa/src/api/routes/admin/products/delete-option.js
+12 -16
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,
})
}
packages/medusa/src/api/routes/admin/products/delete-product.js
+7 -11
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,
})
}
packages/medusa/src/api/routes/admin/products/delete-variant.js
+13 -17
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,
})
}
packages/medusa/src/api/routes/admin/products/index.js
+1 -1
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))
packages/medusa/src/api/routes/admin/products/list-products.js
+40 -45
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 })
}
packages/medusa/src/api/routes/admin/products/list-tag-usage-count.js
+3 -7
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 })
}
packages/medusa/src/api/routes/admin/products/list-types.js
+3 -7
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 })
}
packages/medusa/src/api/routes/admin/products/set-metadata.js
+9 -13
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 })
}
packages/medusa/src/api/routes/admin/products/update-option.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/products/update-product.js
+23 -54
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 })
}
packages/medusa/src/api/routes/admin/products/update-variant.js
+18 -40
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 })
}
packages/medusa/src/api/routes/admin/regions/add-country.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/add-payment-provider.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/create-region.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/delete-metadata.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/delete-region.js
+7 -13
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,
})
}
packages/medusa/src/api/routes/admin/regions/get-fulfillment-options.js
+14 -18
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,
})
}
packages/medusa/src/api/routes/admin/regions/get-region.js
+6 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/index.js
+1 -1
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))
packages/medusa/src/api/routes/admin/regions/list-regions.js
+13 -17
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 })
}
packages/medusa/src/api/routes/admin/regions/remove-country.js
+7 -12
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 })
}
packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js
+7 -12
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 })
}
packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js
+7 -12
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 })
}
packages/medusa/src/api/routes/admin/regions/set-metadata.js
+8 -11
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 })
}
packages/medusa/src/api/routes/admin/regions/update-region.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js
+16 -24
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 })
}
packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js
+7 -11
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,
})
}
packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js
+3 -7
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 })
}
packages/medusa/src/api/routes/admin/shipping-options/index.js
+1 -1
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))
packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js
+7 -11
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 })
}
packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js
+9 -18
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 })
}
packages/medusa/src/api/routes/admin/swaps/get-swap.js
+6 -10
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 })
}
packages/medusa/src/api/routes/admin/swaps/index.js
+1 -1
View File
@@ -3,7 +3,7 @@ import middlewares from "../../../middlewares"
const route = Router()
export default app => {
export default (app) => {
app.use("/swaps", route)
/**
packages/medusa/src/api/routes/admin/swaps/list-swaps.js
+12 -18
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 })
}
packages/medusa/src/api/routes/admin/users/create-user.js
+4 -8
View File
@@ -13,14 +13,10 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const userService = req.scope.resolve("userService")
const data = _.pick(value, ["email", "name"])
const userService = req.scope.resolve("userService")
const data = _.pick(value, ["email", "name"])
const user = await userService.create(data, value.password)
const user = await userService.create(data, value.password)
res.status(200).json({ user })
} catch (err) {
throw err
}
res.status(200).json({ user })
}
packages/medusa/src/api/routes/admin/users/get-user.js
+3 -7
View File
@@ -1,12 +1,8 @@
export default async (req, res) => {
const { user_id } = req.params
try {
const userService = req.scope.resolve("userService")
const userService = req.scope.resolve("userService")
const user = await userService.retrieve(user_id)
res.json({ user })
} catch (error) {
throw error
}
const user = await userService.retrieve(user_id)
res.json({ user })
}
packages/medusa/src/api/routes/admin/users/list-users.js
+3 -7
View File
@@ -1,10 +1,6 @@
export default async (req, res) => {
try {
const userService = req.scope.resolve("userService")
const users = await userService.list({})
const userService = req.scope.resolve("userService")
const users = await userService.list({})
res.status(200).json({ users })
} catch (err) {
throw err
}
res.status(200).json({ users })
}
packages/medusa/src/api/routes/admin/users/reset-password-token.js
+5 -10
View File
@@ -9,16 +9,11 @@ export default async (req, res) => {
if (error) {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
const userService = req.scope.resolve("userService")
const user = await userService.retrieveByEmail(value.email)
try {
const userService = req.scope.resolve("userService")
const user = await userService.retrieveByEmail(value.email)
// Should call a email service provider that sends the token to the user
await userService.generateResetPasswordToken(user.id)
// Should call a email service provider that sends the token to the user
await userService.generateResetPasswordToken(user.id)
res.sendStatus(204)
} catch (error) {
throw error
}
res.sendStatus(204)
}
packages/medusa/src/api/routes/admin/users/reset-password.js
+10 -15
View File
@@ -12,21 +12,16 @@ export default async (req, res) => {
if (error) {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
const userService = req.scope.resolve("userService")
const user = await userService.retrieveByEmail(value.email)
try {
const userService = req.scope.resolve("userService")
const user = await userService.retrieveByEmail(value.email)
const decodedToken = await jwt.verify(value.token, user.password_hash)
if (!decodedToken || decodedToken.user_id !== user.id) {
res.status(401).send("Invalid or expired password reset token")
return
}
const data = await userService.setPassword(user.id, value.password)
res.status(200).json({ user: data })
} catch (error) {
throw error
const decodedToken = await jwt.verify(value.token, user.password_hash)
if (!decodedToken || decodedToken.user_id !== user.id) {
res.status(401).send("Invalid or expired password reset token")
return
}
const data = await userService.setPassword(user.id, value.password)
res.status(200).json({ user: data })
}
packages/medusa/src/api/routes/admin/users/update-user.js
+3 -7
View File
@@ -12,11 +12,7 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const userService = req.scope.resolve("userService")
const data = await userService.update(user_id, value)
res.status(200).json({ user: data })
} catch (err) {
throw err
}
const userService = req.scope.resolve("userService")
const data = await userService.update(user_id, value)
res.status(200).json({ user: data })
}
packages/medusa/src/api/routes/store/auth/exists.js
-2
View File
@@ -1,5 +1,3 @@
import { Validator, MedusaError } from "medusa-core-utils"
/**
* @oas [get] /auth/{email}
* operationId: "GetAuthEmail"
packages/medusa/src/api/routes/store/auth/get-session.js
+8 -12
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)
}
}
packages/medusa/src/api/routes/store/customers/create-address.js
+7 -11
View File
@@ -41,17 +41,13 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const customerService = req.scope.resolve("customerService")
const customerService = req.scope.resolve("customerService")
let customer = await customerService.addAddress(id, value.address)
customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
let customer = await customerService.addAddress(id, value.address)
customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.status(200).json({ customer })
} catch (err) {
throw err
}
res.status(200).json({ customer })
}
packages/medusa/src/api/routes/store/customers/create-customer.js
+11 -15
View File
@@ -40,22 +40,18 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const customerService = req.scope.resolve("customerService")
let customer = await customerService.create(value)
const customerService = req.scope.resolve("customerService")
let customer = await customerService.create(value)
// Add JWT to cookie
req.session.jwt = jwt.sign({ customer_id: customer.id }, config.jwtSecret, {
expiresIn: "30d",
})
// Add JWT to cookie
req.session.jwt = jwt.sign({ customer_id: customer.id }, config.jwtSecret, {
expiresIn: "30d",
})
customer = await customerService.retrieve(customer.id, {
relations: defaultRelations,
select: defaultFields,
})
customer = await customerService.retrieve(customer.id, {
relations: defaultRelations,
select: defaultFields,
})
res.status(200).json({ customer })
} catch (err) {
throw err
}
res.status(200).json({ customer })
}
packages/medusa/src/api/routes/store/customers/delete-address.js
+6 -10
View File
@@ -25,15 +25,11 @@ export default async (req, res) => {
const { address_id } = req.params
const customerService = req.scope.resolve("customerService")
try {
await customerService.removeAddress(id, address_id)
customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
await customerService.removeAddress(id, address_id)
const customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.json({ customer })
} catch (err) {
throw err
}
res.json({ customer })
}
packages/medusa/src/api/routes/store/customers/get-customer.js
+6 -10
View File
@@ -19,14 +19,10 @@ import { defaultRelations, defaultFields } from "./"
*/
export default async (req, res) => {
const id = req.user.customer_id
try {
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.json({ customer })
} catch (err) {
throw err
}
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.json({ customer })
}
packages/medusa/src/api/routes/store/customers/get-payment-methods.js
+16 -20
View File
@@ -27,29 +27,25 @@
*/
export default async (req, res) => {
const id = req.user.customer_id
try {
const storeService = req.scope.resolve("storeService")
const paymentProviderService = req.scope.resolve("paymentProviderService")
const customerService = req.scope.resolve("customerService")
const storeService = req.scope.resolve("storeService")
const paymentProviderService = req.scope.resolve("paymentProviderService")
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieve(id)
const customer = await customerService.retrieve(id)
const store = await storeService.retrieve(["payment_providers"])
const store = await storeService.retrieve(["payment_providers"])
const methods = await Promise.all(
store.payment_providers.map(async (next) => {
const provider = paymentProviderService.retrieveProvider(next)
const methods = await Promise.all(
store.payment_providers.map(async (next) => {
const provider = paymentProviderService.retrieveProvider(next)
const pMethods = await provider.retrieveSavedMethods(customer)
return pMethods.map((m) => ({
provider_id: next,
data: m,
}))
})
)
const pMethods = await provider.retrieveSavedMethods(customer)
return pMethods.map((m) => ({
provider_id: next,
data: m,
}))
})
)
res.json({ payment_methods: methods.flat() })
} catch (err) {
throw err
}
res.json({ payment_methods: methods.flat() })
}
packages/medusa/src/api/routes/store/customers/list-orders.js
+30 -37
View File
@@ -1,4 +1,3 @@
import _ from "lodash"
import {
defaultRelations,
defaultFields,
@@ -29,43 +28,37 @@ import {
*/
export default async (req, res) => {
const id = req.user.customer_id
try {
const orderService = req.scope.resolve("orderService")
const selector = {
customer_id: id,
}
const orderService = req.scope.resolve("orderService")
const limit = parseInt(req.query.limit) || 10
const offset = parseInt(req.query.offset) || 0
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
includeFields = includeFields.filter((f) => allowedFields.includes(f))
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
expandFields = expandFields.filter((f) => allowedRelations.includes(f))
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const [orders, count] = await orderService.listAndCount(
selector,
listConfig
)
res.json({ orders, count, offset, limit })
} catch (error) {
throw error
const selector = {
customer_id: id,
}
const limit = parseInt(req.query.limit) || 10
const offset = parseInt(req.query.offset) || 0
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
includeFields = includeFields.filter((f) => allowedFields.includes(f))
}
let expandFields = []
if ("expand" in req.query) {
expandFields = req.query.expand.split(",")
expandFields = expandFields.filter((f) => allowedRelations.includes(f))
}
const listConfig = {
select: includeFields.length ? includeFields : defaultFields,
relations: expandFields.length ? expandFields : defaultRelations,
skip: offset,
take: limit,
order: { created_at: "DESC" },
}
const [orders, count] = await orderService.listAndCount(selector, listConfig)
res.json({ orders, count, offset, limit })
}
packages/medusa/src/api/routes/store/customers/reset-password-token.js
+5 -9
View File
@@ -21,15 +21,11 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieveByEmail(value.email)
const customerService = req.scope.resolve("customerService")
const customer = await customerService.retrieveByEmail(value.email)
// Will generate a token and send it to the customer via an email privder
await customerService.generateResetPasswordToken(customer.id)
// Will generate a token and send it to the customer via an email privder
await customerService.generateResetPasswordToken(customer.id)
res.sendStatus(204)
} catch (error) {
throw error
}
res.sendStatus(204)
}
packages/medusa/src/api/routes/store/customers/update-address.js
+11 -14
View File
@@ -43,20 +43,17 @@ export default async (req, res) => {
}
const customerService = req.scope.resolve("customerService")
try {
let customer = await customerService.updateAddress(
id,
address_id,
value.address
)
customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
let customer = await customerService.updateAddress(
id,
address_id,
value.address
)
res.json({ customer })
} catch (err) {
throw err
}
customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.json({ customer })
}
packages/medusa/src/api/routes/store/customers/update-customer.js
+7 -12
View File
@@ -1,4 +1,3 @@
import { optional } from "joi"
import { Validator, MedusaError } from "medusa-core-utils"
import { defaultRelations, defaultFields } from "./"
@@ -64,17 +63,13 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const customerService = req.scope.resolve("customerService")
await customerService.update(id, value)
const customerService = req.scope.resolve("customerService")
await customerService.update(id, value)
const customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
const customer = await customerService.retrieve(id, {
relations: defaultRelations,
select: defaultFields,
})
res.status(200).json({ customer })
} catch (err) {
throw err
}
res.status(200).json({ customer })
}
packages/medusa/src/api/routes/store/orders/get-order-by-cart.js
+6 -10
View File
@@ -22,15 +22,11 @@ import { defaultFields, defaultRelations } from "."
export default async (req, res) => {
const { cart_id } = req.params
try {
const orderService = req.scope.resolve("orderService")
const order = await orderService.retrieveByCartId(cart_id, {
select: defaultFields,
relations: defaultRelations,
})
const orderService = req.scope.resolve("orderService")
const order = await orderService.retrieveByCartId(cart_id, {
select: defaultFields,
relations: defaultRelations,
})
res.json({ order })
} catch (error) {
throw error
}
res.json({ order })
}
packages/medusa/src/api/routes/store/products/list-products.js
+18 -23
View File
@@ -1,4 +1,3 @@
import { MedusaError, Validator } from "medusa-core-utils"
import { defaultRelations } from "."
/**
@@ -30,30 +29,26 @@ import { defaultRelations } from "."
* $ref: "#/components/schemas/product"
*/
export default async (req, res) => {
try {
const productService = req.scope.resolve("productService")
const productService = req.scope.resolve("productService")
const limit = parseInt(req.query.limit) || 100
const offset = parseInt(req.query.offset) || 0
const limit = parseInt(req.query.limit) || 100
const offset = parseInt(req.query.offset) || 0
const selector = {}
const selector = {}
if ("is_giftcard" in req.query && req.query.is_giftcard === "true") {
selector.is_giftcard = req.query.is_giftcard === "true"
}
selector.status = ["published"]
const listConfig = {
relations: defaultRelations,
skip: offset,
take: limit,
}
const products = await productService.list(selector, listConfig)
res.json({ products, count: products.length, offset, limit })
} catch (error) {
throw error
if ("is_giftcard" in req.query && req.query.is_giftcard === "true") {
selector.is_giftcard = req.query.is_giftcard === "true"
}
selector.status = ["published"]
const listConfig = {
relations: defaultRelations,
skip: offset,
take: limit,
}
const products = await productService.list(selector, listConfig)
res.json({ products, count: products.length, offset, limit })
}
packages/medusa/src/api/routes/store/products/search.js
+9 -13
View File
@@ -16,20 +16,16 @@ export default async (req, res) => {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const { q, offset, limit, filter, ...options } = value
const paginationOptions = { offset, limit }
const { q, offset, limit, filter, ...options } = value
const paginationOptions = { offset, limit }
const searchService = req.scope.resolve("searchService")
const searchService = req.scope.resolve("searchService")
const results = await searchService.search(ProductService.IndexName, q, {
paginationOptions,
filter,
additionalOptions: options,
})
const results = await searchService.search(ProductService.IndexName, q, {
paginationOptions,
filter,
additionalOptions: options,
})
res.status(200).send(results)
} catch (error) {
throw error
}
res.status(200).send(results)
}
packages/medusa/src/api/routes/store/shipping-options/list-options.js
+22 -27
View File
@@ -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 })
}
packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js
+8 -12
View File
@@ -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 })
}
packages/medusa/src/api/routes/store/variants/__tests__/get-variant.js
-1
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"