@medusajs/medusa 1.3.2 → 1.3.3

package/dist/services/customer.js

@@ -72,17 +72,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -99,49 +88,43 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-var lodash_1 = __importDefault(require("lodash"));
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
 var scrypt_kdf_1 = __importDefault(require("scrypt-kdf"));
-var typeorm_1 = require("typeorm");
+var interfaces_1 = require("../interfaces");
+var utils_1 = require("../utils");
 var exception_formatter_1 = require("../utils/exception-formatter");
 /**
  * Provides layer to manipulate customers.
- * @implements {BaseService}
  */
 var CustomerService = /** @class */ (function (_super) {
     __extends(CustomerService, _super);
     function CustomerService(_a) {
         var manager = _a.manager, customerRepository = _a.customerRepository, eventBusService = _a.eventBusService, addressRepository = _a.addressRepository;
-        var _this = _super.call(this) || this;
-        /** @private @const {EntityManager} */
+        var _this = 
+        // eslint-disable-next-line prefer-rest-params
+        _super.call(this, arguments[0]) || this;
         _this.manager_ = manager;
-        /** @private @const {CustomerRepository} */
         _this.customerRepository_ = customerRepository;
-        /** @private @const {EventBus} */
-        _this.eventBus_ = eventBusService;
-        /** @private @const {AddressRepository} */
+        _this.eventBusService_ = eventBusService;
         _this.addressRepository_ = addressRepository;
         return _this;
     }
-    CustomerService.prototype.withTransaction = function (transactionManager) {
-        if (!transactionManager) {
-            return this;
-        }
-        var cloned = new CustomerService({
-            manager: transactionManager,
-            customerRepository: this.customerRepository_,
-            eventBusService: this.eventBus_,
-            addressRepository: this.addressRepository_,
-        });
-        cloned.transactionManager_ = transactionManager;
-        return cloned;
-    };
     /**
      * Generate a JSON Web token, that will be sent to a customer, that wishes to
      * reset password.
@@ -153,38 +136,48 @@ var CustomerService = /** @class */ (function (_super) {
      */
     CustomerService.prototype.generateResetPasswordToken = function (customerId) {
         return __awaiter(this, void 0, void 0, function () {
-            var customer, secret, expiry, payload, token;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.retrieve(customerId, {
-                            select: [
-                                "id",
-                                "has_account",
-                                "password_hash",
-                                "email",
-                                "first_name",
-                                "last_name",
-                            ],
-                        })];
-                    case 1:
-                        customer = _a.sent();
-                        if (!customer.has_account) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "You must have an account to reset the password. Create an account first");
-                        }
-                        secret = customer.password_hash;
-                        expiry = Math.floor(Date.now() / 1000) + 60 * 15 // 15 minutes ahead
-                        ;
-                        payload = { customer_id: customer.id, exp: expiry };
-                        token = jsonwebtoken_1.default.sign(payload, secret);
-                        // Notify subscribers
-                        this.eventBus_.emit(CustomerService.Events.PASSWORD_RESET, {
-                            id: customerId,
-                            email: customer.email,
-                            first_name: customer.first_name,
-                            last_name: customer.last_name,
-                            token: token,
-                        });
-                        return [2 /*return*/, token];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customer, secret, expiry, payload, token;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(customerId, {
+                                            select: [
+                                                "id",
+                                                "has_account",
+                                                "password_hash",
+                                                "email",
+                                                "first_name",
+                                                "last_name",
+                                            ],
+                                        })];
+                                    case 1:
+                                        customer = _a.sent();
+                                        if (!customer.has_account) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "You must have an account to reset the password. Create an account first");
+                                        }
+                                        secret = customer.password_hash;
+                                        expiry = Math.floor(Date.now() / 1000) + 60 * 15 // 15 minutes ahead
+                                        ;
+                                        payload = { customer_id: customer.id, exp: expiry };
+                                        token = jsonwebtoken_1.default.sign(payload, secret);
+                                        // Notify subscribers
+                                        this.eventBusService_
+                                            .withTransaction(manager)
+                                            .emit(CustomerService.Events.PASSWORD_RESET, {
+                                            id: customerId,
+                                            email: customer.email,
+                                            first_name: customer.first_name,
+                                            last_name: customer.last_name,
+                                            token: token,
+                                        });
+                                        return [2 /*return*/, token];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -198,29 +191,29 @@ var CustomerService = /** @class */ (function (_super) {
         if (selector === void 0) { selector = {}; }
         if (config === void 0) { config = { relations: [], skip: 0, take: 50 }; }
         return __awaiter(this, void 0, void 0, function () {
-            var customerRepo, q, query, where_1;
+            var _this = this;
             return __generator(this, function (_a) {
-                customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-                if ("q" in selector) {
-                    q = selector.q;
-                    delete selector.q;
-                }
-                query = this.buildQuery_(selector, config);
-                if (q) {
-                    where_1 = query.where;
-                    delete where_1.email;
-                    delete where_1.first_name;
-                    delete where_1.last_name;
-                    query.where = function (qb) {
-                        qb.where(where_1);
-                        qb.andWhere(new typeorm_1.Brackets(function (qb) {
-                            qb.where({ email: (0, typeorm_1.ILike)("%".concat(q, "%")) })
-                                .orWhere({ first_name: (0, typeorm_1.ILike)("%".concat(q, "%")) })
-                                .orWhere({ last_name: (0, typeorm_1.ILike)("%".concat(q, "%")) });
-                        }));
-                    };
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepo, q, query, _a, customers;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        customerRepo = manager.getCustomRepository(this.customerRepository_);
+                                        if ("q" in selector) {
+                                            q = selector.q;
+                                            delete selector.q;
+                                        }
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, customerRepo.listAndCount(query, q)];
+                                    case 1:
+                                        _a = __read.apply(void 0, [_b.sent(), 1]), customers = _a[0];
+                                        return [2 /*return*/, customers];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
-                return [2 /*return*/, customerRepo.find(query)];
             });
         });
     };
@@ -230,35 +223,32 @@ var CustomerService = /** @class */ (function (_super) {
      * @return {Promise} the result of the find operation
      */
     CustomerService.prototype.listAndCount = function (selector, config) {
-        if (config === void 0) { config = { relations: [], skip: 0, take: 50, order: { created_at: "DESC" } }; }
+        if (config === void 0) { config = {
+            relations: [],
+            skip: 0,
+            take: 50,
+            order: { created_at: "DESC" },
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var customerRepo, q, query, groups, where_2;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-                        if ("q" in selector) {
-                            q = selector.q;
-                            delete selector.q;
-                        }
-                        query = this.buildQuery_(selector, config);
-                        groups = query.where.groups;
-                        delete query.where.groups;
-                        if (q) {
-                            where_2 = query.where;
-                            delete where_2.email;
-                            delete where_2.first_name;
-                            delete where_2.last_name;
-                            query.where = function (qb) {
-                                qb.where(where_2);
-                                qb.andWhere(new typeorm_1.Brackets(function (qb) {
-                                    qb.where({ email: (0, typeorm_1.ILike)("%".concat(q, "%")) })
-                                        .orWhere({ first_name: (0, typeorm_1.ILike)("%".concat(q, "%")) })
-                                        .orWhere({ last_name: (0, typeorm_1.ILike)("%".concat(q, "%")) });
-                                }));
-                            };
-                        }
-                        return [4 /*yield*/, customerRepo.listAndCount(query, groups)];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepo, q, query;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        customerRepo = manager.getCustomRepository(this.customerRepository_);
+                                        if ("q" in selector) {
+                                            q = selector.q;
+                                            delete selector.q;
+                                        }
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, customerRepo.listAndCount(query, q)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -269,30 +259,45 @@ var CustomerService = /** @class */ (function (_super) {
      * @return {Promise} the result of the count operation
      */
     CustomerService.prototype.count = function () {
-        var customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-        return customerRepo.count({});
-    };
-    /**
-     * Gets a customer by id.
-     * @param {string} customerId - the id of the customer to get.
-     * @param {Object} config - the config object containing query settings
-     * @return {Promise<Customer>} the customer document.
-     */
-    CustomerService.prototype.retrieve = function (customerId, config) {
-        if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var customerRepo, validatedId, query, customer;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepo;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        customerRepo = manager.getCustomRepository(this.customerRepository_);
+                                        return [4 /*yield*/, customerRepo.count({})];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    CustomerService.prototype.retrieve_ = function (selector, config) {
+        var _a;
+        if (config === void 0) { config = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var manager, customerRepo, query, customer, selectorConstraints;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-                        validatedId = this.validateId_(customerId);
-                        query = this.buildQuery_({ id: validatedId }, config);
+                        manager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        customerRepo = manager.getCustomRepository(this.customerRepository_);
+                        query = (0, utils_1.buildQuery)(selector, config);
                         return [4 /*yield*/, customerRepo.findOne(query)];
                     case 1:
-                        customer = _a.sent();
+                        customer = _b.sent();
                         if (!customer) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Customer with ".concat(customerId, " was not found"));
+                            selectorConstraints = Object.entries(selector)
+                                .map(function (key, value) { return "".concat(key, ": ").concat(value); })
+                                .join(", ");
+                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Customer with ".concat(selectorConstraints, " was not found"));
                         }
                         return [2 /*return*/, customer];
                 }
@@ -308,19 +313,18 @@ var CustomerService = /** @class */ (function (_super) {
     CustomerService.prototype.retrieveByEmail = function (email, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var customerRepo, query, customer;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-                        query = this.buildQuery_({ email: email.toLowerCase() }, config);
-                        return [4 /*yield*/, customerRepo.findOne(query)];
-                    case 1:
-                        customer = _a.sent();
-                        if (!customer) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Customer with email ".concat(email, " was not found"));
-                        }
-                        return [2 /*return*/, customer];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve_({ email: email.toLowerCase() }, config)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -334,19 +338,40 @@ var CustomerService = /** @class */ (function (_super) {
     CustomerService.prototype.retrieveByPhone = function (phone, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var customerRepo, query, customer;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve_({ phone: phone }, config)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Gets a customer by id.
+     * @param {string} customerId - the id of the customer to get.
+     * @param {Object} config - the config object containing query settings
+     * @return {Promise<Customer>} the customer document.
+     */
+    CustomerService.prototype.retrieve = function (customerId, config) {
+        if (config === void 0) { config = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        customerRepo = this.manager_.getCustomRepository(this.customerRepository_);
-                        query = this.buildQuery_({ phone: phone }, config);
-                        return [4 /*yield*/, customerRepo.findOne(query)];
-                    case 1:
-                        customer = _a.sent();
-                        if (!customer) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Customer with phone ".concat(phone, " was not found"));
-                        }
-                        return [2 /*return*/, customer];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                return [2 /*return*/, this.retrieve_({ id: customerId }, config)];
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -381,60 +406,63 @@ var CustomerService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var customerRepository, email, password, existing, hashedPassword, toUpdate, updated, hashedPassword, created, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    customerRepository = manager.getCustomRepository(this.customerRepository_);
-                                    email = customer.email, password = customer.password;
-                                    return [4 /*yield*/, this.retrieveByEmail(email).catch(function (err) { return undefined; })];
-                                case 1:
-                                    existing = _a.sent();
-                                    if (existing && existing.has_account) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.DUPLICATE_ERROR, "A customer with the given email already has an account. Log in instead");
-                                    }
-                                    if (!(existing && password && !existing.has_account)) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, this.hashPassword_(password)];
-                                case 2:
-                                    hashedPassword = _a.sent();
-                                    customer.password_hash = hashedPassword;
-                                    customer.has_account = true;
-                                    delete customer.password;
-                                    toUpdate = __assign(__assign({}, existing), customer);
-                                    return [4 /*yield*/, customerRepository.save(toUpdate)];
-                                case 3:
-                                    updated = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CustomerService.Events.UPDATED, updated)];
-                                case 4:
-                                    _a.sent();
-                                    return [2 /*return*/, updated];
-                                case 5:
-                                    if (!password) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, this.hashPassword_(password)];
-                                case 6:
-                                    hashedPassword = _a.sent();
-                                    customer.password_hash = hashedPassword;
-                                    customer.has_account = true;
-                                    delete customer.password;
-                                    _a.label = 7;
-                                case 7: return [4 /*yield*/, customerRepository.create(customer)];
-                                case 8:
-                                    created = _a.sent();
-                                    return [4 /*yield*/, customerRepository.save(created)];
-                                case 9:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CustomerService.Events.CREATED, result)];
-                                case 10:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepository, email, password, existing, hashedPassword, toUpdate, updated, hashedPassword, created, result;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        customerRepository = manager.getCustomRepository(this.customerRepository_);
+                                        customer.email = customer.email.toLowerCase();
+                                        email = customer.email, password = customer.password;
+                                        return [4 /*yield*/, this.retrieveByEmail(email).catch(function () { return undefined; })];
+                                    case 1:
+                                        existing = _a.sent();
+                                        if (existing && existing.has_account) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.DUPLICATE_ERROR, "A customer with the given email already has an account. Log in instead");
+                                        }
+                                        if (!(existing && password && !existing.has_account)) return [3 /*break*/, 5];
+                                        return [4 /*yield*/, this.hashPassword_(password)];
+                                    case 2:
+                                        hashedPassword = _a.sent();
+                                        customer.password_hash = hashedPassword;
+                                        customer.has_account = true;
+                                        delete customer.password;
+                                        toUpdate = __assign(__assign({}, existing), customer);
+                                        return [4 /*yield*/, customerRepository.save(toUpdate)];
+                                    case 3:
+                                        updated = _a.sent();
+                                        return [4 /*yield*/, this.eventBusService_
+                                                .withTransaction(manager)
+                                                .emit(CustomerService.Events.UPDATED, updated)];
+                                    case 4:
+                                        _a.sent();
+                                        return [2 /*return*/, updated];
+                                    case 5:
+                                        if (!password) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, this.hashPassword_(password)];
+                                    case 6:
+                                        hashedPassword = _a.sent();
+                                        customer.password_hash = hashedPassword;
+                                        customer.has_account = true;
+                                        delete customer.password;
+                                        _a.label = 7;
+                                    case 7:
+                                        created = customerRepository.create(customer);
+                                        return [4 /*yield*/, customerRepository.save(created)];
+                                    case 8:
+                                        result = _a.sent();
+                                        return [4 /*yield*/, this.eventBusService_
+                                                .withTransaction(manager)
+                                                .emit(CustomerService.Events.CREATED, result)];
+                                    case 9:
+                                        _a.sent();
+                                        return [2 /*return*/, result];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -449,68 +477,70 @@ var CustomerService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var customerRepository, addrRepo, customer, password, metadata, billing_address, billing_address_id, groups, rest, address, _a, _b, _c, key, value, _d, updated;
-                        var e_1, _e;
-                        return __generator(this, function (_f) {
-                            switch (_f.label) {
-                                case 0:
-                                    customerRepository = manager.getCustomRepository(this.customerRepository_);
-                                    addrRepo = manager.getCustomRepository(this.addressRepository_);
-                                    return [4 /*yield*/, this.retrieve(customerId)];
-                                case 1:
-                                    customer = _f.sent();
-                                    password = update.password, metadata = update.metadata, billing_address = update.billing_address, billing_address_id = update.billing_address_id, groups = update.groups, rest = __rest(update, ["password", "metadata", "billing_address", "billing_address_id", "groups"]);
-                                    if (metadata) {
-                                        customer.metadata = this.setMetadata_(customer, metadata);
-                                    }
-                                    if (!("billing_address_id" in update || "billing_address" in update)) return [3 /*break*/, 3];
-                                    address = billing_address_id || billing_address;
-                                    if (!(typeof address !== "undefined")) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.updateBillingAddress_(customer, address, addrRepo)];
-                                case 2:
-                                    _f.sent();
-                                    _f.label = 3;
-                                case 3:
-                                    try {
-                                        for (_a = __values(Object.entries(rest)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                            _c = __read(_b.value, 2), key = _c[0], value = _c[1];
-                                            customer[key] = value;
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepository, customer, password, metadata, billing_address, billing_address_id, groups, rest, address, _a, _b, _c, key, value, _d, updated;
+                            var e_1, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
+                                    case 0:
+                                        customerRepository = manager.getCustomRepository(this.customerRepository_);
+                                        return [4 /*yield*/, this.retrieve(customerId)];
+                                    case 1:
+                                        customer = _f.sent();
+                                        password = update.password, metadata = update.metadata, billing_address = update.billing_address, billing_address_id = update.billing_address_id, groups = update.groups, rest = __rest(update, ["password", "metadata", "billing_address", "billing_address_id", "groups"]);
+                                        if (metadata) {
+                                            customer.metadata = (0, utils_1.setMetadata)(customer, metadata);
                                         }
-                                    }
-                                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                                    finally {
+                                        if (!("billing_address_id" in update || "billing_address" in update)) return [3 /*break*/, 3];
+                                        address = billing_address_id || billing_address;
+                                        if (!(typeof address !== "undefined")) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.updateBillingAddress_(customer, address)];
+                                    case 2:
+                                        _f.sent();
+                                        _f.label = 3;
+                                    case 3:
                                         try {
-                                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                            for (_a = __values(Object.entries(rest)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                                _c = __read(_b.value, 2), key = _c[0], value = _c[1];
+                                                customer[key] = value;
+                                            }
                                         }
-                                        finally { if (e_1) throw e_1.error; }
-                                    }
-                                    if (!password) return [3 /*break*/, 5];
-                                    _d = customer;
-                                    return [4 /*yield*/, this.hashPassword_(password)];
-                                case 4:
-                                    _d.password_hash = _f.sent();
-                                    _f.label = 5;
-                                case 5:
-                                    if (groups) {
-                                        customer.groups = groups;
-                                    }
-                                    return [4 /*yield*/, customerRepository.save(customer)];
-                                case 6:
-                                    updated = _f.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CustomerService.Events.UPDATED, updated)];
-                                case 7:
-                                    _f.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); }, function (error) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            throw (0, exception_formatter_1.formatException)(error);
-                        });
-                    }); })];
+                                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                        finally {
+                                            try {
+                                                if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                            }
+                                            finally { if (e_1) throw e_1.error; }
+                                        }
+                                        if (!password) return [3 /*break*/, 5];
+                                        _d = customer;
+                                        return [4 /*yield*/, this.hashPassword_(password)];
+                                    case 4:
+                                        _d.password_hash = _f.sent();
+                                        _f.label = 5;
+                                    case 5:
+                                        if (groups) {
+                                            customer.groups = groups;
+                                        }
+                                        return [4 /*yield*/, customerRepository.save(customer)];
+                                    case 6:
+                                        updated = _f.sent();
+                                        return [4 /*yield*/, this.eventBusService_
+                                                .withTransaction(manager)
+                                                .emit(CustomerService.Events.UPDATED, updated)];
+                                    case 7:
+                                        _f.sent();
+                                        return [2 /*return*/, updated];
+                                }
+                            });
+                        }); }, function (error) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                throw (0, exception_formatter_1.formatException)(error);
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -521,47 +551,64 @@ var CustomerService = /** @class */ (function (_super) {
      * @param {Object} addrRepo - address repository
      * @return {Promise} the result of the update operation
      */
-    CustomerService.prototype.updateBillingAddress_ = function (customer, addressOrId, addrRepo) {
+    CustomerService.prototype.updateBillingAddress_ = function (customer, addressOrId) {
         return __awaiter(this, void 0, void 0, function () {
-            var addr, created, saved;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (addressOrId === null) {
-                            customer.billing_address_id = null;
-                            return [2 /*return*/];
-                        }
-                        if (!(typeof addressOrId === "string")) return [3 /*break*/, 2];
-                        return [4 /*yield*/, addrRepo.findOne({
-                                where: { id: addressOrId },
-                            })];
-                    case 1:
-                        addressOrId = _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        addressOrId.country_code = addressOrId.country_code.toLowerCase();
-                        if (!addressOrId.id) return [3 /*break*/, 3];
-                        customer.billing_address_id = addressOrId.id;
-                        return [3 /*break*/, 8];
-                    case 3:
-                        if (!customer.billing_address_id) return [3 /*break*/, 6];
-                        return [4 /*yield*/, addrRepo.findOne({
-                                where: { id: customer.billing_address_id },
-                            })];
-                    case 4:
-                        addr = _a.sent();
-                        return [4 /*yield*/, addrRepo.save(__assign(__assign({}, addr), addressOrId))];
-                    case 5:
-                        _a.sent();
-                        return [3 /*break*/, 8];
-                    case 6:
-                        created = addrRepo.create(__assign({}, addressOrId));
-                        return [4 /*yield*/, addrRepo.save(created)];
-                    case 7:
-                        saved = _a.sent();
-                        customer.billing_address = saved;
-                        _a.label = 8;
-                    case 8: return [2 /*return*/];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var addrRepo, address, fetchedAddress, addr, created, saved;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        addrRepo = manager.getCustomRepository(this.addressRepository_);
+                                        if (addressOrId === null || addressOrId === undefined) {
+                                            customer.billing_address_id = null;
+                                            return [2 /*return*/];
+                                        }
+                                        if (!(typeof addressOrId === "string")) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, addrRepo.findOne({
+                                                where: { id: addressOrId },
+                                            })];
+                                    case 1:
+                                        fetchedAddress = _b.sent();
+                                        if (!fetchedAddress) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Address with id ".concat(addressOrId, " was not found"));
+                                        }
+                                        address = fetchedAddress;
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        address = addressOrId;
+                                        _b.label = 3;
+                                    case 3:
+                                        address.country_code = (_a = address.country_code) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                                        if (!(typeof (address === null || address === void 0 ? void 0 : address.id) !== "undefined")) return [3 /*break*/, 4];
+                                        customer.billing_address_id = address.id;
+                                        return [3 /*break*/, 9];
+                                    case 4:
+                                        if (!customer.billing_address_id) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, addrRepo.findOne({
+                                                where: { id: customer.billing_address_id },
+                                            })];
+                                    case 5:
+                                        addr = _b.sent();
+                                        return [4 /*yield*/, addrRepo.save(__assign(__assign({}, addr), address))];
+                                    case 6:
+                                        _b.sent();
+                                        return [3 /*break*/, 9];
+                                    case 7:
+                                        created = addrRepo.create(address);
+                                        return [4 /*yield*/, addrRepo.save(created)];
+                                    case 8:
+                                        saved = _b.sent();
+                                        customer.billing_address = saved;
+                                        _b.label = 9;
+                                    case 9: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -570,37 +617,43 @@ var CustomerService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var addressRepo, toUpdate, _a, _b, _c, key, value, result;
-                        var e_2, _d;
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
-                                case 0:
-                                    addressRepo = manager.getCustomRepository(this.addressRepository_);
-                                    address.country_code = address.country_code.toLowerCase();
-                                    return [4 /*yield*/, addressRepo.findOne({
-                                            where: { id: addressId, customer_id: customerId },
-                                        })];
-                                case 1:
-                                    toUpdate = _e.sent();
-                                    try {
-                                        for (_a = __values(Object.entries(address)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                            _c = __read(_b.value, 2), key = _c[0], value = _c[1];
-                                            toUpdate[key] = value;
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var addressRepo, toUpdate, _a, _b, _c, key, value;
+                            var e_2, _d;
+                            var _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
+                                    case 0:
+                                        addressRepo = manager.getCustomRepository(this.addressRepository_);
+                                        address.country_code = (_e = address.country_code) === null || _e === void 0 ? void 0 : _e.toLowerCase();
+                                        return [4 /*yield*/, addressRepo.findOne({
+                                                where: { id: addressId, customer_id: customerId },
+                                            })];
+                                    case 1:
+                                        toUpdate = _f.sent();
+                                        if (!toUpdate) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Could not find address for customer");
                                         }
-                                    }
-                                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                                    finally {
                                         try {
-                                            if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                                            for (_a = __values(Object.entries(address)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                                _c = __read(_b.value, 2), key = _c[0], value = _c[1];
+                                                toUpdate[key] = value;
+                                            }
                                         }
-                                        finally { if (e_2) throw e_2.error; }
-                                    }
-                                    result = addressRepo.save(toUpdate);
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                        finally {
+                                            try {
+                                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                                            }
+                                            finally { if (e_2) throw e_2.error; }
+                                        }
+                                        return [2 /*return*/, addressRepo.save(toUpdate)];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -608,27 +661,30 @@ var CustomerService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var addressRepo, address;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    addressRepo = manager.getCustomRepository(this.addressRepository_);
-                                    return [4 /*yield*/, addressRepo.findOne({
-                                            where: { id: addressId, customer_id: customerId },
-                                        })];
-                                case 1:
-                                    address = _a.sent();
-                                    if (!address) {
-                                        return [2 /*return*/, Promise.resolve()];
-                                    }
-                                    return [4 /*yield*/, addressRepo.softRemove(address)];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/, Promise.resolve()];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var addressRepo, address;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        addressRepo = manager.getCustomRepository(this.addressRepository_);
+                                        return [4 /*yield*/, addressRepo.findOne({
+                                                where: { id: addressId, customer_id: customerId },
+                                            })];
+                                    case 1:
+                                        address = _a.sent();
+                                        if (!address) {
+                                            return [2 /*return*/];
+                                        }
+                                        return [4 /*yield*/, addressRepo.softRemove(address)];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -636,41 +692,46 @@ var CustomerService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var addressRepository, customer, shouldAdd, created, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    addressRepository = manager.getCustomRepository(this.addressRepository_);
-                                    address.country_code = address.country_code.toLowerCase();
-                                    return [4 /*yield*/, this.retrieve(customerId, {
-                                            relations: ["shipping_addresses"],
-                                        })];
-                                case 1:
-                                    customer = _a.sent();
-                                    shouldAdd = !customer.shipping_addresses.find(function (a) {
-                                        return a.country_code.toLowerCase() === address.country_code.toLowerCase() &&
-                                            a.address_1 === address.address_1 &&
-                                            a.address_2 === address.address_2 &&
-                                            a.city === address.city &&
-                                            a.phone === address.phone &&
-                                            a.postal_code === address.postal_code &&
-                                            a.province === address.province &&
-                                            a.first_name === address.first_name &&
-                                            a.last_name === address.last_name;
-                                    });
-                                    if (!shouldAdd) return [3 /*break*/, 4];
-                                    return [4 /*yield*/, addressRepository.create(__assign({ customer_id: customerId }, address))];
-                                case 2:
-                                    created = _a.sent();
-                                    return [4 /*yield*/, addressRepository.save(created)];
-                                case 3:
-                                    result = _a.sent();
-                                    return [2 /*return*/, result];
-                                case 4: return [2 /*return*/, customer];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var addressRepository, customer, shouldAdd, created, result;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        addressRepository = manager.getCustomRepository(this.addressRepository_);
+                                        address.country_code = address.country_code.toLowerCase();
+                                        return [4 /*yield*/, this.retrieve(customerId, {
+                                                relations: ["shipping_addresses"],
+                                            })];
+                                    case 1:
+                                        customer = _a.sent();
+                                        shouldAdd = !customer.shipping_addresses.find(function (a) {
+                                            var _a;
+                                            return ((_a = a.country_code) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ===
+                                                address.country_code.toLowerCase() &&
+                                                a.address_1 === address.address_1 &&
+                                                a.address_2 === address.address_2 &&
+                                                a.city === address.city &&
+                                                a.phone === address.phone &&
+                                                a.postal_code === address.postal_code &&
+                                                a.province === address.province &&
+                                                a.first_name === address.first_name &&
+                                                a.last_name === address.last_name;
+                                        });
+                                        if (!shouldAdd) return [3 /*break*/, 4];
+                                        return [4 /*yield*/, addressRepository.create(__assign(__assign({}, address), { customer_id: customerId }))];
+                                    case 2:
+                                        created = _a.sent();
+                                        return [4 /*yield*/, addressRepository.save(created)];
+                                    case 3:
+                                        result = _a.sent();
+                                        return [2 /*return*/, result];
+                                    case 4: return [2 /*return*/, customer];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -683,50 +744,26 @@ var CustomerService = /** @class */ (function (_super) {
     CustomerService.prototype.delete = function (customerId) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var customerRepo, customer;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    customerRepo = manager.getCustomRepository(this.customerRepository_);
-                                    return [4 /*yield*/, customerRepo.findOne({ where: { id: customerId } })];
-                                case 1:
-                                    customer = _a.sent();
-                                    if (!customer) {
-                                        return [2 /*return*/, Promise.resolve()];
-                                    }
-                                    return [4 /*yield*/, customerRepo.softRemove(customer)];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/, Promise.resolve()];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    /**
-     * Decorates a customer.
-     * @param {Customer} customer - the cart to decorate.
-     * @param {string[]} fields - the fields to include.
-     * @param {string[]} expandFields - fields to expand.
-     * @return {Customer} return the decorated customer.
-     */
-    CustomerService.prototype.decorate = function (customer, fields, expandFields) {
-        if (fields === void 0) { fields = []; }
-        if (expandFields === void 0) { expandFields = []; }
-        return __awaiter(this, void 0, void 0, function () {
-            var requiredFields, decorated, final;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        requiredFields = ["_id", "metadata"];
-                        decorated = lodash_1.default.pick(customer, fields.concat(requiredFields));
-                        return [4 /*yield*/, this.runDecorators_(decorated)];
-                    case 1:
-                        final = _a.sent();
-                        return [2 /*return*/, final];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var customerRepo, customer;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        customerRepo = manager.getCustomRepository(this.customerRepository_);
+                                        return [4 /*yield*/, customerRepo.findOne({ where: { id: customerId } })];
+                                    case 1:
+                                        customer = _a.sent();
+                                        if (!customer) {
+                                            return [2 /*return*/];
+                                        }
+                                        return [4 /*yield*/, customerRepo.softRemove(customer)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -737,6 +774,6 @@ var CustomerService = /** @class */ (function (_super) {
         UPDATED: "customer.updated",
     };
     return CustomerService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = CustomerService;
 //# sourceMappingURL=customer.js.map