fix(orchestration): remote joiner alias conflict (#8844)

packages/core/core-flows/src/order/steps/add-order-transaction.ts

@@ -11,7 +11,7 @@ export const addOrderTransactionStep = createStep(
   async (data: CreateOrderTransactionDTO, { container }) => {
     const service = container.resolve(ModuleRegistrationName.ORDER)
 
-    const created = await service.addTransactions(data)
+    const created = await service.addOrderTransactions(data)
 
     return new StepResponse(created, created.id)
   },
@@ -22,6 +22,6 @@ export const addOrderTransactionStep = createStep(
 
     const service = container.resolve(ModuleRegistrationName.ORDER)
 
-    await service.deleteTransactions(id)
+    await service.deleteOrderTransactions(id)
   }
 )

packages/core/core-flows/src/order/steps/create-line-items.ts

@@ -16,7 +16,7 @@ export const createOrderLineItemsStep = createStep(
     const orderModule = container.resolve(ModuleRegistrationName.ORDER)
 
     const createdItems = input.items.length
-      ? await orderModule.createLineItems(input.items)
+      ? await orderModule.createOrderLineItems(input.items)
       : []
 
     return new StepResponse(
@@ -31,6 +31,6 @@ export const createOrderLineItemsStep = createStep(
 
     const orderModule = container.resolve(ModuleRegistrationName.ORDER)
 
-    await orderModule.deleteLineItems(itemIds)
+    await orderModule.deleteOrderLineItems(itemIds)
   }
 )

packages/core/core-flows/src/order/steps/create-order-shipping-methods.ts

@@ -3,7 +3,7 @@ import {
   IOrderModuleService,
 } from "@medusajs/types"
 import { ModuleRegistrationName } from "@medusajs/utils"
-import { createStep, StepResponse } from "@medusajs/workflows-sdk"
+import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 export interface CreateOrderShippingMethodsStepInput {
   shipping_methods: CreateOrderShippingMethodDTO[]
@@ -19,7 +19,9 @@ export const createOrderShippingMethods = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const created = await service.createShippingMethods(input.shipping_methods)
+    const created = await service.createOrderShippingMethods(
+      input.shipping_methods
+    )
 
     return new StepResponse(
       created,
@@ -35,6 +37,6 @@ export const createOrderShippingMethods = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.deleteShippingMethods(createdMethodIds)
+    await service.deleteOrderShippingMethods(createdMethodIds)
   }
 )

packages/core/core-flows/src/order/steps/delete-line-items.ts

@@ -16,7 +16,7 @@ export const deleteOrderLineItems = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const deleted = await service.softDeleteLineItems(input.ids)
+    const deleted = await service.softDeleteOrderLineItems(input.ids)
 
     return new StepResponse(deleted, input.ids)
   },
@@ -29,6 +29,6 @@ export const deleteOrderLineItems = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.restoreLineItems(ids)
+    await service.restoreOrderLineItems(ids)
   }
 )

packages/core/core-flows/src/order/steps/delete-order-shipping-methods.ts

@@ -6,7 +6,6 @@ export interface DeleteOrderShippingMethodsStepInput {
   ids: string[]
 }
 
-
 /**
  * This step deletes order shipping methods.
  */
@@ -17,7 +16,7 @@ export const deleteOrderShippingMethods = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const deleted = await service.softDeleteShippingMethods(input.ids)
+    const deleted = await service.softDeleteOrderShippingMethods(input.ids)
 
     return new StepResponse(deleted, input.ids)
   },
@@ -30,6 +29,6 @@ export const deleteOrderShippingMethods = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.restoreShippingMethods(ids)
+    await service.restoreOrderShippingMethods(ids)
   }
 )

packages/core/core-flows/src/order/steps/set-tax-lines-for-items.ts

@@ -28,23 +28,25 @@ export const setOrderTaxLinesForItemsStep = createStep(
     )
 
     const getShippingTaxLinesPromise =
-      await orderService.listShippingMethodTaxLines({
+      await orderService.listOrderShippingMethodTaxLines({
         shipping_method_id: shipping_tax_lines.map((t) => t.shipping_line_id),
       })
 
-    const getItemTaxLinesPromise = await orderService.listLineItemTaxLines({
+    const getItemTaxLinesPromise = await orderService.listOrderLineItemTaxLines(
-      item_id: item_tax_lines.map((t) => t.line_item_id),
+      {
-    })
+        item_id: item_tax_lines.map((t) => t.line_item_id),
+      }
+    )
 
     const itemsTaxLinesData = normalizeItemTaxLinesForOrder(item_tax_lines)
     const setItemTaxLinesPromise = itemsTaxLinesData.length
-      ? orderService.setLineItemTaxLines(order.id, itemsTaxLinesData)
+      ? orderService.setOrderLineItemTaxLines(order.id, itemsTaxLinesData)
       : void 0
 
     const shippingTaxLinesData =
       normalizeShippingTaxLinesForOrder(shipping_tax_lines)
     const setShippingTaxLinesPromise = shippingTaxLinesData.length
-      ? await orderService.setShippingMethodTaxLines(
+      ? await orderService.setOrderShippingMethodTaxLines(
           order.id,
           shippingTaxLinesData
         )
@@ -77,7 +79,7 @@ export const setOrderTaxLinesForItemsStep = createStep(
     )
 
     if (existingLineItemTaxLines) {
-      await orderService.setLineItemTaxLines(
+      await orderService.setOrderLineItemTaxLines(
         order.id,
         existingLineItemTaxLines.map((taxLine) => ({
           description: taxLine.description,
@@ -90,7 +92,7 @@ export const setOrderTaxLinesForItemsStep = createStep(
       )
     }
 
-    await orderService.setShippingMethodTaxLines(
+    await orderService.setOrderShippingMethodTaxLines(
       order.id,
       existingShippingMethodTaxLines.map((taxLine) => ({
         description: taxLine.description,

packages/core/core-flows/src/order/steps/update-shipping-methods.ts

@@ -22,12 +22,12 @@ export const updateOrderShippingMethodsStep = createStep(
     const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, {
       objectFields: ["metadata"],
     })
-    const dataBeforeUpdate = await service.listShippingMethods(
+    const dataBeforeUpdate = await service.listOrderShippingMethods(
       { id: data.map((d) => d.id) },
       { relations, select: selects }
     )
 
-    const updated = await service.updateShippingMethods(data)
+    const updated = await service.updateOrderShippingMethods(data)
 
     return new StepResponse(updated, dataBeforeUpdate)
   },
@@ -40,6 +40,6 @@ export const updateOrderShippingMethodsStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.updateShippingMethods(dataBeforeUpdate)
+    await service.updateOrderShippingMethods(dataBeforeUpdate)
   }
 )

packages/core/orchestration/src/joiner/remote-joiner.ts

@@ -204,8 +204,8 @@ export class RemoteJoiner {
 
         // self-reference
         for (const alias of service_.alias) {
-          if (this.serviceConfigCache.has(`alias_${alias.name}}`)) {
+          if (this.serviceConfigCache.has(`alias_${alias.name}`)) {
-            const defined = this.serviceConfigCache.get(`alias_${alias.name}}`)
+            const defined = this.serviceConfigCache.get(`alias_${alias.name}`)
 
             if (service_.serviceName === defined?.serviceName) {
               continue

packages/core/types/src/cart/service.ts

@@ -32,8 +32,8 @@ import {
   CreateShippingMethodForSingleCartDTO,
   CreateShippingMethodTaxLineDTO,
   UpdateAddressDTO,
-  UpdateCartDataDTO,
   UpdateCartDTO,
+  UpdateCartDataDTO,
   UpdateLineItemDTO,
   UpdateLineItemTaxLineDTO,
   UpdateLineItemWithSelectorDTO,

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

@@ -21,7 +21,7 @@ const FulfillmentDeletedAtIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "fulfillment_address" })
-export default class Address {
+export default class FulfillmentAddress {
   [OptionalProps]: OptionalAddressProps
 
   @PrimaryKey({ columnType: "text" })

packages/modules/fulfillment/src/models/fulfillment.ts

@@ -20,7 +20,7 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import Address from "./address"
+import FulfillmentAddress from "./address"
 import FulfillmentItem from "./fulfillment-item"
 import FulfillmentLabel from "./fulfillment-label"
 import FulfillmentProvider from "./fulfillment-provider"
@@ -127,13 +127,13 @@ export default class Fulfillment {
   provider: Rel<FulfillmentProvider>
 
   @OneToOne({
-    entity: () => Address,
+    entity: () => FulfillmentAddress,
     owner: true,
     cascade: [Cascade.PERSIST, "soft-remove"] as any,
     nullable: true,
     onDelete: "cascade",
   })
-  delivery_address!: Rel<Address>
+  delivery_address!: Rel<FulfillmentAddress>
 
   @OneToMany(() => FulfillmentItem, (item) => item.fulfillment, {
     cascade: [Cascade.PERSIST, "soft-remove"] as any,

packages/modules/fulfillment/src/models/index.ts

@@ -1,4 +1,4 @@
-export { default as Address } from "./address"
+export { default as FulfillmentAddress } from "./address"
 export { default as Fulfillment } from "./fulfillment"
 export { default as FulfillmentItem } from "./fulfillment-item"
 export { default as FulfillmentLabel } from "./fulfillment-label"
@@ -10,4 +10,3 @@ export { default as ShippingOption } from "./shipping-option"
 export { default as ShippingOptionRule } from "./shipping-option-rule"
 export { default as ShippingOptionType } from "./shipping-option-type"
 export { default as ShippingProfile } from "./shipping-profile"
-

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

@@ -217,7 +217,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           })
         )
 
-        const refund = await service.addTransactions([
+        const refund = await service.addOrderTransactions([
           {
             order_id: created.id,
             amount: -20,
@@ -242,7 +242,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           })
         )
 
-        await service.softDeleteTransactions([refund[0].id])
+        await service.softDeleteOrderTransactions([refund[0].id])
 
         const serializedOrder2 = JSON.parse(
           JSON.stringify(
@@ -261,7 +261,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           })
         )
 
-        await service.addTransactions([
+        await service.addOrderTransactions([
           {
             order_id: created.id,
             amount: -50,
@@ -286,7 +286,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           })
         )
 
-        await service.restoreTransactions([refund[0].id])
+        await service.restoreOrderTransactions([refund[0].id])
 
         const serializedOrder4 = JSON.parse(
           JSON.stringify(

packages/modules/order/integration-tests/__tests__/index.spec.ts

@@ -14,19 +14,19 @@ moduleIntegrationTestRunner<IOrderModuleService>({
 
         expect(Object.keys(linkable)).toEqual([
           "order",
-          "address",
+          "orderAddress",
-          "lineItem",
+          "orderLineItem",
-          "lineItemAdjustment",
+          "orderLineItemAdjustment",
-          "lineItemTaxLine",
+          "orderLineItemTaxLine",
-          "shippingMethod",
+          "orderShippingMethod",
-          "shippingMethodAdjustment",
+          "orderShippingMethodAdjustment",
-          "shippingMethodTaxLine",
+          "orderShippingMethodTaxLine",
-          "transaction",
+          "orderTransaction",
           "orderChange",
           "orderChangeAction",
           "orderItem",
           "orderSummary",
-          "orderShippingMethod",
+          "orderShipping",
           "returnReason",
           "return",
           "returnItem",
@@ -50,68 +50,68 @@ moduleIntegrationTestRunner<IOrderModuleService>({
               field: "order",
             },
           },
-          address: {
+          orderAddress: {
             id: {
-              linkable: "address_id",
+              linkable: "order_address_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "address",
+              field: "orderAddress",
             },
           },
-          lineItem: {
+          orderLineItem: {
             id: {
-              linkable: "line_item_id",
+              linkable: "order_line_item_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "lineItem",
+              field: "orderLineItem",
             },
           },
-          lineItemAdjustment: {
+          orderLineItemAdjustment: {
             id: {
-              linkable: "line_item_adjustment_id",
+              linkable: "order_line_item_adjustment_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "lineItemAdjustment",
+              field: "orderLineItemAdjustment",
             },
           },
-          lineItemTaxLine: {
+          orderLineItemTaxLine: {
             id: {
-              linkable: "line_item_tax_line_id",
+              linkable: "order_line_item_tax_line_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "lineItemTaxLine",
+              field: "orderLineItemTaxLine",
             },
           },
-          shippingMethod: {
+          orderShippingMethod: {
             id: {
-              linkable: "shipping_method_id",
+              linkable: "order_shipping_method_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "shippingMethod",
+              field: "orderShippingMethod",
             },
           },
-          shippingMethodAdjustment: {
+          orderShippingMethodAdjustment: {
             id: {
-              linkable: "shipping_method_adjustment_id",
+              linkable: "order_shipping_method_adjustment_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "shippingMethodAdjustment",
+              field: "orderShippingMethodAdjustment",
             },
           },
-          shippingMethodTaxLine: {
+          orderShippingMethodTaxLine: {
             id: {
-              linkable: "shipping_method_tax_line_id",
+              linkable: "order_shipping_method_tax_line_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "shippingMethodTaxLine",
+              field: "orderShippingMethodTaxLine",
             },
           },
-          transaction: {
+          orderTransaction: {
             id: {
-              linkable: "transaction_id",
+              linkable: "order_transaction_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "transaction",
+              field: "orderTransaction",
             },
           },
           orderChange: {
@@ -146,12 +146,12 @@ moduleIntegrationTestRunner<IOrderModuleService>({
               field: "orderSummary",
             },
           },
-          orderShippingMethod: {
+          orderShipping: {
             id: {
-              linkable: "order_shipping_method_id",
+              linkable: "order_shipping_id",
               primaryKey: "id",
               serviceName: "order",
-              field: "orderShippingMethod",
+              field: "orderShipping",
             },
           },
           returnReason: {
@@ -188,18 +188,18 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           },
           orderClaimItem: {
             id: {
-              field: "orderClaimItem",
               linkable: "order_claim_item_id",
               primaryKey: "id",
               serviceName: "order",
+              field: "orderClaimItem",
             },
           },
           orderClaimItemImage: {
             id: {
-              field: "orderClaimItemImage",
               linkable: "order_claim_item_image_id",
               primaryKey: "id",
               serviceName: "order",
+              field: "orderClaimItemImage",
             },
           },
           orderExchange: {
@@ -212,10 +212,10 @@ moduleIntegrationTestRunner<IOrderModuleService>({
           },
           orderExchangeItem: {
             id: {
-              field: "orderExchangeItem",
               linkable: "order_exchange_item_id",
               primaryKey: "id",
               serviceName: "order",
+              field: "orderExchangeItem",
             },
           },
         })

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

@@ -20,7 +20,7 @@ const CustomerIdIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "order_address" })
-export default class Address {
+export default class OrderAddress {
   [OptionalProps]: OptionalAddressProps
 
   @PrimaryKey({ columnType: "text" })

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

@@ -21,7 +21,7 @@ import {
 } from "@mikro-orm/core"
 import Claim from "./claim"
 import OrderClaimItemImage from "./claim-item-image"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 
 type OptionalLineItemProps = DAL.ModelDateColumns
 
@@ -80,7 +80,7 @@ export default class OrderClaimItem {
   claim: Rel<Claim>
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     fieldName: "item_id",
     mapToPk: true,
     columnType: "text",
@@ -88,10 +88,10 @@ export default class OrderClaimItem {
   @ItemIdIndex.MikroORMIndex()
   item_id: string
 
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     persist: false,
   })
-  item: Rel<LineItem>
+  item: Rel<OrderLineItem>
 
   @Property({ columnType: "boolean", default: false })
   is_additional_item: boolean = false

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

@@ -25,9 +25,9 @@ import {
 } from "@mikro-orm/core"
 import ClaimItem from "./claim-item"
 import Order from "./order"
-import OrderShippingMethod from "./order-shipping-method"
+import OrderShipping from "./order-shipping-method"
 import Return from "./return"
-import Transaction from "./transaction"
+import OrderTransaction from "./transaction"
 
 type OptionalOrderClaimProps = DAL.ModelDateColumns
 
@@ -123,19 +123,15 @@ export default class OrderClaim {
   })
   claim_items = new Collection<Rel<ClaimItem>>(this)
 
-  @OneToMany(
+  @OneToMany(() => OrderShipping, (shippingMethod) => shippingMethod.claim, {
-    () => OrderShippingMethod,
-    (shippingMethod) => shippingMethod.claim,
-    {
-      cascade: [Cascade.PERSIST],
-    }
-  )
-  shipping_methods = new Collection<Rel<OrderShippingMethod>>(this)
-
-  @OneToMany(() => Transaction, (transaction) => transaction.claim, {
     cascade: [Cascade.PERSIST],
   })
-  transactions = new Collection<Transaction>(this)
+  shipping_methods = new Collection<Rel<OrderShipping>>(this)
+
+  @OneToMany(() => OrderTransaction, (transaction) => transaction.claim, {
+    cascade: [Cascade.PERSIST],
+  })
+  transactions = new Collection<OrderTransaction>(this)
 
   @Property({ columnType: "text", nullable: true })
   created_by: string | null = null

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

@@ -14,7 +14,7 @@ import {
   Property,
 } from "@mikro-orm/core"
 import Exchange from "./exchange"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 
 type OptionalLineItemProps = DAL.ModelDateColumns
 
@@ -64,7 +64,7 @@ export default class OrderExchangeItem {
   exchange: Exchange
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     fieldName: "item_id",
     mapToPk: true,
     columnType: "text",
@@ -72,10 +72,10 @@ export default class OrderExchangeItem {
   @ItemIdIndex.MikroORMIndex()
   item_id: string
 
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     persist: false,
   })
-  item: LineItem
+  item: OrderLineItem
 
   @Property({ columnType: "text", nullable: true })
   note: string

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

@@ -21,9 +21,9 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import { OrderExchangeItem, Transaction } from "@models"
+import { OrderExchangeItem, OrderTransaction } from "@models"
 import Order from "./order"
-import OrderShippingMethod from "./order-shipping-method"
+import OrderShipping from "./order-shipping-method"
 import Return from "./return"
 
 type OptionalOrderExchangeProps = DAL.ModelDateColumns
@@ -115,19 +115,15 @@ export default class OrderExchange {
   })
   additional_items = new Collection<Rel<OrderExchangeItem>>(this)
 
-  @OneToMany(
+  @OneToMany(() => OrderShipping, (shippingMethod) => shippingMethod.exchange, {
-    () => OrderShippingMethod,
-    (shippingMethod) => shippingMethod.exchange,
-    {
-      cascade: [Cascade.PERSIST],
-    }
-  )
-  shipping_methods = new Collection<Rel<OrderShippingMethod>>(this)
-
-  @OneToMany(() => Transaction, (transaction) => transaction.exchange, {
     cascade: [Cascade.PERSIST],
   })
-  transactions = new Collection<Transaction>(this)
+  shipping_methods = new Collection<Rel<OrderShipping>>(this)
+
+  @OneToMany(() => OrderTransaction, (transaction) => transaction.exchange, {
+    cascade: [Cascade.PERSIST],
+  })
+  transactions = new Collection<OrderTransaction>(this)
 
   @Property({ columnType: "text", nullable: true })
   created_by: string | null = null

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

@@ -1,22 +1,22 @@
-export { default as Address } from "./address"
+export { default as OrderAddress } from "./address"
 export { default as OrderClaim } from "./claim"
 export { default as OrderClaimItem } from "./claim-item"
 export { default as OrderClaimItemImage } from "./claim-item-image"
 export { default as OrderExchange } from "./exchange"
 export { default as OrderExchangeItem } from "./exchange-item"
-export { default as LineItem } from "./line-item"
+export { default as OrderLineItem } from "./line-item"
-export { default as LineItemAdjustment } from "./line-item-adjustment"
+export { default as OrderLineItemAdjustment } from "./line-item-adjustment"
-export { default as LineItemTaxLine } from "./line-item-tax-line"
+export { default as OrderLineItemTaxLine } from "./line-item-tax-line"
 export { default as Order } from "./order"
 export { default as OrderChange } from "./order-change"
 export { default as OrderChangeAction } from "./order-change-action"
 export { default as OrderItem } from "./order-item"
-export { default as OrderShippingMethod } from "./order-shipping-method"
+export { default as OrderShipping } from "./order-shipping-method"
 export { default as OrderSummary } from "./order-summary"
 export { default as Return } from "./return"
 export { default as ReturnItem } from "./return-item"
 export { default as ReturnReason } from "./return-reason"
-export { default as ShippingMethod } from "./shipping-method"
+export { default as OrderShippingMethod } from "./shipping-method"
-export { default as ShippingMethodAdjustment } from "./shipping-method-adjustment"
+export { default as OrderShippingMethodAdjustment } from "./shipping-method-adjustment"
-export { default as ShippingMethodTaxLine } from "./shipping-method-tax-line"
+export { default as OrderShippingMethodTaxLine } from "./shipping-method-tax-line"
-export { default as Transaction } from "./transaction"
+export { default as OrderTransaction } from "./transaction"

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

@@ -4,7 +4,7 @@ import {
 } from "@medusajs/utils"
 import { BeforeCreate, Entity, ManyToOne, OnInit, Rel } from "@mikro-orm/core"
 import AdjustmentLine from "./adjustment-line"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 
 const ItemIdIndex = createPsqlIndexStatementHelper({
   tableName: "order_line_item_adjustment",
@@ -12,14 +12,14 @@ const ItemIdIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "order_line_item_adjustment" })
-export default class LineItemAdjustment extends AdjustmentLine {
+export default class OrderLineItemAdjustment extends AdjustmentLine {
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     persist: false,
   })
-  item: Rel<LineItem>
+  item: Rel<OrderLineItem>
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     columnType: "text",
     fieldName: "item_id",
     onDelete: "cascade",

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

@@ -10,7 +10,7 @@ import {
   OnInit,
   Rel,
 } from "@mikro-orm/core"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 import TaxLine from "./tax-line"
 
 const ItemIdIndex = createPsqlIndexStatementHelper({
@@ -19,15 +19,15 @@ const ItemIdIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "order_line_item_tax_line" })
-export default class LineItemTaxLine extends TaxLine {
+export default class OrderLineItemTaxLine extends TaxLine {
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     fieldName: "item_id",
     persist: false,
   })
-  item: Rel<LineItem>
+  item: Rel<OrderLineItem>
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     columnType: "text",
     fieldName: "item_id",
     cascade: [Cascade.PERSIST, Cascade.REMOVE],

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

@@ -19,8 +19,8 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import LineItemAdjustment from "./line-item-adjustment"
+import OrderLineItemAdjustment from "./line-item-adjustment"
-import LineItemTaxLine from "./line-item-tax-line"
+import OrderLineItemTaxLine from "./line-item-tax-line"
 
 type OptionalLineItemProps = DAL.ModelDateColumns
 
@@ -44,7 +44,7 @@ const VariantIdIndex = createPsqlIndexStatementHelper({
 
 @Entity({ tableName: "order_line_item" })
 @Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
-export default class LineItem {
+export default class OrderLineItem {
   [OptionalProps]?: OptionalLineItemProps
 
   @PrimaryKey({ columnType: "text" })
@@ -128,15 +128,15 @@ export default class LineItem {
   @Property({ columnType: "jsonb" })
   raw_unit_price: BigNumberRawValue
 
-  @OneToMany(() => LineItemTaxLine, (taxLine) => taxLine.item, {
+  @OneToMany(() => OrderLineItemTaxLine, (taxLine) => taxLine.item, {
     cascade: [Cascade.PERSIST, "soft-remove" as Cascade],
   })
-  tax_lines = new Collection<Rel<LineItemTaxLine>>(this)
+  tax_lines = new Collection<Rel<OrderLineItemTaxLine>>(this)
 
-  @OneToMany(() => LineItemAdjustment, (adjustment) => adjustment.item, {
+  @OneToMany(() => OrderLineItemAdjustment, (adjustment) => adjustment.item, {
     cascade: [Cascade.PERSIST, "soft-remove" as Cascade],
   })
-  adjustments = new Collection<Rel<LineItemAdjustment>>(this)
+  adjustments = new Collection<Rel<OrderLineItemAdjustment>>(this)
 
   @Property({ columnType: "jsonb", nullable: true })
   metadata: Record<string, unknown> | null = null

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

@@ -15,7 +15,7 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 import Order from "./order"
 
 type OptionalLineItemProps = DAL.ModelDateColumns
@@ -71,7 +71,7 @@ export default class OrderItem {
   version: number
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     fieldName: "item_id",
     mapToPk: true,
     columnType: "text",
@@ -79,10 +79,10 @@ export default class OrderItem {
   @ItemIdIndex.MikroORMIndex()
   item_id: string
 
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     persist: false,
   })
-  item: Rel<LineItem>
+  item: Rel<OrderLineItem>
 
   @MikroOrmBigNumberProperty()
   quantity: BigNumber | number

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

@@ -17,7 +17,7 @@ import Claim from "./claim"
 import Exchange from "./exchange"
 import Order from "./order"
 import Return from "./return"
-import ShippingMethod from "./shipping-method"
+import OrderShippingMethod from "./shipping-method"
 
 type OptionalShippingMethodProps = DAL.ModelDateColumns
 
@@ -65,7 +65,7 @@ const DeletedAtIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName })
-export default class OrderShippingMethod {
+export default class OrderShipping {
   [OptionalProps]?: OptionalShippingMethodProps
 
   @PrimaryKey({ columnType: "text" })
@@ -138,7 +138,7 @@ export default class OrderShippingMethod {
   version: number
 
   @ManyToOne({
-    entity: () => ShippingMethod,
+    entity: () => OrderShippingMethod,
     fieldName: "shipping_method_id",
     mapToPk: true,
     columnType: "text",
@@ -146,10 +146,10 @@ export default class OrderShippingMethod {
   @ItemIdIndex.MikroORMIndex()
   shipping_method_id: string
 
-  @ManyToOne(() => ShippingMethod, {
+  @ManyToOne(() => OrderShippingMethod, {
     persist: false,
   })
-  shipping_method: Rel<ShippingMethod>
+  shipping_method: Rel<OrderShippingMethod>
 
   @Property({
     onCreate: () => new Date(),

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

@@ -18,11 +18,11 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import Address from "./address"
+import OrderAddress from "./address"
 import OrderItem from "./order-item"
-import OrderShippingMethod from "./order-shipping-method"
+import OrderShipping from "./order-shipping-method"
 import OrderSummary from "./order-summary"
-import Transaction from "./transaction"
+import OrderTransaction from "./transaction"
 
 type OptionalOrderProps =
   | "shipping_address"
@@ -142,24 +142,24 @@ export default class Order {
   shipping_address_id?: string | null
 
   @ManyToOne({
-    entity: () => Address,
+    entity: () => OrderAddress,
     fieldName: "shipping_address_id",
     nullable: true,
     cascade: [Cascade.PERSIST],
   })
-  shipping_address?: Rel<Address> | null
+  shipping_address?: Rel<OrderAddress> | null
 
   @Property({ columnType: "text", nullable: true })
   @BillingAddressIdIndex.MikroORMIndex()
   billing_address_id?: string | null
 
   @ManyToOne({
-    entity: () => Address,
+    entity: () => OrderAddress,
     fieldName: "billing_address_id",
     nullable: true,
     cascade: [Cascade.PERSIST],
   })
-  billing_address?: Rel<Address> | null
+  billing_address?: Rel<OrderAddress> | null
 
   @Property({ columnType: "boolean", nullable: true })
   no_notification: boolean | null = null
@@ -177,19 +177,15 @@ export default class Order {
   })
   items = new Collection<Rel<OrderItem>>(this)
 
-  @OneToMany(
+  @OneToMany(() => OrderShipping, (shippingMethod) => shippingMethod.order, {
-    () => OrderShippingMethod,
-    (shippingMethod) => shippingMethod.order,
-    {
-      cascade: [Cascade.PERSIST],
-    }
-  )
-  shipping_methods = new Collection<Rel<OrderShippingMethod>>(this)
-
-  @OneToMany(() => Transaction, (transaction) => transaction.order, {
     cascade: [Cascade.PERSIST],
   })
-  transactions = new Collection<Rel<Transaction>>(this)
+  shipping_methods = new Collection<Rel<OrderShipping>>(this)
+
+  @OneToMany(() => OrderTransaction, (transaction) => transaction.order, {
+    cascade: [Cascade.PERSIST],
+  })
+  transactions = new Collection<Rel<OrderTransaction>>(this)
 
   @Property({
     onCreate: () => new Date(),

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

@@ -13,7 +13,7 @@ import {
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
-import LineItem from "./line-item"
+import OrderLineItem from "./line-item"
 import Return from "./return"
 import ReturnReason from "./return-reason"
 
@@ -98,7 +98,7 @@ export default class ReturnItem {
   return: Return
 
   @ManyToOne({
-    entity: () => LineItem,
+    entity: () => OrderLineItem,
     fieldName: "item_id",
     mapToPk: true,
     columnType: "text",
@@ -106,10 +106,10 @@ export default class ReturnItem {
   @ItemIdIndex.MikroORMIndex()
   item_id: string
 
-  @ManyToOne(() => LineItem, {
+  @ManyToOne(() => OrderLineItem, {
     persist: false,
   })
-  item: LineItem
+  item: OrderLineItem
 
   @Property({ columnType: "text", nullable: true })
   note: string

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

@@ -23,11 +23,11 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import { ReturnItem, Transaction } from "@models"
+import { OrderTransaction, ReturnItem } from "@models"
 import Claim from "./claim"
 import Exchange from "./exchange"
 import Order from "./order"
-import OrderShippingMethod from "./order-shipping-method"
+import OrderShipping from "./order-shipping-method"
 
 type OptionalReturnProps = DAL.ModelDateColumns
 
@@ -136,19 +136,15 @@ export default class Return {
   })
   items = new Collection<Rel<ReturnItem>>(this)
 
-  @OneToMany(
+  @OneToMany(() => OrderShipping, (shippingMethod) => shippingMethod.return, {
-    () => OrderShippingMethod,
-    (shippingMethod) => shippingMethod.return,
-    {
-      cascade: [Cascade.PERSIST],
-    }
-  )
-  shipping_methods = new Collection<OrderShippingMethod>(this)
-
-  @OneToMany(() => Transaction, (transaction) => transaction.return, {
     cascade: [Cascade.PERSIST],
   })
-  transactions = new Collection<Transaction>(this)
+  shipping_methods = new Collection<OrderShipping>(this)
+
+  @OneToMany(() => OrderTransaction, (transaction) => transaction.return, {
+    cascade: [Cascade.PERSIST],
+  })
+  transactions = new Collection<OrderTransaction>(this)
 
   @Property({ columnType: "text", nullable: true })
   created_by: string | null = null

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

@@ -4,7 +4,7 @@ import {
 } from "@medusajs/utils"
 import { BeforeCreate, Entity, ManyToOne, OnInit, Rel } from "@mikro-orm/core"
 import AdjustmentLine from "./adjustment-line"
-import ShippingMethod from "./shipping-method"
+import OrderShippingMethod from "./shipping-method"
 
 const ShippingMethodIdIdIndex = createPsqlIndexStatementHelper({
   tableName: "order_shipping_method_adjustment",
@@ -12,14 +12,14 @@ const ShippingMethodIdIdIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "order_shipping_method_adjustment" })
-export default class ShippingMethodAdjustment extends AdjustmentLine {
+export default class OrderShippingMethodAdjustment extends AdjustmentLine {
-  @ManyToOne(() => ShippingMethod, {
+  @ManyToOne(() => OrderShippingMethod, {
     persist: false,
   })
-  shipping_method: Rel<ShippingMethod>
+  shipping_method: Rel<OrderShippingMethod>
 
   @ManyToOne({
-    entity: () => ShippingMethod,
+    entity: () => OrderShippingMethod,
     columnType: "text",
     fieldName: "shipping_method_id",
     mapToPk: true,

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

@@ -3,7 +3,7 @@ import {
   generateEntityId,
 } from "@medusajs/utils"
 import { BeforeCreate, Entity, ManyToOne, OnInit, Rel } from "@mikro-orm/core"
-import ShippingMethod from "./shipping-method"
+import OrderShippingMethod from "./shipping-method"
 import TaxLine from "./tax-line"
 
 const ShippingMethodIdIdIndex = createPsqlIndexStatementHelper({
@@ -12,14 +12,14 @@ const ShippingMethodIdIdIndex = createPsqlIndexStatementHelper({
 })
 
 @Entity({ tableName: "order_shipping_method_tax_line" })
-export default class ShippingMethodTaxLine extends TaxLine {
+export default class OrderShippingMethodTaxLine extends TaxLine {
-  @ManyToOne(() => ShippingMethod, {
+  @ManyToOne(() => OrderShippingMethod, {
     persist: false,
   })
-  shipping_method: Rel<ShippingMethod>
+  shipping_method: Rel<OrderShippingMethod>
 
   @ManyToOne({
-    entity: () => ShippingMethod,
+    entity: () => OrderShippingMethod,
     fieldName: "shipping_method_id",
     columnType: "text",
     mapToPk: true,

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

@@ -18,8 +18,8 @@ import {
   Property,
   Rel,
 } from "@mikro-orm/core"
-import ShippingMethodAdjustment from "./shipping-method-adjustment"
+import OrderShippingMethodAdjustment from "./shipping-method-adjustment"
-import ShippingMethodTaxLine from "./shipping-method-tax-line"
+import OrderShippingMethodTaxLine from "./shipping-method-tax-line"
 
 const DeletedAtIndex = createPsqlIndexStatementHelper({
   tableName: "order_shipping_method",
@@ -35,7 +35,7 @@ const ShippingOptionIdIndex = createPsqlIndexStatementHelper({
 
 @Entity({ tableName: "order_shipping_method" })
 @Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
-export default class ShippingMethod {
+export default class OrderShippingMethod {
   @PrimaryKey({ columnType: "text" })
   id: string
 
@@ -68,22 +68,22 @@ export default class ShippingMethod {
   metadata: Record<string, unknown> | null = null
 
   @OneToMany(
-    () => ShippingMethodTaxLine,
+    () => OrderShippingMethodTaxLine,
     (taxLine) => taxLine.shipping_method,
     {
       cascade: [Cascade.PERSIST, "soft-remove" as Cascade],
     }
   )
-  tax_lines = new Collection<Rel<ShippingMethodTaxLine>>(this)
+  tax_lines = new Collection<Rel<OrderShippingMethodTaxLine>>(this)
 
   @OneToMany(
-    () => ShippingMethodAdjustment,
+    () => OrderShippingMethodAdjustment,
     (adjustment) => adjustment.shipping_method,
     {
       cascade: [Cascade.PERSIST, "soft-remove" as Cascade],
     }
   )
-  adjustments = new Collection<Rel<ShippingMethodAdjustment>>(this)
+  adjustments = new Collection<Rel<OrderShippingMethodAdjustment>>(this)
 
   @Property({
     onCreate: () => new Date(),

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

@@ -77,7 +77,7 @@ const OrderIdVersionIndex = createPsqlIndexStatementHelper({
 @Entity({ tableName })
 @Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
 @OrderIdVersionIndex.MikroORMIndex()
-export default class Transaction {
+export default class OrderTransaction {
   [OptionalProps]?: OptionalLineItemProps
 
   @PrimaryKey({ columnType: "text" })

packages/modules/order/src/services/actions/create-claim.ts

@@ -154,7 +154,7 @@ async function processAdditionalItems(
     }
   })
 
-  const createItems = await service.lineItemService_.create(
+  const createItems = await service.orderLineItemService_.create(
     itemsToAdd,
     sharedContext
   )
@@ -192,7 +192,7 @@ async function processShippingMethods(
     let shippingMethodId
 
     if (!isString(shippingMethod)) {
-      const methods = await service.createShippingMethods(
+      const methods = await service.createOrderShippingMethods(
         [
           {
             ...shippingMethod,
@@ -207,7 +207,7 @@ async function processShippingMethods(
       shippingMethodId = shippingMethod
     }
 
-    const method = await service.retrieveShippingMethod(
+    const method = await service.retrieveOrderShippingMethod(
       shippingMethodId,
       { relations: ["tax_lines", "adjustments"] },
       sharedContext
@@ -243,7 +243,7 @@ async function processReturnShipping(
     let returnShippingMethodId
 
     if (!isString(data.return_shipping)) {
-      const methods = await service.createShippingMethods(
+      const methods = await service.createOrderShippingMethods(
         [
           {
             ...data.return_shipping,
@@ -259,7 +259,7 @@ async function processReturnShipping(
       returnShippingMethodId = data.return_shipping
     }
 
-    const method = await service.retrieveShippingMethod(
+    const method = await service.retrieveOrderShippingMethod(
       returnShippingMethodId,
       { relations: ["tax_lines", "adjustments"] },
       sharedContext

packages/modules/order/src/services/actions/create-exchange.ts

@@ -121,7 +121,7 @@ async function processAdditionalItems(
     }
   })
 
-  const createItems = await service.lineItemService_.create(
+  const createItems = await service.orderLineItemService_.create(
     itemsToAdd,
     sharedContext
   )
@@ -161,7 +161,7 @@ async function processShippingMethods(
     let shippingMethodId
 
     if (!isString(shippingMethod)) {
-      const methods = await service.createShippingMethods(
+      const methods = await service.createOrderShippingMethods(
         [
           {
             ...shippingMethod,
@@ -176,7 +176,7 @@ async function processShippingMethods(
       shippingMethodId = shippingMethod
     }
 
-    const method = await service.retrieveShippingMethod(
+    const method = await service.retrieveOrderShippingMethod(
       shippingMethodId,
       { relations: ["tax_lines", "adjustments"] },
       sharedContext
@@ -207,7 +207,7 @@ async function processReturnShipping(
   let returnShippingMethodId
 
   if (!isString(data.return_shipping)) {
-    const methods = await service.createShippingMethods(
+    const methods = await service.createOrderShippingMethods(
       [
         {
           ...data.return_shipping,
@@ -223,7 +223,7 @@ async function processReturnShipping(
     returnShippingMethodId = data.return_shipping
   }
 
-  const method = await service.retrieveShippingMethod(
+  const method = await service.retrieveOrderShippingMethod(
     returnShippingMethodId,
     { relations: ["tax_lines", "adjustments"] },
     sharedContext

packages/modules/order/src/services/actions/create-return.ts

@@ -64,7 +64,7 @@ async function processShippingMethod(
   }
 
   if (!isString(data.shipping_method)) {
-    const methods = await service.createShippingMethods(
+    const methods = await service.createOrderShippingMethods(
       [
         {
           ...data.shipping_method,
@@ -79,7 +79,7 @@ async function processShippingMethod(
     shippingMethodId = data.shipping_method
   }
 
-  const method = await service.retrieveShippingMethod(
+  const method = await service.retrieveOrderShippingMethod(
     shippingMethodId,
     { relations: ["tax_lines", "adjustments"] },
     sharedContext