order

packages/core/types/src/dml/index.ts

@@ -15,7 +15,6 @@ export type IDmlEntityConfig =
   | {
       name?: string
       tableName: string
-      disableSoftDeleteFilter?: boolean
     }
 
 export type InferDmlEntityNameFromConfig<TConfig extends IDmlEntityConfig> =

packages/core/utils/src/dml/entity.ts

@@ -26,11 +26,9 @@ function extractNameAndTableName<const Config extends IDmlEntityConfig>(
   const result = {
     name: "",
     tableName: "",
-    disableSoftDeleteFilter: false,
   } as {
     name: InferDmlEntityNameFromConfig<Config>
     tableName: string
-    disableSoftDeleteFilter: boolean
   }
 
   if (isString(nameOrConfig)) {
@@ -58,8 +56,6 @@ function extractNameAndTableName<const Config extends IDmlEntityConfig>(
       toCamelCase(name)
     ) as InferDmlEntityNameFromConfig<Config>
     result.tableName = nameOrConfig.tableName
-    result.disableSoftDeleteFilter =
-      nameOrConfig.disableSoftDeleteFilter ?? false
   }
 
   return result
@@ -81,19 +77,15 @@ export class DmlEntity<
 
   readonly #tableName: string
   #cascades: EntityCascades<string[], string[]> = {}
-  #params: Record<string, unknown>
+
   #indexes: EntityIndex<Schema>[] = []
   #checks: CheckConstraint<Schema>[] = []
 
   constructor(nameOrConfig: TConfig, schema: Schema) {
-    const { name, tableName, disableSoftDeleteFilter } =
-      extractNameAndTableName(nameOrConfig)
+    const { name, tableName } = extractNameAndTableName(nameOrConfig)
     this.schema = schema
     this.name = name
     this.#tableName = tableName
-    this.#params = {
-      disableSoftDeleteFilter,
-    }
   }
 
   /**
@@ -116,7 +108,6 @@ export class DmlEntity<
     schema: DMLSchema
     cascades: EntityCascades<string[], string[]>
     indexes: EntityIndex<Schema>[]
-    params: Record<string, unknown>
     checks: CheckConstraint<Schema>[]
   } {
     return {
@@ -125,7 +116,6 @@ export class DmlEntity<
       schema: this.schema,
       cascades: this.#cascades,
       indexes: this.#indexes,
-      params: this.#params,
       checks: this.#checks,
     }
   }

packages/modules/order/integration-tests/__tests__/order-claim.ts

@@ -103,7 +103,7 @@ moduleIntegrationTestRunner({
         customer_id: "joe",
       } as CreateOrderDTO
 
-      it.only("should claim an item and add two new items to the order", async function () {
+      it("should claim an item and add two new items to the order", async function () {
         const createdOrder = await service.createOrders(input)
         createdOrder.items = createdOrder.items!.sort((a, b) =>
           a.title.localeCompare(b.title)

packages/modules/order/integration-tests/__tests__/order-return.ts

@@ -627,7 +627,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
             "items.detail.return_received_quantity",
             "shipping_methods.id",
           ],
-          relations: ["items", "items.detail"],
+          relations: ["items", "items.detail", "shipping_methods"],
         })
 
         serializedOrder = JSON.parse(JSON.stringify(getOrder))

packages/modules/order/src/models/address.ts

@@ -4,7 +4,6 @@ const _OrderAddress = model
   .define(
     {
       tableName: "order_address",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordaddr" }).primaryKey(),

packages/modules/order/src/models/claim-item.ts

@@ -7,7 +7,6 @@ const _OrderClaimItem = model
   .define(
     {
       tableName: "order_claim_item",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "claitem" }).primaryKey(),

packages/modules/order/src/models/claim.ts

@@ -52,12 +52,7 @@ const _OrderClaim = model
     ),
   })
   .cascades({
-    delete: [
-      "additional_items",
-      "claim_items",
-      "shipping_methods",
-      "transactions",
-    ],
+    delete: ["additional_items", "claim_items", "transactions"],
   })
   .indexes([
     {

packages/modules/order/src/models/exchange-item.ts

@@ -6,7 +6,6 @@ const _OrderExchangeItem = model
   .define(
     {
       tableName: "order_exchange_item",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "oexcitem" }).primaryKey(),

packages/modules/order/src/models/line-item-adjustment.ts

@@ -5,7 +5,6 @@ const _OrderLineItemAdjustment = model
   .define(
     {
       tableName: "order_line_item_adjustment",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordliadj" }).primaryKey(),

packages/modules/order/src/models/line-item-tax-line.ts

@@ -5,7 +5,6 @@ const _OrderLineItemTaxLine = model
   .define(
     {
       tableName: "order_line_item_tax_line",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordlitxl" }).primaryKey(),

packages/modules/order/src/models/order-change-action.ts

@@ -46,17 +46,6 @@ const _OrderChangeAction = model
       })
       .nullable(),
   })
-  /*
-  .hooks({
-    creating: (entity: any) => {
-      entity.order_id ??= entity.order_change?.order_id ?? null
-      entity.return_id ??= entity.order_change?.return_id ?? null
-      entity.claim_id ??= entity.order_change?.claim_id ?? null
-      entity.exchange_id ??= entity.order_change?.exchange_id ?? null
-      entity.version ??= entity.order_change?.version ?? null
-    },
-  })
-    */
   .indexes([
     {
       name: "IDX_order_change_action_order_change_id",

packages/modules/order/src/models/order-change.ts

@@ -49,10 +49,7 @@ const _OrderChange = model
       })
       .nullable(),
     actions: model.hasMany<() => typeof OrderChangeAction>(
-      () => OrderChangeAction,
-      {
-        mappedBy: "order_change",
-      }
+      () => OrderChangeAction
     ),
   })
   .cascades({

packages/modules/order/src/models/order-item.ts

@@ -7,7 +7,6 @@ const _OrderItem = model
   .define(
     {
       tableName: "order_item",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "orditem" }).primaryKey(),
@@ -26,17 +25,12 @@ const _OrderItem = model
       order: model.belongsTo<() => typeof Order>(() => Order, {
         mappedBy: "items",
       }),
-      item: model
-        .hasOne<() => typeof OrderLineItem>(() => OrderLineItem, {
-          mappedBy: undefined,
-          foreignKey: true,
-        })
-        .nullable(),
+      item: model.hasOne<() => typeof OrderLineItem>(() => OrderLineItem, {
+        mappedBy: undefined,
+        foreignKey: true,
+      }),
     }
   )
-  .cascades({
-    delete: ["item"],
-  })
   .indexes([
     {
       name: "IDX_order_item_order_id",

packages/modules/order/src/models/order-shipping-method.ts

@@ -9,7 +9,6 @@ const _OrderShipping = model
   .define(
     {
       tableName: "order_shipping",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordspmv" }).primaryKey(),

packages/modules/order/src/models/order-summary.ts

@@ -5,7 +5,6 @@ const _OrderSummary = model
   .define(
     {
       tableName: "order_summary",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordsum" }).primaryKey(),

packages/modules/order/src/models/order.ts

@@ -10,7 +10,6 @@ const _Order = model
   .define(
     {
       tableName: "order",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "order" }).primaryKey(),

packages/modules/order/src/models/return-item.ts

@@ -7,7 +7,6 @@ const _ReturnItem = model
   .define(
     {
       tableName: "return_item",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "retitem" }).primaryKey(),

packages/modules/order/src/models/shipping-method-adjustment.ts

@@ -5,7 +5,6 @@ const _OrderShippingMethodAdjustment = model
   .define(
     {
       tableName: "order_shipping_method_adjustment",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordsmadj" }).primaryKey(),

packages/modules/order/src/models/shipping-method-tax-line.ts

@@ -5,7 +5,6 @@ const _OrderShippingMethodTaxLine = model
   .define(
     {
       tableName: "order_shipping_method_tax_line",
-      disableSoftDeleteFilter: true,
     },
     {
       id: model.id({ prefix: "ordsmtxl" }).primaryKey(),

packages/modules/order/src/services/order-module-service.ts

@@ -142,7 +142,7 @@ const generateMethodForModels = {
 {
   const MikroORMEntity = toMikroORMEntity(OrderChangeAction)
   MikroORMEntity.prototype["onInit_OrderChangeAction"] = function () {
-    this.version ??= this.order?.version ?? null
+    this.version ??= this.order_change?.version ?? null
 
     this.order ??= rel(
       toMikroORMEntity(Order),
@@ -178,6 +178,10 @@ const generateMethodForModels = {
       toMikroORMEntity(OrderExchange),
       this.exchange?.id ?? null
     )
+    this.shipping_method ??= rel(
+      toMikroORMEntity(OrderShippingMethod),
+      this.shipping_method?.id ?? null
+    )
   }
   OnInit()(MikroORMEntity.prototype, "onInit_OrderShipping")
   BeforeCreate()(MikroORMEntity.prototype, "onInit_OrderShipping")
@@ -2966,8 +2970,8 @@ export default class OrderModuleService
         ],
       },
       sharedContext
-      // TODO: investigate issue while using sharedContext in receive return action
     )
+
     orders = formatOrder(orders, {
       entity: Order,
     }) as OrderDTO[]

packages/modules/order/src/utils/base-repository-find.ts

@@ -84,7 +84,6 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
     }
 
     config.where ??= {}
-    config.where.deleted_at ??= null
 
     return await manager.find(this.entity, config.where, config.options)
   }
@@ -172,10 +171,16 @@ function configurePopulateWhere(
 
   if (isRelatedEntity) {
     popWhere.order ??= {}
+    popWhere.order.version = version
 
     if (hasRelation("shipping_methods")) {
       popWhere.shipping_methods ??= {}
-      popWhere.shipping_methods.deleted_at ??= null
+      popWhere.shipping_methods.version = version
+    }
+
+    if (hasRelation("shipping_methods")) {
+      popWhere.shipping_methods ??= {}
+      popWhere.shipping_methods.version = version
     }
   }
 
@@ -186,15 +191,13 @@ function configurePopulateWhere(
     orderWhere.summary.version = version
   }
 
-  if (hasRelation("items")) {
+  if (hasRelation("items") || hasRelation("order.items")) {
     orderWhere.items ??= {}
     orderWhere.items.version = version
-    orderWhere.items.deleted_at ??= null
   }
 
   if (hasRelation("shipping_methods")) {
     orderWhere.shipping_methods ??= {}
     orderWhere.shipping_methods.version = version
-    orderWhere.shipping_methods.deleted_at ??= null
   }
 }