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

fix(medusa): Allow AddressPayload or string on DraftOrder creation (#1902)

Browse Source
This commit is contained in:
Kasper Fabricius Kristensen
2022-10-19 18:01:08 +02:00
committed by GitHub
parent 8be67c734c
commit fcfb7d167b
14 changed files with 385 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/api/index.js
+2 -2
View File
@@ -28,8 +28,8 @@ export * from "./routes/admin/gift-cards"
export * from "./routes/admin/invites"
export * from "./routes/admin/notes"
export * from "./routes/admin/notifications"
export * from "./routes/admin/orders"
export * from "./routes/admin/order-edits"
export * from "./routes/admin/orders"
export * from "./routes/admin/price-lists"
export * from "./routes/admin/product-tags"
export * from "./routes/admin/product-types"
@@ -52,8 +52,8 @@ export * from "./routes/store/carts"
export * from "./routes/store/collections"
export * from "./routes/store/customers"
export * from "./routes/store/gift-cards"
export * from "./routes/store/orders"
export * from "./routes/store/order-edits"
export * from "./routes/store/orders"
export * from "./routes/store/products"
export * from "./routes/store/regions"
export * from "./routes/store/return-reasons"
packages/medusa/src/api/routes/admin/draft-orders/create-draft-order.ts
+31 -16
View File
@@ -15,14 +15,14 @@ import {
defaultAdminDraftOrdersRelations,
} from "."
import { AddressPayload } from "../../../../types/common"
import { Type } from "class-transformer"
import { EntityManager } from "typeorm"
import { DraftOrder } from "../../../.."
import { DraftOrderService } from "../../../../services"
import { EntityManager } from "typeorm"
import { Type } from "class-transformer"
import { transformIdableFields } from "medusa-core-utils"
import { AddressPayload } from "../../../../types/common"
import { DraftOrderCreateProps } from "../../../../types/draft-orders"
import { validator } from "../../../../utils/validator"
import { IsType } from "../../../../utils/validators/is-type"
/**
* @oas [post] /draft-orders
* operationId: "PostDraftOrders"
@@ -49,10 +49,14 @@ import { validator } from "../../../../utils/validator"
* format: email
* billing_address:
* description: "The Address to be used for billing purposes."
* $ref: "#/components/schemas/address_fields"
* anyOf:
* - $ref: "#/components/schemas/address_fields"
* - type: string
* shipping_address:
* description: "The Address to be used for shipping."
* $ref: "#/components/schemas/address_fields"
* anyOf:
* - $ref: "#/components/schemas/address_fields"
* - type: string
* items:
* description: The Line Items that have been received.
* type: array
@@ -191,10 +195,21 @@ import { validator } from "../../../../utils/validator"
export default async (req, res) => {
const validated = await validator(AdminPostDraftOrdersReq, req.body)
const value = transformIdableFields(validated, [
"shipping_address",
"billing_address",
])
const { shipping_address, billing_address, ...rest } = validated
const draftOrderDataToCreate: DraftOrderCreateProps = { ...rest }
if (typeof shipping_address === "string") {
draftOrderDataToCreate.shipping_address_id = shipping_address
} else {
draftOrderDataToCreate.shipping_address = shipping_address
}
if (typeof billing_address === "string") {
draftOrderDataToCreate.billing_address_id = billing_address
} else {
draftOrderDataToCreate.billing_address = billing_address
}
const draftOrderService: DraftOrderService =
req.scope.resolve("draftOrderService")
@@ -204,7 +219,7 @@ export default async (req, res) => {
async (transactionManager) => {
return await draftOrderService
.withTransaction(transactionManager)
.create(value)
.create(draftOrderDataToCreate)
}
)
@@ -230,12 +245,12 @@ export class AdminPostDraftOrdersReq {
email: string
@IsOptional()
@Type(() => AddressPayload)
billing_address?: AddressPayload
@IsType([AddressPayload, String])
billing_address?: AddressPayload | string
@IsOptional()
@Type(() => AddressPayload)
shipping_address?: AddressPayload
@IsType([AddressPayload, String])
shipping_address?: AddressPayload | string
@IsArray()
@Type(() => Item)
packages/medusa/src/api/routes/admin/draft-orders/update-draft-order.ts
+35 -16
View File
@@ -1,4 +1,4 @@
import { CartService, DraftOrderService } from "../../../../services"
import { Type } from "class-transformer"
import {
IsArray,
IsBoolean,
@@ -7,18 +7,18 @@ import {
IsString,
ValidateNested,
} from "class-validator"
import { MedusaError } from "medusa-core-utils"
import { EntityManager } from "typeorm"
import {
defaultAdminDraftOrdersCartFields,
defaultAdminDraftOrdersCartRelations,
} from "."
import { AddressPayload } from "../../../../types/common"
import { DraftOrderStatus } from "../../../../models"
import { EntityManager } from "typeorm"
import { MedusaError } from "medusa-core-utils"
import { Type } from "class-transformer"
import { CartService, DraftOrderService } from "../../../../services"
import { CartUpdateProps } from "../../../../types/cart"
import { AddressPayload } from "../../../../types/common"
import { validator } from "../../../../utils/validator"
import { IsType } from "../../../../utils/validators/is-type"
/**
* @oas [post] /admin/draft-orders/{id}
* operationId: PostDraftOrdersDraftOrder
@@ -47,10 +47,14 @@ import { validator } from "../../../../utils/validator"
* format: email
* billing_address:
* description: "The Address to be used for billing purposes."
* $ref: "#/components/schemas/address_fields"
* anyOf:
* - $ref: "#/components/schemas/address_fields"
* - type: string
* shipping_address:
* description: "The Address to be used for shipping."
* $ref: "#/components/schemas/address_fields"
* anyOf:
* - $ref: "#/components/schemas/address_fields"
* - type: string
* discounts:
* description: "An array of Discount codes to add to the Draft Order."
* type: array
@@ -125,6 +129,7 @@ export default async (req, res) => {
const draftOrderService: DraftOrderService =
req.scope.resolve("draftOrderService")
const cartService: CartService = req.scope.resolve("cartService")
const draftOrder = await draftOrderService.retrieve(id)
@@ -147,9 +152,23 @@ export default async (req, res) => {
delete validated.no_notification_order
}
await cartService
.withTransaction(transactionManager)
.update(draftOrder.cart_id, validated)
const { shipping_address, billing_address, ...rest } = validated
const cartDataToUpdate: CartUpdateProps = { ...rest }
if (typeof shipping_address === "string") {
cartDataToUpdate.shipping_address_id = shipping_address
} else {
cartDataToUpdate.shipping_address = shipping_address
}
if (typeof billing_address === "string") {
cartDataToUpdate.billing_address_id = billing_address
} else {
cartDataToUpdate.billing_address = billing_address
}
await cartService.update(draftOrder.cart_id, cartDataToUpdate)
})
draftOrder.cart = await cartService.retrieve(draftOrder.cart_id, {
@@ -174,12 +193,12 @@ export class AdminPostDraftOrdersDraftOrderReq {
email?: string
@IsOptional()
@Type(() => AddressPayload)
billing_address?: AddressPayload
@IsType([AddressPayload, String])
billing_address?: AddressPayload | string
@IsOptional()
@Type(() => AddressPayload)
shipping_address?: AddressPayload
@IsType([AddressPayload, String])
shipping_address?: AddressPayload | string
@IsArray()
@IsOptional()
packages/medusa/src/api/routes/admin/index.js
+1 -1
View File
@@ -14,8 +14,8 @@ import giftCardRoutes from "./gift-cards"
import inviteRoutes, { unauthenticatedInviteRoutes } from "./invites"
import noteRoutes from "./notes"
import notificationRoutes from "./notifications"
import orderRoutes from "./orders"
import orderEditRoutes from "./order-edits"
import orderRoutes from "./orders"
import priceListRoutes from "./price-lists"
import productTagRoutes from "./product-tags"
import productTypesRoutes from "./product-types"
packages/medusa/src/api/routes/store/carts/update-cart.ts
+4 -4
View File
@@ -7,13 +7,13 @@ import {
} from "class-validator"
import { defaultStoreCartFields, defaultStoreCartRelations } from "."
import { AddressPayload } from "../../../../types/common"
import { CartService } from "../../../../services"
import { Type } from "class-transformer"
import { EntityManager } from "typeorm"
import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels"
import { CartService } from "../../../../services"
import { AddressPayload } from "../../../../types/common"
import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators"
import { IsType } from "../../../../utils/validators/is-type"
import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels"
import { Type } from "class-transformer"
/**
* @oas [post] /carts/{id}