From a02f6cbca6b0daba26526ba01d0717e52d043ae4 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Wed, 24 Jul 2024 10:00:21 +0300 Subject: [PATCH] fix(types,order): fixes to order module's service and data models (#8247) * fix(types,order): fixes to order module's service and data models * revert change for createLineItemAdjustments * add missing context parameter --- packages/core/types/src/order/service.ts | 107 ++++++++---------- .../modules/order/src/models/order-change.ts | 2 +- 2 files changed, 50 insertions(+), 59 deletions(-) diff --git a/packages/core/types/src/order/service.ts b/packages/core/types/src/order/service.ts index 509986f7d0..df92d8a4f1 100644 --- a/packages/core/types/src/order/service.ts +++ b/packages/core/types/src/order/service.ts @@ -280,7 +280,10 @@ export interface IOrderModuleService extends IModuleService { * ``` * */ - updateOrders(data: UpdateOrderDTO[]): Promise + updateOrders( + data: UpdateOrderDTO[], + sharedContext?: Context + ): Promise /** * This method updates existing {return type}(s). @@ -561,8 +564,14 @@ export interface IOrderModuleService extends IModuleService { sharedContext?: Context ): Promise - createLineItems(data: CreateOrderLineItemDTO): Promise - createLineItems(data: CreateOrderLineItemDTO[]): Promise + createLineItems( + data: CreateOrderLineItemDTO, + sharedContext?: Context + ): Promise + createLineItems( + data: CreateOrderLineItemDTO[], + sharedContext?: Context + ): Promise createLineItems( orderId: string, items: CreateOrderLineItemDTO[], @@ -595,7 +604,8 @@ export interface IOrderModuleService extends IModuleService { * */ updateLineItems( - data: UpdateOrderLineItemWithSelectorDTO[] + data: UpdateOrderLineItemWithSelectorDTO[], + sharedContext?: Context ): Promise /** @@ -756,10 +766,12 @@ export interface IOrderModuleService extends IModuleService { ): Promise createShippingMethods( - data: CreateOrderShippingMethodDTO + data: CreateOrderShippingMethodDTO, + sharedContext?: Context ): Promise createShippingMethods( - data: CreateOrderShippingMethodDTO[] + data: CreateOrderShippingMethodDTO[], + sharedContext?: Context ): Promise createShippingMethods( orderId: string, @@ -812,14 +824,17 @@ export interface IOrderModuleService extends IModuleService { ): Promise createLineItemAdjustments( - data: CreateOrderAdjustmentDTO[] + data: CreateOrderAdjustmentDTO[], + sharedContext?: Context ): Promise createLineItemAdjustments( - data: CreateOrderAdjustmentDTO + data: CreateOrderAdjustmentDTO, + sharedContext?: Context ): Promise createLineItemAdjustments( orderId: string, - data: CreateOrderAdjustmentDTO[] + data: CreateOrderAdjustmentDTO[], + sharedContext?: Context ): Promise /** @@ -884,10 +899,12 @@ export interface IOrderModuleService extends IModuleService { ): Promise createShippingMethodAdjustments( - data: CreateOrderShippingMethodAdjustmentDTO[] + data: CreateOrderShippingMethodAdjustmentDTO[], + sharedContext?: Context ): Promise createShippingMethodAdjustments( - data: CreateOrderShippingMethodAdjustmentDTO + data: CreateOrderShippingMethodAdjustmentDTO, + sharedContext?: Context ): Promise createShippingMethodAdjustments( orderId: string, @@ -959,10 +976,12 @@ export interface IOrderModuleService extends IModuleService { ): Promise createLineItemTaxLines( - taxLines: CreateOrderLineItemTaxLineDTO[] + taxLines: CreateOrderLineItemTaxLineDTO[], + sharedContext?: Context ): Promise createLineItemTaxLines( - taxLine: CreateOrderLineItemTaxLineDTO + taxLine: CreateOrderLineItemTaxLineDTO, + sharedContext?: Context ): Promise createLineItemTaxLines( orderId: string, @@ -1039,10 +1058,12 @@ export interface IOrderModuleService extends IModuleService { ): Promise createShippingMethodTaxLines( - taxLines: CreateOrderShippingMethodTaxLineDTO[] + taxLines: CreateOrderShippingMethodTaxLineDTO[], + sharedContext?: Context ): Promise createShippingMethodTaxLines( - taxLine: CreateOrderShippingMethodTaxLineDTO + taxLine: CreateOrderShippingMethodTaxLineDTO, + sharedContext?: Context ): Promise createShippingMethodTaxLines( orderId: string, @@ -1257,42 +1278,6 @@ export interface IOrderModuleService extends IModuleService { sharedContext?: Context ): Promise - /** - * This method deletes order change by its ID. - * - * @param {string[]} orderChangeId - The list of {summary} - * @param {Context} sharedContext - A context used to share resources, such as transaction manager, between the application and the module. - * @returns {Promise} Resolves when {summary} - * - * @example - * ```typescript - * await orderModuleService.deleteOrderChanges(["orderChangeId1", "orderChangeId2"]); - * ``` - * - */ - deleteOrderChanges( - orderChangeId: string[], - sharedContext?: Context - ): Promise - - /** - * This method deletes order change by its ID. - * - * @param {string} orderChangeId - The order's ID. - * @param {Context} sharedContext - A context used to share resources, such as transaction manager, between the application and the module. - * @returns {Promise} Resolves when {summary} - * - * @example - * ```typescript - * await orderModuleService.deleteOrderChanges("orderChangeId"); - * ``` - * - */ - deleteOrderChanges( - orderChangeId: string, - sharedContext?: Context - ): Promise - /** * This method Represents the completion of an asynchronous operation * @@ -1402,7 +1387,7 @@ export interface IOrderModuleService extends IModuleService { confirmOrderChange( orderChangeId: string[], sharedContext?: Context - ): Promise + ): Promise /** * This method Represents the completion of an asynchronous operation @@ -1422,7 +1407,7 @@ export interface IOrderModuleService extends IModuleService { confirmOrderChange( data: ConfirmOrderChangeDTO, sharedContext?: Context - ): Promise + ): Promise /** * This method Represents the completion of an asynchronous operation @@ -1444,7 +1429,7 @@ export interface IOrderModuleService extends IModuleService { confirmOrderChange( data: ConfirmOrderChangeDTO[], sharedContext?: Context - ): Promise + ): Promise /** * This method Represents the completion of an asynchronous operation @@ -1863,7 +1848,8 @@ export interface IOrderModuleService extends IModuleService { ): Promise updateReturnReasons( - data: UpdateOrderReturnReasonWithSelectorDTO[] + data: UpdateOrderReturnReasonWithSelectorDTO[], + sharedContext?: Context ): Promise updateReturnReasons( selector: Partial, @@ -1913,7 +1899,10 @@ export interface IOrderModuleService extends IModuleService { sharedContext?: Context ): Promise - updateReturns(data: UpdateOrderReturnWithSelectorDTO[]): Promise + updateReturns( + data: UpdateOrderReturnWithSelectorDTO[], + sharedContext?: Context + ): Promise updateReturns( selector: Partial, @@ -1953,7 +1942,8 @@ export interface IOrderModuleService extends IModuleService { ): Promise updateOrderClaims( - data: UpdateOrderClaimWithSelectorDTO[] + data: UpdateOrderClaimWithSelectorDTO[], + sharedContext?: Context ): Promise updateOrderClaims( @@ -1992,7 +1982,8 @@ export interface IOrderModuleService extends IModuleService { ): Promise updateOrderExchanges( - data: UpdateOrderExchangeWithSelectorDTO[] + data: UpdateOrderExchangeWithSelectorDTO[], + sharedContext?: Context ): Promise updateOrderExchanges( diff --git a/packages/modules/order/src/models/order-change.ts b/packages/modules/order/src/models/order-change.ts index 713c4f2c3c..1c0949be9b 100644 --- a/packages/modules/order/src/models/order-change.ts +++ b/packages/modules/order/src/models/order-change.ts @@ -156,7 +156,7 @@ export default class OrderChange { change_type: OrderChangeType | null = null @OneToMany(() => OrderChangeAction, (action) => action.order_change, { - cascade: [Cascade.PERSIST, "sotf-remove" as Cascade], + cascade: [Cascade.PERSIST, "soft-remove" as Cascade], }) actions = new Collection>(this)