@medusajs/medusa 1.3.2 → 1.3.3

package/dist/services/discount.js

@@ -112,11 +112,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var iso8601_duration_1 = require("iso8601-duration");
 var lodash_1 = require("lodash");
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
 var typeorm_1 = require("typeorm");
 var discount_rule_1 = require("../models/discount-rule");
 var date_helpers_1 = require("../utils/date-helpers");
 var exception_formatter_1 = require("../utils/exception-formatter");
+var interfaces_1 = require("../interfaces");
+var utils_1 = require("../utils");
 /**
  * Provides layer to manipulate discounts.
  * @implements {BaseService}
@@ -125,52 +126,22 @@ var DiscountService = /** @class */ (function (_super) {
     __extends(DiscountService, _super);
     function DiscountService(_a) {
         var manager = _a.manager, discountRepository = _a.discountRepository, discountRuleRepository = _a.discountRuleRepository, giftCardRepository = _a.giftCardRepository, discountConditionRepository = _a.discountConditionRepository, discountConditionService = _a.discountConditionService, totalsService = _a.totalsService, productService = _a.productService, regionService = _a.regionService, customerService = _a.customerService, eventBusService = _a.eventBusService;
-        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 {DiscountRepository} */
         _this.discountRepository_ = discountRepository;
-        /** @private @const {DiscountRuleRepository} */
         _this.discountRuleRepository_ = discountRuleRepository;
-        /** @private @const {GiftCardRepository} */
         _this.giftCardRepository_ = giftCardRepository;
-        /** @private @const {DiscountConditionRepository} */
         _this.discountConditionRepository_ = discountConditionRepository;
-        /** @private @const {DiscountConditionRepository} */
         _this.discountConditionService_ = discountConditionService;
-        /** @private @const {TotalsService} */
         _this.totalsService_ = totalsService;
-        /** @private @const {ProductService} */
         _this.productService_ = productService;
-        /** @private @const {RegionService} */
         _this.regionService_ = regionService;
-        /** @private @const {CustomerService} */
         _this.customerService_ = customerService;
-        /** @private @const {EventBus} */
         _this.eventBus_ = eventBusService;
         return _this;
     }
-    DiscountService.prototype.withTransaction = function (transactionManager) {
-        if (!transactionManager) {
-            return this;
-        }
-        var cloned = new DiscountService({
-            manager: transactionManager,
-            discountRepository: this.discountRepository_,
-            discountRuleRepository: this.discountRuleRepository_,
-            giftCardRepository: this.giftCardRepository_,
-            discountConditionRepository: this.discountConditionRepository_,
-            discountConditionService: this.discountConditionService_,
-            totalsService: this.totalsService_,
-            productService: this.productService_,
-            regionService: this.regionService_,
-            customerService: this.customerService_,
-            eventBusService: this.eventBus_,
-        });
-        cloned.transactionManager_ = transactionManager;
-        cloned.manager_ = transactionManager;
-        return cloned;
-    };
     /**
      * Creates a discount rule with provided data given that the data is validated.
      * @param {DiscountRule} discountRule - the discount rule to create
@@ -191,11 +162,23 @@ var DiscountService = /** @class */ (function (_super) {
         if (selector === void 0) { selector = {}; }
         if (config === void 0) { config = { relations: [], skip: 0, take: 10 }; }
         return __awaiter(this, void 0, void 0, function () {
-            var discountRepo, query;
+            var _this = this;
             return __generator(this, function (_a) {
-                discountRepo = this.manager_.getCustomRepository(this.discountRepository_);
-                query = this.buildQuery_(selector, config);
-                return [2 /*return*/, discountRepo.find(query)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, query;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = transactionManager.getCustomRepository(this.discountRepository_);
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, discountRepo.find(query)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -212,30 +195,38 @@ var DiscountService = /** @class */ (function (_super) {
             order: { created_at: "DESC" },
         }; }
         return __awaiter(this, void 0, void 0, function () {
-            var discountRepo, q, query, where_1, _a, discounts, count;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        discountRepo = this.manager_.getCustomRepository(this.discountRepository_);
-                        if ("q" in selector) {
-                            q = selector.q;
-                            delete selector.q;
-                        }
-                        query = this.buildQuery_(selector, config);
-                        if (q) {
-                            where_1 = query.where;
-                            delete where_1.code;
-                            query.where = function (qb) {
-                                qb.where(where_1);
-                                qb.andWhere(new typeorm_1.Brackets(function (qb) {
-                                    qb.where({ code: (0, typeorm_1.ILike)("%".concat(q, "%")) });
-                                }));
-                            };
-                        }
-                        return [4 /*yield*/, discountRepo.findAndCount(query)];
-                    case 1:
-                        _a = __read.apply(void 0, [_b.sent(), 2]), discounts = _a[0], count = _a[1];
-                        return [2 /*return*/, [discounts, count]];
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, q, query, where_1, _a, discounts, count;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        discountRepo = transactionManager.getCustomRepository(this.discountRepository_);
+                                        if ("q" in selector) {
+                                            q = selector.q;
+                                            delete selector.q;
+                                        }
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        if (q) {
+                                            where_1 = query.where;
+                                            delete where_1.code;
+                                            query.where = function (qb) {
+                                                qb.where(where_1);
+                                                qb.andWhere(new typeorm_1.Brackets(function (qb) {
+                                                    qb.where({ code: (0, typeorm_1.ILike)("%".concat(q, "%")) });
+                                                }));
+                                            };
+                                        }
+                                        return [4 /*yield*/, discountRepo.findAndCount(query)];
+                                    case 1:
+                                        _a = __read.apply(void 0, [_b.sent(), 2]), discounts = _a[0], count = _a[1];
+                                        return [2 /*return*/, [discounts, count]];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -250,69 +241,72 @@ var DiscountService = /** @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 discountRepo, ruleRepo, conditions, ruleToCreate, validatedRule, _a, discountRule, createdDiscountRule, created, result_1, error_1;
-                        var _this = this;
-                        var _b, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    ruleRepo = manager.getCustomRepository(this.discountRuleRepository_);
-                                    conditions = (_b = discount.rule) === null || _b === void 0 ? void 0 : _b.conditions;
-                                    ruleToCreate = (0, lodash_1.omit)(discount.rule, ["conditions"]);
-                                    validatedRule = this.validateDiscountRule_(ruleToCreate);
-                                    if ((discount === null || discount === void 0 ? void 0 : discount.regions) &&
-                                        (discount === null || discount === void 0 ? void 0 : discount.regions.length) > 1 &&
-                                        ((_c = discount === null || discount === void 0 ? void 0 : discount.rule) === null || _c === void 0 ? void 0 : _c.type) === "fixed") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
-                                    }
-                                    _d.label = 1;
-                                case 1:
-                                    _d.trys.push([1, 8, , 9]);
-                                    if (!discount.regions) return [3 /*break*/, 3];
-                                    _a = discount;
-                                    return [4 /*yield*/, Promise.all(discount.regions.map(function (regionId) {
-                                            return _this.regionService_.withTransaction(manager).retrieve(regionId);
-                                        }))];
-                                case 2:
-                                    _a.regions = _d.sent();
-                                    _d.label = 3;
-                                case 3:
-                                    discountRule = ruleRepo.create(validatedRule);
-                                    return [4 /*yield*/, ruleRepo.save(discountRule)];
-                                case 4:
-                                    createdDiscountRule = _d.sent();
-                                    discount.code = discount.code.toUpperCase();
-                                    created = discountRepo.create(discount);
-                                    created.rule = createdDiscountRule;
-                                    return [4 /*yield*/, discountRepo.save(created)];
-                                case 5:
-                                    result_1 = _d.sent();
-                                    if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, Promise.all(conditions.map(function (cond) { return __awaiter(_this, void 0, void 0, function () {
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, this.discountConditionService_
-                                                            .withTransaction(manager)
-                                                            .upsertCondition(__assign({ rule_id: result_1.rule_id }, cond))];
-                                                    case 1:
-                                                        _a.sent();
-                                                        return [2 /*return*/];
-                                                }
-                                            });
-                                        }); }))];
-                                case 6:
-                                    _d.sent();
-                                    _d.label = 7;
-                                case 7: return [2 /*return*/, result_1];
-                                case 8:
-                                    error_1 = _d.sent();
-                                    throw (0, exception_formatter_1.formatException)(error_1);
-                                case 9: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, ruleRepo, conditions, ruleToCreate, validatedRule, _a, discountRule, createdDiscountRule, created, result_1, error_1;
+                            var _this = this;
+                            var _b, _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        ruleRepo = manager.getCustomRepository(this.discountRuleRepository_);
+                                        conditions = (_b = discount.rule) === null || _b === void 0 ? void 0 : _b.conditions;
+                                        ruleToCreate = (0, lodash_1.omit)(discount.rule, ["conditions"]);
+                                        validatedRule = this.validateDiscountRule_(ruleToCreate);
+                                        if ((discount === null || discount === void 0 ? void 0 : discount.regions) &&
+                                            (discount === null || discount === void 0 ? void 0 : discount.regions.length) > 1 &&
+                                            ((_c = discount === null || discount === void 0 ? void 0 : discount.rule) === null || _c === void 0 ? void 0 : _c.type) === "fixed") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
+                                        }
+                                        _d.label = 1;
+                                    case 1:
+                                        _d.trys.push([1, 8, , 9]);
+                                        if (!discount.regions) return [3 /*break*/, 3];
+                                        _a = discount;
+                                        return [4 /*yield*/, Promise.all(discount.regions.map(function (regionId) {
+                                                return _this.regionService_.withTransaction(manager).retrieve(regionId);
+                                            }))];
+                                    case 2:
+                                        _a.regions = (_d.sent());
+                                        _d.label = 3;
+                                    case 3:
+                                        discountRule = ruleRepo.create(validatedRule);
+                                        return [4 /*yield*/, ruleRepo.save(discountRule)];
+                                    case 4:
+                                        createdDiscountRule = _d.sent();
+                                        discount.code = discount.code.toUpperCase();
+                                        created = discountRepo.create(discount);
+                                        created.rule = createdDiscountRule;
+                                        return [4 /*yield*/, discountRepo.save(created)];
+                                    case 5:
+                                        result_1 = _d.sent();
+                                        if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, Promise.all(conditions.map(function (cond) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0: return [4 /*yield*/, this.discountConditionService_
+                                                                .withTransaction(manager)
+                                                                .upsertCondition(__assign({ rule_id: result_1.rule_id }, cond))];
+                                                        case 1:
+                                                            _a.sent();
+                                                            return [2 /*return*/];
+                                                    }
+                                                });
+                                            }); }))];
+                                    case 6:
+                                        _d.sent();
+                                        _d.label = 7;
+                                    case 7: return [2 /*return*/, result_1];
+                                    case 8:
+                                        error_1 = _d.sent();
+                                        throw (0, exception_formatter_1.formatException)(error_1);
+                                    case 9: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -325,20 +319,27 @@ var DiscountService = /** @class */ (function (_super) {
     DiscountService.prototype.retrieve = function (discountId, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var discountRepo, validatedId, query, discount;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        discountRepo = this.manager_.getCustomRepository(this.discountRepository_);
-                        validatedId = this.validateId_(discountId);
-                        query = this.buildQuery_({ id: validatedId }, config);
-                        return [4 /*yield*/, discountRepo.findOne(query)];
-                    case 1:
-                        discount = _a.sent();
-                        if (!discount) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Discount with ".concat(discountId, " was not found"));
-                        }
-                        return [2 /*return*/, discount];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, query, discount;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = transactionManager.getCustomRepository(this.discountRepository_);
+                                        query = (0, utils_1.buildQuery)({ id: discountId }, config);
+                                        return [4 /*yield*/, discountRepo.findOne(query)];
+                                    case 1:
+                                        discount = _a.sent();
+                                        if (!discount) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Discount with ".concat(discountId, " was not found"));
+                                        }
+                                        return [2 /*return*/, discount];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -352,25 +353,33 @@ var DiscountService = /** @class */ (function (_super) {
     DiscountService.prototype.retrieveByCode = function (discountCode, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var discountRepo, query, discount;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        discountRepo = this.manager_.getCustomRepository(this.discountRepository_);
-                        query = this.buildQuery_({ code: discountCode, is_dynamic: false }, config);
-                        return [4 /*yield*/, discountRepo.findOne(query)];
-                    case 1:
-                        discount = _a.sent();
-                        if (!!discount) return [3 /*break*/, 3];
-                        query = this.buildQuery_({ code: discountCode, is_dynamic: true }, config);
-                        return [4 /*yield*/, discountRepo.findOne(query)];
-                    case 2:
-                        discount = _a.sent();
-                        if (!discount) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Discount with code ".concat(discountCode, " was not found"));
-                        }
-                        _a.label = 3;
-                    case 3: return [2 /*return*/, discount];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, query, discount;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = transactionManager.getCustomRepository(this.discountRepository_);
+                                        query = (0, utils_1.buildQuery)({ code: discountCode, is_dynamic: false }, config);
+                                        return [4 /*yield*/, discountRepo.findOne(query)];
+                                    case 1:
+                                        discount = _a.sent();
+                                        if (!!discount) return [3 /*break*/, 3];
+                                        query = (0, utils_1.buildQuery)({ code: discountCode, is_dynamic: true }, config);
+                                        return [4 /*yield*/, discountRepo.findOne(query)];
+                                    case 2:
+                                        discount = _a.sent();
+                                        if (!discount) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Discount with code ".concat(discountCode, " was not found"));
+                                        }
+                                        _a.label = 3;
+                                    case 3: return [2 /*return*/, discount];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -385,98 +394,98 @@ var DiscountService = /** @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 discountRepo, ruleRepo, discount, conditions, ruleToUpdate, rule, metadata, regions, rest, _a, _b, ruleUpdate, updatedRule, _c, _d, key, updated;
-                        var e_1, _e;
-                        var _this = this;
-                        var _f;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    ruleRepo = manager.getCustomRepository(this.discountRuleRepository_);
-                                    return [4 /*yield*/, this.retrieve(discountId, {
-                                            relations: ["rule"],
-                                        })];
-                                case 1:
-                                    discount = _g.sent();
-                                    conditions = (_f = update === null || update === void 0 ? void 0 : update.rule) === null || _f === void 0 ? void 0 : _f.conditions;
-                                    ruleToUpdate = (0, lodash_1.omit)(update.rule, "conditions");
-                                    if (!(0, lodash_1.isEmpty)(ruleToUpdate)) {
-                                        update.rule = ruleToUpdate;
-                                    }
-                                    rule = update.rule, metadata = update.metadata, regions = update.regions, rest = __rest(update, ["rule", "metadata", "regions"]);
-                                    if (rest.ends_at) {
-                                        if (discount.starts_at >= new Date(rest.ends_at)) {
-                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "\"ends_at\" must be greater than \"starts_at\"");
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, ruleRepo, discount, conditions, ruleToUpdate, rule, metadata, regions, rest, _a, _b, ruleUpdate, _c, _d, key;
+                            var e_1, _e;
+                            var _this = this;
+                            var _f;
+                            return __generator(this, function (_g) {
+                                switch (_g.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        ruleRepo = manager.getCustomRepository(this.discountRuleRepository_);
+                                        return [4 /*yield*/, this.retrieve(discountId, {
+                                                relations: ["rule"],
+                                            })];
+                                    case 1:
+                                        discount = _g.sent();
+                                        conditions = (_f = update === null || update === void 0 ? void 0 : update.rule) === null || _f === void 0 ? void 0 : _f.conditions;
+                                        ruleToUpdate = (0, lodash_1.omit)(update.rule, "conditions");
+                                        if (!(0, lodash_1.isEmpty)(ruleToUpdate)) {
+                                            update.rule = ruleToUpdate;
                                         }
-                                    }
-                                    if (regions && (regions === null || regions === void 0 ? void 0 : regions.length) > 1 && discount.rule.type === "fixed") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
-                                    }
-                                    if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, Promise.all(conditions.map(function (cond) { return __awaiter(_this, void 0, void 0, function () {
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, this.discountConditionService_
-                                                            .withTransaction(manager)
-                                                            .upsertCondition(__assign({ rule_id: discount.rule_id }, cond))];
-                                                    case 1:
-                                                        _a.sent();
-                                                        return [2 /*return*/];
-                                                }
-                                            });
-                                        }); }))];
-                                case 2:
-                                    _g.sent();
-                                    _g.label = 3;
-                                case 3:
-                                    if (!regions) return [3 /*break*/, 5];
-                                    _a = discount;
-                                    return [4 /*yield*/, Promise.all(regions.map(function (regionId) { return _this.regionService_.retrieve(regionId); }))];
-                                case 4:
-                                    _a.regions = _g.sent();
-                                    _g.label = 5;
-                                case 5:
-                                    if (!metadata) return [3 /*break*/, 7];
-                                    _b = discount;
-                                    return [4 /*yield*/, this.setMetadata_(discount.id, metadata)];
-                                case 6:
-                                    _b.metadata = _g.sent();
-                                    _g.label = 7;
-                                case 7:
-                                    if (rule) {
-                                        ruleUpdate = rule;
-                                        if (rule.value) {
-                                            this.validateDiscountRule_({
-                                                value: rule.value,
-                                                type: discount.rule.type,
-                                            });
+                                        rule = update.rule, metadata = update.metadata, regions = update.regions, rest = __rest(update, ["rule", "metadata", "regions"]);
+                                        if (rest.ends_at) {
+                                            if (discount.starts_at >= new Date(rest.ends_at)) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "\"ends_at\" must be greater than \"starts_at\"");
+                                            }
+                                        }
+                                        if (regions && (regions === null || regions === void 0 ? void 0 : regions.length) > 1 && discount.rule.type === "fixed") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
                                         }
-                                        updatedRule = ruleRepo.create(__assign(__assign({}, discount.rule), ruleUpdate));
-                                        discount.rule = updatedRule;
-                                    }
-                                    try {
-                                        for (_c = __values(Object.keys(rest).filter(function (k) { return typeof rest[k] !== "undefined"; })), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                            key = _d.value;
-                                            discount[key] = rest[key];
+                                        if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, Promise.all(conditions.map(function (cond) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0: return [4 /*yield*/, this.discountConditionService_
+                                                                .withTransaction(manager)
+                                                                .upsertCondition(__assign({ rule_id: discount.rule_id }, cond))];
+                                                        case 1:
+                                                            _a.sent();
+                                                            return [2 /*return*/];
+                                                    }
+                                                });
+                                            }); }))];
+                                    case 2:
+                                        _g.sent();
+                                        _g.label = 3;
+                                    case 3:
+                                        if (!regions) return [3 /*break*/, 5];
+                                        _a = discount;
+                                        return [4 /*yield*/, Promise.all(regions.map(function (regionId) { return _this.regionService_.retrieve(regionId); }))];
+                                    case 4:
+                                        _a.regions = _g.sent();
+                                        _g.label = 5;
+                                    case 5:
+                                        if (!metadata) return [3 /*break*/, 7];
+                                        _b = discount;
+                                        return [4 /*yield*/, (0, utils_1.setMetadata)(discount, metadata)];
+                                    case 6:
+                                        _b.metadata = _g.sent();
+                                        _g.label = 7;
+                                    case 7:
+                                        if (rule) {
+                                            ruleUpdate = rule;
+                                            if (rule.value) {
+                                                this.validateDiscountRule_({
+                                                    value: rule.value,
+                                                    type: discount.rule.type,
+                                                });
+                                            }
+                                            discount.rule = ruleRepo.create(__assign(__assign({}, discount.rule), ruleUpdate));
                                         }
-                                    }
-                                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                                    finally {
                                         try {
-                                            if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
+                                            for (_c = __values(Object.keys(rest).filter(function (k) { return typeof rest[k] !== "undefined"; })), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                                key = _d.value;
+                                                discount[key] = rest[key];
+                                            }
+                                        }
+                                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                        finally {
+                                            try {
+                                                if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
+                                            }
+                                            finally { if (e_1) throw e_1.error; }
                                         }
-                                        finally { if (e_1) throw e_1.error; }
-                                    }
-                                    discount.code = discount.code.toUpperCase();
-                                    return [4 /*yield*/, discountRepo.save(discount)];
-                                case 8:
-                                    updated = _g.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); })];
+                                        discount.code = discount.code.toUpperCase();
+                                        return [4 /*yield*/, discountRepo.save(discount)];
+                                    case 8: return [2 /*return*/, _g.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -490,37 +499,36 @@ var DiscountService = /** @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 discountRepo, discount, toCreate, lastValidDate, created, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    return [4 /*yield*/, this.retrieve(discountId)];
-                                case 1:
-                                    discount = _a.sent();
-                                    if (!discount.is_dynamic) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount must be set to dynamic");
-                                    }
-                                    if (!data.code) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Discount must have a code");
-                                    }
-                                    toCreate = __assign(__assign({}, data), { rule_id: discount.rule_id, is_dynamic: true, is_disabled: false, code: data.code.toUpperCase(), parent_discount_id: discount.id, usage_limit: discount.usage_limit });
-                                    if (discount.valid_duration) {
-                                        lastValidDate = new Date();
-                                        lastValidDate.setSeconds(lastValidDate.getSeconds() + (0, iso8601_duration_1.toSeconds)((0, iso8601_duration_1.parse)(discount.valid_duration)));
-                                        toCreate.ends_at = lastValidDate;
-                                    }
-                                    return [4 /*yield*/, discountRepo.create(toCreate)];
-                                case 2:
-                                    created = _a.sent();
-                                    return [4 /*yield*/, discountRepo.save(created)];
-                                case 3:
-                                    result = _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 discountRepo, discount, toCreate, lastValidDate, created;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        return [4 /*yield*/, this.retrieve(discountId)];
+                                    case 1:
+                                        discount = _a.sent();
+                                        if (!discount.is_dynamic) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount must be set to dynamic");
+                                        }
+                                        if (!data.code) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Discount must have a code");
+                                        }
+                                        toCreate = __assign(__assign({}, data), { rule_id: discount.rule_id, is_dynamic: true, is_disabled: false, code: data.code.toUpperCase(), parent_discount_id: discount.id, usage_limit: discount.usage_limit });
+                                        if (discount.valid_duration) {
+                                            lastValidDate = new Date();
+                                            lastValidDate.setSeconds(lastValidDate.getSeconds() + (0, iso8601_duration_1.toSeconds)((0, iso8601_duration_1.parse)(discount.valid_duration)));
+                                            toCreate.ends_at = lastValidDate;
+                                        }
+                                        created = discountRepo.create(toCreate);
+                                        return [4 /*yield*/, discountRepo.save(created)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -534,27 +542,30 @@ var DiscountService = /** @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 discountRepo, discount;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    return [4 /*yield*/, discountRepo.findOne({
-                                            where: { parent_discount_id: discountId, code: code },
-                                        })];
-                                case 1:
-                                    discount = _a.sent();
-                                    if (!discount) {
-                                        return [2 /*return*/, Promise.resolve()];
-                                    }
-                                    return [4 /*yield*/, discountRepo.softRemove(discount)];
-                                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 discountRepo, discount;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        return [4 /*yield*/, discountRepo.findOne({
+                                                where: { parent_discount_id: discountId, code: code },
+                                            })];
+                                    case 1:
+                                        discount = _a.sent();
+                                        if (!discount) {
+                                            return [2 /*return*/];
+                                        }
+                                        return [4 /*yield*/, discountRepo.softRemove(discount)];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -568,37 +579,38 @@ var DiscountService = /** @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 discountRepo, discount, exists, region, updated;
-                        var _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    return [4 /*yield*/, this.retrieve(discountId, {
-                                            relations: ["regions", "rule"],
-                                        })];
-                                case 1:
-                                    discount = _b.sent();
-                                    exists = discount.regions.find(function (r) { return r.id === regionId; });
-                                    // If region is already present, we return early
-                                    if (exists) {
-                                        return [2 /*return*/, discount];
-                                    }
-                                    if (((_a = discount.regions) === null || _a === void 0 ? void 0 : _a.length) === 1 && discount.rule.type === "fixed") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
-                                    }
-                                    return [4 /*yield*/, this.regionService_.retrieve(regionId)];
-                                case 2:
-                                    region = _b.sent();
-                                    discount.regions = __spreadArray(__spreadArray([], __read(discount.regions), false), [region], false);
-                                    return [4 /*yield*/, discountRepo.save(discount)];
-                                case 3:
-                                    updated = _b.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, discount, exists, region;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        return [4 /*yield*/, this.retrieve(discountId, {
+                                                relations: ["regions", "rule"],
+                                            })];
+                                    case 1:
+                                        discount = _b.sent();
+                                        exists = discount.regions.find(function (r) { return r.id === regionId; });
+                                        // If region is already present, we return early
+                                        if (exists) {
+                                            return [2 /*return*/, discount];
+                                        }
+                                        if (((_a = discount.regions) === null || _a === void 0 ? void 0 : _a.length) === 1 && discount.rule.type === "fixed") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Fixed discounts can have one region");
+                                        }
+                                        return [4 /*yield*/, this.regionService_.retrieve(regionId)];
+                                    case 2:
+                                        region = _b.sent();
+                                        discount.regions = __spreadArray(__spreadArray([], __read(discount.regions), false), [region], false);
+                                        return [4 /*yield*/, discountRepo.save(discount)];
+                                    case 3: return [2 /*return*/, _b.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -612,30 +624,31 @@ var DiscountService = /** @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 discountRepo, discount, exists, updated;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    return [4 /*yield*/, this.retrieve(discountId, {
-                                            relations: ["regions"],
-                                        })];
-                                case 1:
-                                    discount = _a.sent();
-                                    exists = discount.regions.find(function (r) { return r.id === regionId; });
-                                    // If region is not present, we return early
-                                    if (!exists) {
-                                        return [2 /*return*/, discount];
-                                    }
-                                    discount.regions = discount.regions.filter(function (r) { return r.id !== regionId; });
-                                    return [4 /*yield*/, discountRepo.save(discount)];
-                                case 2:
-                                    updated = _a.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountRepo, discount, exists;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        return [4 /*yield*/, this.retrieve(discountId, {
+                                                relations: ["regions"],
+                                            })];
+                                    case 1:
+                                        discount = _a.sent();
+                                        exists = discount.regions.find(function (r) { return r.id === regionId; });
+                                        // If region is not present, we return early
+                                        if (!exists) {
+                                            return [2 /*return*/, discount];
+                                        }
+                                        discount.regions = discount.regions.filter(function (r) { return r.id !== regionId; });
+                                        return [4 /*yield*/, discountRepo.save(discount)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -648,25 +661,28 @@ var DiscountService = /** @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 discountRepo, discount;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountRepo = manager.getCustomRepository(this.discountRepository_);
-                                    return [4 /*yield*/, discountRepo.findOne({ where: { id: discountId } })];
-                                case 1:
-                                    discount = _a.sent();
-                                    if (!discount) {
-                                        return [2 /*return*/, Promise.resolve()];
-                                    }
-                                    return [4 /*yield*/, discountRepo.softRemove(discount)];
-                                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 discountRepo, discount;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountRepo = manager.getCustomRepository(this.discountRepository_);
+                                        return [4 /*yield*/, discountRepo.findOne({ where: { id: discountId } })];
+                                    case 1:
+                                        discount = _a.sent();
+                                        if (!discount) {
+                                            return [2 /*return*/];
+                                        }
+                                        return [4 /*yield*/, discountRepo.softRemove(discount)];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -674,101 +690,120 @@ var DiscountService = /** @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 discountConditionRepo, product;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountConditionRepo = manager.getCustomRepository(this.discountConditionRepository_);
-                                    // In case of custom line items, we don't have a product id.
-                                    // Instead of throwing, we simply invalidate the discount.
-                                    if (!productId) {
-                                        return [2 /*return*/, false];
-                                    }
-                                    return [4 /*yield*/, this.productService_.retrieve(productId, {
-                                            relations: ["tags"],
-                                        })];
-                                case 1:
-                                    product = _a.sent();
-                                    return [4 /*yield*/, discountConditionRepo.isValidForProduct(discountRuleId, product.id)];
-                                case 2: return [2 /*return*/, _a.sent()];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountConditionRepo, product;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountConditionRepo = manager.getCustomRepository(this.discountConditionRepository_);
+                                        // In case of custom line items, we don't have a product id.
+                                        // Instead of throwing, we simply invalidate the discount.
+                                        if (!productId) {
+                                            return [2 /*return*/, false];
+                                        }
+                                        return [4 /*yield*/, this.productService_.retrieve(productId, {
+                                                relations: ["tags"],
+                                            })];
+                                    case 1:
+                                        product = _a.sent();
+                                        return [4 /*yield*/, discountConditionRepo.isValidForProduct(discountRuleId, product.id)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     DiscountService.prototype.calculateDiscountForLineItem = function (discountId, lineItem, cart) {
         return __awaiter(this, void 0, void 0, function () {
-            var adjustment, discount, _a, type, value, allocation, fullItemPrice, subtotal, nominator, itemRelativeToSubtotal, totalItemPercentage;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        adjustment = 0;
-                        if (!lineItem.allow_discounts) {
-                            return [2 /*return*/, adjustment];
-                        }
-                        return [4 /*yield*/, this.retrieve(discountId, { relations: ["rule"] })];
-                    case 1:
-                        discount = _b.sent();
-                        _a = discount.rule, type = _a.type, value = _a.value, allocation = _a.allocation;
-                        fullItemPrice = lineItem.unit_price * lineItem.quantity;
-                        if (type === discount_rule_1.DiscountRuleType.PERCENTAGE) {
-                            adjustment = Math.round((fullItemPrice / 100) * value);
-                        }
-                        else if (type === discount_rule_1.DiscountRuleType.FIXED &&
-                            allocation === discount_rule_1.AllocationType.TOTAL) {
-                            subtotal = this.totalsService_.getSubtotal(cart, {
-                                excludeNonDiscounts: true,
+            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 () {
+                            var adjustment, discount, _a, type, value, allocation, fullItemPrice, subtotal, nominator, itemRelativeToSubtotal, totalItemPercentage;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        adjustment = 0;
+                                        if (!lineItem.allow_discounts) {
+                                            return [2 /*return*/, adjustment];
+                                        }
+                                        return [4 /*yield*/, this.retrieve(discountId, { relations: ["rule"] })];
+                                    case 1:
+                                        discount = _b.sent();
+                                        _a = discount.rule, type = _a.type, value = _a.value, allocation = _a.allocation;
+                                        fullItemPrice = lineItem.unit_price * lineItem.quantity;
+                                        if (type === discount_rule_1.DiscountRuleType.PERCENTAGE) {
+                                            adjustment = Math.round((fullItemPrice / 100) * value);
+                                        }
+                                        else if (type === discount_rule_1.DiscountRuleType.FIXED &&
+                                            allocation === discount_rule_1.AllocationType.TOTAL) {
+                                            subtotal = this.totalsService_.getSubtotal(cart, {
+                                                excludeNonDiscounts: true,
+                                            });
+                                            nominator = Math.min(value, subtotal);
+                                            itemRelativeToSubtotal = lineItem.unit_price / subtotal;
+                                            totalItemPercentage = itemRelativeToSubtotal * lineItem.quantity;
+                                            adjustment = Math.round(nominator * totalItemPercentage);
+                                        }
+                                        else {
+                                            adjustment = value * lineItem.quantity;
+                                        }
+                                        // if the amount of the discount exceeds the total price of the item,
+                                        // we return the total item price, else the fixed amount
+                                        return [2 /*return*/, adjustment >= fullItemPrice ? fullItemPrice : adjustment];
+                                }
                             });
-                            nominator = Math.min(value, subtotal);
-                            itemRelativeToSubtotal = lineItem.unit_price / subtotal;
-                            totalItemPercentage = itemRelativeToSubtotal * lineItem.quantity;
-                            adjustment = Math.round(nominator * totalItemPercentage);
-                        }
-                        else {
-                            adjustment = value * lineItem.quantity;
-                        }
-                        // if the amount of the discount exceeds the total price of the item,
-                        // we return the total item price, else the fixed amount
-                        return [2 /*return*/, adjustment >= fullItemPrice ? fullItemPrice : adjustment];
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     DiscountService.prototype.validateDiscountForCartOrThrow = function (cart, discount) {
         return __awaiter(this, void 0, void 0, function () {
-            var isValidForRegion, canApplyForCustomer;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (this.hasReachedLimit(discount)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount has been used maximum allowed times");
-                        }
-                        if (this.hasNotStarted(discount)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is not valid yet");
-                        }
-                        if (this.hasExpired(discount)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is expired");
-                        }
-                        if (this.isDisabled(discount)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The discount code is disabled");
-                        }
-                        return [4 /*yield*/, this.isValidForRegion(discount, cart.region_id)];
-                    case 1:
-                        isValidForRegion = _a.sent();
-                        if (!isValidForRegion) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The discount is not available in current region");
-                        }
-                        if (!cart.customer_id) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.canApplyForCustomer(discount.rule.id, cart.customer_id)];
-                    case 2:
-                        canApplyForCustomer = _a.sent();
-                        if (!canApplyForCustomer) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is not valid for customer");
-                        }
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function () { return __awaiter(_this, void 0, void 0, function () {
+                            var isValidForRegion, canApplyForCustomer;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (this.hasReachedLimit(discount)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount has been used maximum allowed times");
+                                        }
+                                        if (this.hasNotStarted(discount)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is not valid yet");
+                                        }
+                                        if (this.hasExpired(discount)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is expired");
+                                        }
+                                        if (this.isDisabled(discount)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The discount code is disabled");
+                                        }
+                                        return [4 /*yield*/, this.isValidForRegion(discount, cart.region_id)];
+                                    case 1:
+                                        isValidForRegion = _a.sent();
+                                        if (!isValidForRegion) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The discount is not available in current region");
+                                        }
+                                        if (!cart.customer_id) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.canApplyForCustomer(discount.rule.id, cart.customer_id)];
+                                    case 2:
+                                        canApplyForCustomer = _a.sent();
+                                        if (!canApplyForCustomer) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is not valid for customer");
+                                        }
+                                        _a.label = 3;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -792,23 +827,31 @@ var DiscountService = /** @class */ (function (_super) {
     };
     DiscountService.prototype.isValidForRegion = function (discount, region_id) {
         return __awaiter(this, void 0, void 0, function () {
-            var regions, parent;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        regions = discount.regions;
-                        if (!discount.parent_discount_id) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.retrieve(discount.parent_discount_id, {
-                                relations: ["rule", "regions"],
-                            })];
-                    case 1:
-                        parent = _a.sent();
-                        regions = parent.regions;
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, regions.find(function (_a) {
-                            var id = _a.id;
-                            return id === region_id;
-                        }) !== undefined];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function () { return __awaiter(_this, void 0, void 0, function () {
+                            var regions, parent;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        regions = discount.regions;
+                                        if (!discount.parent_discount_id) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, this.retrieve(discount.parent_discount_id, {
+                                                relations: ["rule", "regions"],
+                                            })];
+                                    case 1:
+                                        parent = _a.sent();
+                                        regions = parent.regions;
+                                        _a.label = 2;
+                                    case 2: return [2 /*return*/, regions.find(function (_a) {
+                                            var id = _a.id;
+                                            return id === region_id;
+                                        }) !== undefined];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -817,30 +860,33 @@ var DiscountService = /** @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 discountConditionRepo, customer;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    discountConditionRepo = manager.getCustomRepository(this.discountConditionRepository_);
-                                    // Instead of throwing on missing customer id, we simply invalidate the discount
-                                    if (!customerId) {
-                                        return [2 /*return*/, false];
-                                    }
-                                    return [4 /*yield*/, this.customerService_.retrieve(customerId, {
-                                            relations: ["groups"],
-                                        })];
-                                case 1:
-                                    customer = _a.sent();
-                                    return [4 /*yield*/, discountConditionRepo.canApplyForCustomer(discountRuleId, customer.id)];
-                                case 2: return [2 /*return*/, _a.sent()];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discountConditionRepo, customer;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        discountConditionRepo = manager.getCustomRepository(this.discountConditionRepository_);
+                                        // Instead of throwing on missing customer id, we simply invalidate the discount
+                                        if (!customerId) {
+                                            return [2 /*return*/, false];
+                                        }
+                                        return [4 /*yield*/, this.customerService_.retrieve(customerId, {
+                                                relations: ["groups"],
+                                            })];
+                                    case 1:
+                                        customer = _a.sent();
+                                        return [4 /*yield*/, discountConditionRepo.canApplyForCustomer(discountRuleId, customer.id)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     return DiscountService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = DiscountService;
 //# sourceMappingURL=discount.js.map