Chore/order claims 2 (#8312)

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

@@ -12,7 +12,7 @@ import {
   isString,
   promiseAll,
 } from "@medusajs/utils"
-import { ClaimItem, OrderClaim, Return, ReturnItem } from "@models"
+import { OrderClaim, OrderClaimItem, Return, ReturnItem } from "@models"
 
 function createClaimAndReturnEntities(em, data, order) {
   const claimReference = em.create(OrderClaim, {
@@ -89,7 +89,7 @@ function createClaimAndReturnItems(
         : undefined
     )
 
-    return em.create(ClaimItem, {
+    return em.create(OrderClaimItem, {
       item_id: item.id,
       reason: item.reason,
       quantity: item.quantity,
@@ -111,8 +111,8 @@ async function processAdditionalItems(
   sharedContext
 ) {
   const itemsToAdd: any[] = []
-  const additionalNewItems: ClaimItem[] = []
-  const additionalItems: ClaimItem[] = []
+  const additionalNewItems: OrderClaimItem[] = []
+  const additionalItems: OrderClaimItem[] = []
   data.additional_items?.forEach((item) => {
     const hasItem = item.id
       ? order.items.find((o) => o.item.id === item.id)
@@ -134,7 +134,7 @@ async function processAdditionalItems(
       })
 
       additionalItems.push(
-        em.create(ClaimItem, {
+        em.create(OrderClaimItem, {
           item_id: item.id,
           quantity: item.quantity,
           note: item.note,
@@ -146,7 +146,7 @@ async function processAdditionalItems(
       itemsToAdd.push(item)
 
       additionalNewItems.push(
-        em.create(ClaimItem, {
+        em.create(OrderClaimItem, {
           quantity: item.quantity,
           note: item.note,
           metadata: item.metadata,

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

@@ -11,7 +11,7 @@ import {
   isString,
   promiseAll,
 } from "@medusajs/utils"
-import { ExchangeItem, OrderExchange, Return, ReturnItem } from "@models"
+import { OrderExchange, OrderExchangeItem, Return, ReturnItem } from "@models"
 
 function createExchangeAndReturnEntities(em, data, order) {
   const exchangeReference = em.create(OrderExchange, {
@@ -77,8 +77,8 @@ async function processAdditionalItems(
   sharedContext
 ) {
   const itemsToAdd: any[] = []
-  const additionalNewItems: ExchangeItem[] = []
-  const additionalItems: ExchangeItem[] = []
+  const additionalNewItems: OrderExchangeItem[] = []
+  const additionalItems: OrderExchangeItem[] = []
   data.additional_items?.forEach((item) => {
     const hasItem = item.id
       ? order.items.find((o) => o.item.id === item.id)
@@ -100,7 +100,7 @@ async function processAdditionalItems(
       })
 
       additionalItems.push(
-        em.create(ExchangeItem, {
+        em.create(OrderExchangeItem, {
           item_id: item.id,
           quantity: item.quantity,
           note: item.note,
@@ -112,7 +112,7 @@ async function processAdditionalItems(
       itemsToAdd.push(item)
 
       additionalNewItems.push(
-        em.create(ExchangeItem, {
+        em.create(OrderExchangeItem, {
           quantity: item.quantity,
           note: item.note,
           metadata: item.metadata,

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

@@ -41,7 +41,10 @@ import {
   OrderChange,
   OrderChangeAction,
   OrderClaim,
+  OrderClaimItem,
+  OrderClaimItemImage,
   OrderExchange,
+  OrderExchangeItem,
   OrderItem,
   OrderShippingMethod,
   OrderSummary,
@@ -116,7 +119,10 @@ const generateMethodForModels = {
   Return,
   ReturnItem,
   OrderClaim,
+  OrderClaimItem,
+  OrderClaimItemImage,
   OrderExchange,
+  OrderExchangeItem,
 }
 
 // TODO: rm template args here, keep it for later to not collide with carlos work at least as little as possible
@@ -139,7 +145,10 @@ export default class OrderModuleService<
     TReturn extends Return = Return,
     TReturnItem extends ReturnItem = ReturnItem,
     TClaim extends OrderClaim = OrderClaim,
-    TExchange extends OrderExchange = OrderExchange
+    TClaimItem extends OrderClaimItem = OrderClaimItem,
+    TClaimItemImage extends OrderClaimItemImage = OrderClaimItemImage,
+    TExchange extends OrderExchange = OrderExchange,
+    TExchangeItem extends OrderExchangeItem = OrderExchangeItem
   >
   extends ModulesSdkUtils.MedusaService<{
     Order: { dto: OrderTypes.OrderDTO }
@@ -159,10 +168,13 @@ export default class OrderModuleService<
     ReturnReason: { dto: OrderTypes.OrderReturnReasonDTO }
     OrderSummary: { dto: OrderTypes.OrderSummaryDTO }
     Transaction: { dto: OrderTypes.OrderTransactionDTO }
-    Return: { dto: any } // TODO: Add return dto
-    ReturnItem: { dto: any } // TODO: Add return item dto
-    OrderClaim: { dto: any } // TODO: Add claim dto
-    OrderExchange: { dto: any } // TODO: Add exchange dto
+    Return: { dto: OrderTypes.ReturnDTO }
+    ReturnItem: { dto: OrderTypes.OrderReturnItemDTO }
+    OrderClaim: { dto: OrderTypes.OrderClaimDTO }
+    OrderClaimItem: { dto: OrderTypes.OrderClaimItemDTO }
+    OrderClaimItemImage: { dto: OrderTypes.OrderClaimItemImageDTO }
+    OrderExchange: { dto: OrderTypes.OrderExchangeDTO }
+    OrderExchangeItem: { dto: OrderTypes.OrderExchangeItemDTO }
   }>(generateMethodForModels)
   implements IOrderModuleService
 {
@@ -185,7 +197,10 @@ export default class OrderModuleService<
   protected returnService_: ModulesSdkTypes.IMedusaInternalService<TReturn>
   protected returnItemService_: ModulesSdkTypes.IMedusaInternalService<TReturnItem>
   protected orderClaimService_: ModulesSdkTypes.IMedusaInternalService<TClaim>
+  protected orderClaimItemService_: ModulesSdkTypes.IMedusaInternalService<TClaimItem>
+  protected orderClaimItemImageService_: ModulesSdkTypes.IMedusaInternalService<TClaimItemImage>
   protected orderExchangeService_: ModulesSdkTypes.IMedusaInternalService<TExchange>
+  protected orderExchangeItemService_: ModulesSdkTypes.IMedusaInternalService<TExchangeItem>
 
   constructor(
     {