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

feat(core-flows,medusa,order): remove return shipping (#8137)

Browse Source 
What:
* `DELETE /admin/returs/:id/shipping_methods/:action_id`

FIXES: CC-187
This commit is contained in:
Carlos R. L. Rodrigues
2024-07-16 10:27:16 +00:00
committed by GitHub
parent b7e6b1461b
commit 7123f9ff63
22 changed files with 383 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/modules/order/integration-tests/__tests__/order-exchange.ts
+2 -2
View File
@@ -211,7 +211,7 @@ moduleIntegrationTestRunner({
}),
}),
]),
shipping_methods: [
shipping_methods: expect.arrayContaining([
expect.objectContaining({
name: "return shipping method",
amount: 10,
@@ -220,7 +220,7 @@ moduleIntegrationTestRunner({
name: "Exchange method",
amount: 35,
}),
],
]),
difference_due: 14,
})
)
packages/modules/order/src/migrations/Migration20240715174100.ts
+20
View File
@@ -0,0 +1,20 @@
import { Migration } from "@mikro-orm/migrations"
export class Migration20240715102100 extends Migration {
async up(): Promise<void> {
const sql = `
DROP INDEX IF EXISTS "IDX_order_shipping_method_shipping_option_id";
ALTER TABLE "order_shipping_method"
ADD COLUMN if NOT exists "deleted_at" timestamptz NULL;
CREATE INDEX IF NOT EXISTS "IDX_order_shipping_method_shipping_option_id" ON "order_shipping_method" (
shipping_option_id
) WHERE deleted_at IS NULL;
`
this.addSql(sql)
}
}
packages/modules/order/src/models/claim-item-image.ts
+3
View File
@@ -1,11 +1,13 @@
import { DAL } from "@medusajs/types"
import {
DALUtils,
createPsqlIndexStatementHelper,
generateEntityId,
} from "@medusajs/utils"
import {
BeforeCreate,
Entity,
Filter,
ManyToOne,
OnInit,
OptionalProps,
@@ -30,6 +32,7 @@ const ClaimItemIdIndex = createPsqlIndexStatementHelper({
})
@Entity({ tableName: "order_claim_item_image" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
export default class ClaimItemImage {
[OptionalProps]?: OptionalClaimItemImageProps
packages/modules/order/src/models/order-change-action.ts
+3
View File
@@ -1,6 +1,7 @@
import { BigNumberRawValue, DAL } from "@medusajs/types"
import {
BigNumber,
DALUtils,
MikroOrmBigNumberProperty,
createPsqlIndexStatementHelper,
generateEntityId,
@@ -8,6 +9,7 @@ import {
import {
BeforeCreate,
Entity,
Filter,
ManyToOne,
OnInit,
OptionalProps,
@@ -66,6 +68,7 @@ const ActionOrderingIndex = createPsqlIndexStatementHelper({
})
@Entity({ tableName: "order_change_action" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
export default class OrderChangeAction {
[OptionalProps]?: OptionalLineItemProps
packages/modules/order/src/models/order-change.ts
+3
View File
@@ -1,6 +1,7 @@
import { DAL } from "@medusajs/types"
import {
createPsqlIndexStatementHelper,
DALUtils,
generateEntityId,
OrderChangeStatus,
OrderChangeType,
@@ -11,6 +12,7 @@ import {
Collection,
Entity,
Enum,
Filter,
ManyToOne,
OneToMany,
OnInit,
@@ -77,6 +79,7 @@ const VersionIndex = createPsqlIndexStatementHelper({
})
@Entity({ tableName: "order_change" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
@VersionIndex.MikroORMIndex()
export default class OrderChange {
[OptionalProps]?: OptionalLineItemProps
packages/modules/order/src/models/return-reason.ts
+3
View File
@@ -1,5 +1,6 @@
import { DAL } from "@medusajs/types"
import {
DALUtils,
createPsqlIndexStatementHelper,
generateEntityId,
} from "@medusajs/utils"
@@ -7,6 +8,7 @@ import {
BeforeCreate,
Cascade,
Entity,
Filter,
ManyToOne,
OnInit,
OneToMany,
@@ -37,6 +39,7 @@ const ParentIndex = createPsqlIndexStatementHelper({
type OptionalOrderProps = "parent_return_reason" | DAL.ModelDateColumns
@Entity({ tableName: "return_reason" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
export default class ReturnReason {
[OptionalProps]?: OptionalOrderProps
packages/modules/order/src/models/shipping-method.ts
+16 -2
View File
@@ -2,6 +2,7 @@ import { BigNumberRawValue } from "@medusajs/types"
import {
BigNumber,
createPsqlIndexStatementHelper,
DALUtils,
generateEntityId,
MikroOrmBigNumberProperty,
} from "@medusajs/utils"
@@ -10,6 +11,7 @@ import {
Cascade,
Collection,
Entity,
Filter,
OneToMany,
OnInit,
PrimaryKey,
@@ -19,12 +21,20 @@ import {
import ShippingMethodAdjustment from "./shipping-method-adjustment"
import ShippingMethodTaxLine from "./shipping-method-tax-line"
const DeletedAtIndex = createPsqlIndexStatementHelper({
tableName: "order_shipping_method",
columns: "deleted_at",
where: "deleted_at IS NOT NULL",
})
const ShippingOptionIdIndex = createPsqlIndexStatementHelper({
tableName: "order_shipping_method",
columns: "shipping_option_id",
where: "deleted_at IS NOT NULL",
})
@Entity({ tableName: "order_shipping_method" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
export default class ShippingMethod {
@PrimaryKey({ columnType: "text" })
id: string
@@ -61,7 +71,7 @@ export default class ShippingMethod {
() => ShippingMethodTaxLine,
(taxLine) => taxLine.shipping_method,
{
cascade: [Cascade.PERSIST],
cascade: [Cascade.PERSIST, "soft-remove"] as any,
}
)
tax_lines = new Collection<Rel<ShippingMethodTaxLine>>(this)
@@ -70,7 +80,7 @@ export default class ShippingMethod {
() => ShippingMethodAdjustment,
(adjustment) => adjustment.shipping_method,
{
cascade: [Cascade.PERSIST],
cascade: [Cascade.PERSIST, "soft-remove"] as any,
}
)
adjustments = new Collection<Rel<ShippingMethodAdjustment>>(this)
@@ -90,6 +100,10 @@ export default class ShippingMethod {
})
updated_at: Date
@Property({ columnType: "timestamptz", nullable: true })
@DeletedAtIndex.MikroORMIndex()
deleted_at: Date | null = null
@BeforeCreate()
onCreate() {
this.id = generateEntityId(this.id, "ordsm")
packages/modules/order/src/models/transaction.ts
+3
View File
@@ -1,6 +1,7 @@
import { BigNumberRawValue, DAL } from "@medusajs/types"
import {
BigNumber,
DALUtils,
MikroOrmBigNumberProperty,
createPsqlIndexStatementHelper,
generateEntityId,
@@ -8,6 +9,7 @@ import {
import {
BeforeCreate,
Entity,
Filter,
ManyToOne,
OnInit,
OptionalProps,
@@ -71,6 +73,7 @@ const OrderIdVersionIndex = createPsqlIndexStatementHelper({
})
@Entity({ tableName: "order_transaction" })
@Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
@OrderIdVersionIndex.MikroORMIndex()
export default class Transaction {
[OptionalProps]?: OptionalLineItemProps
packages/modules/order/src/services/order-module-service.ts
+61
View File
@@ -1252,6 +1252,66 @@ export default class OrderModuleService<
return sm.map((s) => s.shipping_method)
}
@InjectManager("baseRepository_")
// @ts-ignore
async softDeleteShippingMethods<TReturnableLinkableKeys extends string>(
ids: string | object | string[] | object[],
config?: SoftDeleteReturn<TReturnableLinkableKeys>,
@MedusaContext() sharedContext?: Context
): Promise<Record<string, string[]> | void> {
const rel = await super.listOrderShippingMethods(
{
shipping_method_id: ids,
},
{
select: ["id"],
},
sharedContext
)
const orderShippingMethodIds = rel.map((r) => r.id)
const [returned] = await promiseAll([
super.softDeleteShippingMethods(ids, config, sharedContext),
super.softDeleteOrderShippingMethods(
orderShippingMethodIds,
config,
sharedContext
),
])
return returned
}
@InjectManager("baseRepository_")
// @ts-ignore
async restoreShippingMethods<TReturnableLinkableKeys extends string>(
transactionIds: string | object | string[] | object[],
config?: RestoreReturn<TReturnableLinkableKeys>,
@MedusaContext() sharedContext?: Context
): Promise<Record<string, string[]> | void> {
const rel = await super.listOrderShippingMethods(
{
shipping_method_id: transactionIds,
},
{
select: ["id"],
},
sharedContext
)
const orderShippingMethodIds = rel.map((r) => r.id)
const [returned] = await promiseAll([
super.restoreShippingMethods(transactionIds, config, sharedContext),
super.restoreOrderShippingMethods(
orderShippingMethodIds,
config,
sharedContext
),
])
return returned
}
// @ts-ignore
async createLineItemAdjustments(
adjustments: OrderTypes.CreateOrderLineItemAdjustmentDTO[]
@@ -2014,6 +2074,7 @@ export default class OrderModuleService<
delete item.actions
const newItem = itemsToUpsert.find((d) => d.item_id === item.id)!
calculated.order.items[idx] = {
...lineItem,
actions,
packages/modules/order/src/utils/base-repository-find.ts
+13 -3
View File
@@ -69,6 +69,13 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
if (isRelatedEntity) {
popWhere.order ??= {}
popWhere.shipping_methods ??= {}
popWhere.shipping_methods.version = version
popWhere.shipping_methods.deleted_at ??= null
popWhere.shipping_methods.shipping_method ??= {}
popWhere.shipping_methods.shipping_method.deleted_at ??= null
}
const orderWhere = isRelatedEntity ? popWhere.order : popWhere
@@ -80,9 +87,12 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
orderWhere.items.version = version
orderWhere.items.deleted_at ??= null
popWhere.shipping_methods ??= {}
popWhere.shipping_methods.version = version
popWhere.shipping_methods.deleted_at ??= null
orderWhere.shipping_methods ??= {}
orderWhere.shipping_methods.version = version
orderWhere.shipping_methods.deleted_at ??= null
orderWhere.shipping_methods.shipping_method ??= {}
orderWhere.shipping_methods.shipping_method.deleted_at ??= null
if (!config.options.orderBy) {
config.options.orderBy = { id: "ASC" }