From cae27b08bdd6813b8ae4c5df2fba87872685c420 Mon Sep 17 00:00:00 2001
From: "Carlos R. L. Rodrigues"
 <37986729+carlos-r-l-rodrigues@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:21:33 -0300
Subject: [PATCH] fix(order): remove nested entities (#8250)

---
 .../http/__tests__/returns/returns.spec.ts         |  4 ++++
 .../modules/order/src/utils/transform-order.ts     | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/integration-tests/http/__tests__/returns/returns.spec.ts b/integration-tests/http/__tests__/returns/returns.spec.ts
index f86e46c8ef..6116f791fd 100644
--- a/integration-tests/http/__tests__/returns/returns.spec.ts
+++ b/integration-tests/http/__tests__/returns/returns.spec.ts
@@ -380,6 +380,10 @@ medusaIntegrationTestRunner({
           {},
           adminHeaders
         )
+
+        result = (await api.get(`/admin/returns?fields=*items`, adminHeaders))
+          .data.returns
+        expect(result).toHaveLength(2)
       })
 
       // Simple lifecyle:
diff --git a/packages/modules/order/src/utils/transform-order.ts b/packages/modules/order/src/utils/transform-order.ts
index b37c90411d..0fded4dba7 100644
--- a/packages/modules/order/src/utils/transform-order.ts
+++ b/packages/modules/order/src/utils/transform-order.ts
@@ -4,6 +4,7 @@ import {
   decorateCartTotals,
   deduplicate,
   isDefined,
+  isObject,
 } from "@medusajs/utils"
 
 // Reshape the order object to match the OrderDTO
@@ -99,10 +100,15 @@ export function formatOrder(
 }
 
 function cleanNestedRelations(obj) {
-  delete obj.order
-  delete obj.return
-  delete obj.claim
-  delete obj.exchange
+  if (!isObject(obj)) {
+    return
+  }
+
+  const obj_ = obj as any
+  delete obj_.order
+  delete obj_.return
+  delete obj_.claim
+  delete obj_.exchange
 }
 
 function formatOrderReturn(orderReturn, mainOrder) {