From 8c2a5fbcf2972e3ae52ea62ec0db970ebabdebaf Mon Sep 17 00:00:00 2001
From: Shahed Nasser <shahednasser@gmail.com>
Date: Thu, 12 Sep 2024 20:33:40 +0300
Subject: [PATCH] fix(types, medusa): fix http type of exchanges and claims
 (#9123)

---
 packages/core/types/src/http/claim/common.ts  | 29 ++++++++++++++-----
 .../core/types/src/http/exchange/common.ts    | 22 ++++++++++----
 .../src/api/admin/exchanges/query-config.ts   |  1 -
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/packages/core/types/src/http/claim/common.ts b/packages/core/types/src/http/claim/common.ts
index 69aa9ff8d2..53f706d069 100644
--- a/packages/core/types/src/http/claim/common.ts
+++ b/packages/core/types/src/http/claim/common.ts
@@ -1,8 +1,9 @@
 import { OperatorMap } from "../../dal"
-import { ClaimReason, ReturnDTO } from "../../order"
+import { ClaimReason, OrderClaimType, ReturnDTO } from "../../order"
 import { BigNumberRawValue } from "../../totals"
 import { FindParams } from "../common"
-import { BaseOrder } from "../order/common"
+import { BaseOrder, BaseOrderShippingMethod, BaseOrderTransaction } from "../order/common"
+import { BaseReturn } from "../return/common"
 
 export interface BaseClaimItem {
   id: string
@@ -17,15 +18,27 @@ export interface BaseClaimItem {
   updated_at?: Date | string
 }
 
-export interface BaseClaim
-  extends Omit<BaseOrder, "status" | "version" | "items"> {
+export interface BaseClaim {
+  id: string
+  type: OrderClaimType
   order_id: string
-  claim_items: BaseClaimItem[]
-  additional_items: BaseClaimItem[]
-  return?: ReturnDTO
   return_id?: string
-  no_notification?: boolean
+  display_id: string
+  order_version: string
   refund_amount?: number
+  created_by?: string
+  created_at: Date | string
+  updated_at: Date | string
+  canceled_at: Date | string
+  deleted_at?: Date | string
+  additional_items: BaseClaimItem[]
+  claim_items: BaseClaimItem[]
+  no_notification?: boolean
+  order?: BaseOrder
+  return?: BaseReturn
+  shipping_methods?: BaseOrderShippingMethod[]
+  transactions?: BaseOrderTransaction[]
+  metadata?: Record<string, unknown> | null
 }
 
 export interface BaseClaimListParams extends FindParams {
diff --git a/packages/core/types/src/http/exchange/common.ts b/packages/core/types/src/http/exchange/common.ts
index 235b2b4243..efd8194e69 100644
--- a/packages/core/types/src/http/exchange/common.ts
+++ b/packages/core/types/src/http/exchange/common.ts
@@ -1,6 +1,6 @@
 import { OperatorMap } from "../../dal"
 import { FindParams } from "../common"
-import { BaseOrder } from "../order/common"
+import { BaseOrder, BaseOrderShippingMethod, BaseOrderTransaction } from "../order/common"
 import { AdminReturn, AdminReturnItem } from "../return"
 
 export interface BaseExchangeItem {
@@ -14,15 +14,27 @@ export interface BaseExchangeItem {
   updated_at: string | null
 }
 
-export interface BaseExchange
-  extends Omit<BaseOrder, "status" | "version" | "items"> {
+export interface BaseExchange {
+  id: string
   order_id: string
-  return_items: AdminReturnItem[]
+  return_id?: string
+  display_id?: string
+  order_version?: string
+  created_by?: string
+  created_at: Date | string
+  updated_at: Date | string
+  canceled_at: Date | string
+  deleted_at: Date | string
   additional_items: BaseExchangeItem[]
+  return_items: AdminReturnItem[]
   no_notification?: boolean
   difference_due?: number
   return?: AdminReturn
-  return_id?: string
+  order?: BaseOrder
+  allow_backorder?: boolean
+  shipping_methods?: BaseOrderShippingMethod[]
+  transactions?: BaseOrderTransaction[]
+  metadata?: Record<string, unknown>
 }
 
 export interface BaseExchangeListParams extends FindParams {
diff --git a/packages/medusa/src/api/admin/exchanges/query-config.ts b/packages/medusa/src/api/admin/exchanges/query-config.ts
index 37668bcb22..0a7cf14991 100644
--- a/packages/medusa/src/api/admin/exchanges/query-config.ts
+++ b/packages/medusa/src/api/admin/exchanges/query-config.ts
@@ -1,6 +1,5 @@
 export const defaultAdminExchangeFields = [
   "id",
-  "type",
   "order_id",
   "return_id",
   "display_id",