From 371fd0c433ef4fafa8eec9d37ba1af4065544789 Mon Sep 17 00:00:00 2001
From: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
Date: Thu, 8 Oct 2020 09:03:05 +0200
Subject: [PATCH] Adds use of injected decorators in all services (#122)

* hotfix(services): Use injected decorators in services

* Fixes test
---
 packages/medusa/src/services/__tests__/order.js  | 2 +-
 packages/medusa/src/services/cart.js             | 4 +++-
 packages/medusa/src/services/customer.js         | 3 ++-
 packages/medusa/src/services/discount.js         | 3 ++-
 packages/medusa/src/services/order.js            | 3 ++-
 packages/medusa/src/services/product-variant.js  | 3 ++-
 packages/medusa/src/services/product.js          | 3 ++-
 packages/medusa/src/services/region.js           | 3 ++-
 packages/medusa/src/services/shipping-option.js  | 3 ++-
 packages/medusa/src/services/shipping-profile.js | 3 ++-
 packages/medusa/src/services/user.js             | 3 ++-
 11 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/medusa/src/services/__tests__/order.js b/packages/medusa/src/services/__tests__/order.js
index f9131af418..229d072e3b 100644
--- a/packages/medusa/src/services/__tests__/order.js
+++ b/packages/medusa/src/services/__tests__/order.js
@@ -466,7 +466,7 @@ describe("OrderService", () => {
       expect(OrderModelMock.updateOne).toHaveBeenCalledWith(
         { _id: IdMap.getId("test-order") },
         {
-          $push: {
+          $addToSet: {
             fulfillments: {
               $each: [
                 {
diff --git a/packages/medusa/src/services/cart.js b/packages/medusa/src/services/cart.js
index 24d5939078..286c9b3575 100644
--- a/packages/medusa/src/services/cart.js
+++ b/packages/medusa/src/services/cart.js
@@ -246,7 +246,9 @@ class CartService extends BaseService {
     if (expandFields.includes("region")) {
       c.region = await this.regionService_.retrieve(cart.region_id)
     }
-    return c
+
+    const final = await this.runDecorators_(c)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/customer.js b/packages/medusa/src/services/customer.js
index 216b2d000f..dd4d3eb86f 100644
--- a/packages/medusa/src/services/customer.js
+++ b/packages/medusa/src/services/customer.js
@@ -381,7 +381,8 @@ class CustomerService extends BaseService {
       )
     }
 
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/discount.js b/packages/medusa/src/services/discount.js
index 21afaa812e..8da05c2f36 100644
--- a/packages/medusa/src/services/discount.js
+++ b/packages/medusa/src/services/discount.js
@@ -455,7 +455,8 @@ class DiscountService extends BaseService {
       )
     }
 
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 }
 
diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js
index 2c6e906e85..1d349ad913 100644
--- a/packages/medusa/src/services/order.js
+++ b/packages/medusa/src/services/order.js
@@ -985,7 +985,8 @@ class OrderService extends BaseService {
       }
     })
 
-    return o
+    const final = await this.runDecorators_(o)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/product-variant.js b/packages/medusa/src/services/product-variant.js
index 96e2bde2a8..c7b9661c1d 100644
--- a/packages/medusa/src/services/product-variant.js
+++ b/packages/medusa/src/services/product-variant.js
@@ -493,7 +493,8 @@ class ProductVariantService extends BaseService {
   async decorate(variant, fields, expandFields = []) {
     const requiredFields = ["_id", "metadata"]
     const decorated = _.pick(variant, fields.concat(requiredFields))
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/product.js b/packages/medusa/src/services/product.js
index ca951d129b..faeb680997 100644
--- a/packages/medusa/src/services/product.js
+++ b/packages/medusa/src/services/product.js
@@ -716,7 +716,8 @@ class ProductService extends BaseService {
     if (expandFields.includes("variants")) {
       decorated.variants = await this.retrieveVariants(product._id)
     }
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/region.js b/packages/medusa/src/services/region.js
index db33c437c3..5ca6fa6eaa 100644
--- a/packages/medusa/src/services/region.js
+++ b/packages/medusa/src/services/region.js
@@ -367,7 +367,8 @@ class RegionService extends BaseService {
   async decorate(region, fields, expandFields = []) {
     const requiredFields = ["_id", "metadata"]
     const decorated = _.pick(region, fields.concat(requiredFields))
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 }
 
diff --git a/packages/medusa/src/services/shipping-option.js b/packages/medusa/src/services/shipping-option.js
index e55203c52f..0e592c172c 100644
--- a/packages/medusa/src/services/shipping-option.js
+++ b/packages/medusa/src/services/shipping-option.js
@@ -405,7 +405,8 @@ class ShippingOptionService extends BaseService {
     const requiredFields = ["_id", "metadata"]
     let decorated = _.pick(shippingOption, fields.concat(requiredFields))
 
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/shipping-profile.js b/packages/medusa/src/services/shipping-profile.js
index cc81edf212..696c0f6a85 100644
--- a/packages/medusa/src/services/shipping-profile.js
+++ b/packages/medusa/src/services/shipping-profile.js
@@ -376,7 +376,8 @@ class ShippingProfileService extends BaseService {
       )
     }
 
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**
diff --git a/packages/medusa/src/services/user.js b/packages/medusa/src/services/user.js
index 847ea6956c..f63d54a771 100644
--- a/packages/medusa/src/services/user.js
+++ b/packages/medusa/src/services/user.js
@@ -278,7 +278,8 @@ class UserService extends BaseService {
   async decorate(user, fields, expandFields = []) {
     const requiredFields = ["_id", "metadata"]
     const decorated = _.pick(user, fields.concat(requiredFields))
-    return decorated
+    const final = await this.runDecorators_(decorated)
+    return final
   }
 
   /**