From 6f7c1d15b232a6260276b975dba06ab5125d8a23 Mon Sep 17 00:00:00 2001 From: Philip Korsholm Date: Thu, 23 Feb 2023 19:25:26 +0100 Subject: [PATCH 1/4] fix get inventory for variant return types --- .../api/routes/admin/variants/get-inventory.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/medusa/src/api/routes/admin/variants/get-inventory.ts b/packages/medusa/src/api/routes/admin/variants/get-inventory.ts index b0853a8da8b90..3ab8e79c33edc 100644 --- a/packages/medusa/src/api/routes/admin/variants/get-inventory.ts +++ b/packages/medusa/src/api/routes/admin/variants/get-inventory.ts @@ -87,7 +87,7 @@ export default async (req, res) => { const variant = await variantService.retrieve(id, { select: ["id"] }) - const responseVariant: AdminGetVariantsVariantInventoryRes = { + const responseVariant: AdminVariantInventory = { id: variant.id, inventory: [], sales_channel_availability: [], @@ -150,7 +150,7 @@ type ResponseInventoryItem = Partial & { } /** - * @schema AdminGetVariantsVariantInventoryRes + * @schema AdminVariantInventory * type: object * properties: * id: @@ -173,7 +173,7 @@ type ResponseInventoryItem = Partial & { * description: Available quantity in sales channel * type: number */ -export type AdminGetVariantsVariantInventoryRes = { +export type AdminVariantInventory = { id: string inventory: ResponseInventoryItem[] sales_channel_availability: { @@ -182,3 +182,15 @@ export type AdminGetVariantsVariantInventoryRes = { available_quantity: number }[] } + +/** + * @schema AdminGetVariantsVariantInventoryRes + * type: object + * properties: + * variant: + * type: object + * $ref: "#/components/schemas/AdminVariantInventory" + */ +export type AdminGetVariantsVariantInventoryRes = { + variant: AdminVariantInventory +} From d65fb6065bee1d078783b820e802c72329cd5c97 Mon Sep 17 00:00:00 2001 From: Philip Korsholm Date: Thu, 23 Feb 2023 19:25:42 +0100 Subject: [PATCH 2/4] add reservations endpoints to index file --- packages/medusa/src/api/routes/admin/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/medusa/src/api/routes/admin/index.js b/packages/medusa/src/api/routes/admin/index.js index 1f22a5ff59419..3f4e173f063fb 100644 --- a/packages/medusa/src/api/routes/admin/index.js +++ b/packages/medusa/src/api/routes/admin/index.js @@ -24,6 +24,7 @@ import productTypesRoutes from "./product-types" import publishableApiKeyRoutes from "./publishable-api-keys" import productRoutes from "./products" import regionRoutes from "./regions" +import reservationRoutes from "./reservations" import returnReasonRoutes from "./return-reasons" import returnRoutes from "./returns" import salesChannelRoutes from "./sales-channels" @@ -97,6 +98,7 @@ export default (app, container, config) => { productTypesRoutes(route) publishableApiKeyRoutes(route) regionRoutes(route, featureFlagRouter) + reservationRoutes(route) returnReasonRoutes(route) returnRoutes(route) salesChannelRoutes(route) From 77d20cb0b0ad421f16fe09efadac2adeedccd340 Mon Sep 17 00:00:00 2001 From: Philip Korsholm Date: Thu, 23 Feb 2023 19:27:39 +0100 Subject: [PATCH 3/4] rename --- .../src/api/routes/admin/variants/get-inventory.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/medusa/src/api/routes/admin/variants/get-inventory.ts b/packages/medusa/src/api/routes/admin/variants/get-inventory.ts index 3ab8e79c33edc..a6a01bac621ab 100644 --- a/packages/medusa/src/api/routes/admin/variants/get-inventory.ts +++ b/packages/medusa/src/api/routes/admin/variants/get-inventory.ts @@ -87,7 +87,7 @@ export default async (req, res) => { const variant = await variantService.retrieve(id, { select: ["id"] }) - const responseVariant: AdminVariantInventory = { + const responseVariant: VariantInventory = { id: variant.id, inventory: [], sales_channel_availability: [], @@ -150,7 +150,7 @@ type ResponseInventoryItem = Partial & { } /** - * @schema AdminVariantInventory + * @schema VariantInventory * type: object * properties: * id: @@ -173,7 +173,7 @@ type ResponseInventoryItem = Partial & { * description: Available quantity in sales channel * type: number */ -export type AdminVariantInventory = { +export type VariantInventory = { id: string inventory: ResponseInventoryItem[] sales_channel_availability: { @@ -189,8 +189,8 @@ export type AdminVariantInventory = { * properties: * variant: * type: object - * $ref: "#/components/schemas/AdminVariantInventory" + * $ref: "#/components/schemas/VariantInventory" */ export type AdminGetVariantsVariantInventoryRes = { - variant: AdminVariantInventory + variant: VariantInventory } From 657a8df972e403894601b932111307afad8589be Mon Sep 17 00:00:00 2001 From: Philip Korsholm Date: Thu, 23 Feb 2023 19:29:34 +0100 Subject: [PATCH 4/4] add changeset --- .changeset/funny-cars-crash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/funny-cars-crash.md diff --git a/.changeset/funny-cars-crash.md b/.changeset/funny-cars-crash.md new file mode 100644 index 0000000000000..7f8e212848001 --- /dev/null +++ b/.changeset/funny-cars-crash.md @@ -0,0 +1,5 @@ +--- +"@medusajs/medusa": patch +--- + +Register reservation endpoints + Fix a type issue for get variant inventory