From 245ccdc4774965cdd27d4dbdb5fbb084c8066c66 Mon Sep 17 00:00:00 2001
From: Sebastian Rindom <skrindom@gmail.com>
Date: Tue, 8 Jun 2021 21:49:59 +0200
Subject: [PATCH] fix: order order

---
 packages/medusa/src/repositories/order.ts | 6 +++---
 packages/medusa/src/services/order.js     | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/medusa/src/repositories/order.ts b/packages/medusa/src/repositories/order.ts
index 79ae1858ef..4c0727cb49 100644
--- a/packages/medusa/src/repositories/order.ts
+++ b/packages/medusa/src/repositories/order.ts
@@ -29,12 +29,12 @@ export class OrderRepository extends Repository<Order> {
         })
       })
     ).then(flatten)
+
     const entitiesAndRelations = entitiesIdsWithRelations.concat(entities)
 
     const entitiesAndRelationsById = groupBy(entitiesAndRelations, "id")
-    return map(entitiesAndRelationsById, entityAndRelations =>
-      merge({}, ...entityAndRelations)
-    )
+
+    return map(entities, e => merge({}, ...entitiesAndRelationsById[e.id]))
   }
 
   public async findOneWithRelations(
diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js
index 5a096ac74f..6444a444ff 100644
--- a/packages/medusa/src/services/order.js
+++ b/packages/medusa/src/services/order.js
@@ -244,11 +244,10 @@ class OrderService extends BaseService {
       query.select = select
     }
 
-    if (relations && relations.length) {
-      query.relations = relations
-    }
+    let rels = relations
+    delete query.relations
 
-    const raw = await orderRepo.findWithRelations(query.relations, query)
+    const raw = await orderRepo.findWithRelations(rels, query)
     const count = await orderRepo.count(query)
     const orders = raw.map(r => this.decorateTotals_(r, totalsToSelect))