@medusajs/medusa 1.3.0 → 1.3.1-alpha.63

package/dist/services/cart.js

@@ -103,8 +103,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var lodash_1 = __importDefault(require("lodash"));
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
 var typeorm_1 = require("typeorm");
+var interfaces_1 = require("../interfaces");
+var models_1 = require("../models");
+var utils_1 = require("../utils");
 /* Provides layer to manipulate carts.
  * @implements BaseService
  */
@@ -112,7 +114,9 @@ var CartService = /** @class */ (function (_super) {
     __extends(CartService, _super);
     function CartService(_a) {
         var manager = _a.manager, cartRepository = _a.cartRepository, shippingMethodRepository = _a.shippingMethodRepository, lineItemRepository = _a.lineItemRepository, eventBusService = _a.eventBusService, paymentProviderService = _a.paymentProviderService, productService = _a.productService, productVariantService = _a.productVariantService, taxProviderService = _a.taxProviderService, regionService = _a.regionService, lineItemService = _a.lineItemService, shippingOptionService = _a.shippingOptionService, customerService = _a.customerService, discountService = _a.discountService, giftCardService = _a.giftCardService, totalsService = _a.totalsService, addressRepository = _a.addressRepository, paymentSessionRepository = _a.paymentSessionRepository, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService, lineItemAdjustmentService = _a.lineItemAdjustmentService, priceSelectionStrategy = _a.priceSelectionStrategy;
-        var _this = _super.call(this) || this;
+        var _this = 
+        // eslint-disable-next-line prefer-rest-params
+        _super.call(this, arguments[0]) || this;
         _this.manager_ = manager;
         _this.shippingMethodRepository_ = shippingMethodRepository;
         _this.cartRepository_ = cartRepository;
@@ -137,37 +141,6 @@ var CartService = /** @class */ (function (_super) {
         _this.priceSelectionStrategy_ = priceSelectionStrategy;
         return _this;
     }
-    CartService.prototype.withTransaction = function (transactionManager) {
-        if (!transactionManager) {
-            return this;
-        }
-        var cloned = new CartService({
-            manager: transactionManager,
-            taxProviderService: this.taxProviderService_,
-            cartRepository: this.cartRepository_,
-            lineItemRepository: this.lineItemRepository_,
-            eventBusService: this.eventBus_,
-            paymentProviderService: this.paymentProviderService_,
-            paymentSessionRepository: this.paymentSessionRepository_,
-            shippingMethodRepository: this.shippingMethodRepository_,
-            productService: this.productService_,
-            productVariantService: this.productVariantService_,
-            regionService: this.regionService_,
-            lineItemService: this.lineItemService_,
-            shippingOptionService: this.shippingOptionService_,
-            customerService: this.customerService_,
-            discountService: this.discountService_,
-            totalsService: this.totalsService_,
-            addressRepository: this.addressRepository_,
-            giftCardService: this.giftCardService_,
-            inventoryService: this.inventoryService_,
-            customShippingOptionService: this.customShippingOptionService_,
-            lineItemAdjustmentService: this.lineItemAdjustmentService_,
-            priceSelectionStrategy: this.priceSelectionStrategy_,
-        });
-        cloned.transactionManager_ = transactionManager;
-        return cloned;
-    };
     CartService.prototype.transformQueryForTotals_ = function (config) {
         var select = config.select, relations = config.relations;
         if (!select) {
@@ -303,7 +276,7 @@ var CartService = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
-                                        query = this.buildQuery_(selector, config);
+                                        query = (0, utils_1.buildQuery)(selector, config);
                                         return [4 /*yield*/, cartRepo.find(query)];
                                     case 1: return [2 /*return*/, _a.sent()];
                                 }
@@ -334,9 +307,9 @@ var CartService = /** @class */ (function (_super) {
                                 switch (_b.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
-                                        validatedId = this.validateId_(cartId);
+                                        validatedId = (0, utils_1.validateId)(cartId);
                                         _a = this.transformQueryForTotals_(options), select = _a.select, relations = _a.relations, totalsToSelect = _a.totalsToSelect;
-                                        query = this.buildQuery_({ id: validatedId }, __assign(__assign({}, options), { select: select, relations: relations }));
+                                        query = (0, utils_1.buildQuery)({ id: validatedId }, __assign(__assign({}, options), { select: select, relations: relations }));
                                         if (relations && relations.length > 0) {
                                             query.relations = relations;
                                         }
@@ -375,10 +348,10 @@ var CartService = /** @class */ (function (_super) {
             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 cartRepo, addressRepo, region_id, rawCart, customer, region, regCountries, shippingAddress, _a, remainingFields, remainingFields_1, remainingFields_1_1, remainingField, createdCart, cart;
-                            var e_2, _b;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
+                            var cartRepo, addressRepo, region_id, rawCart, customer, region, regCountries, addr, remainingFields, remainingFields_1, remainingFields_1_1, remainingField, createdCart, cart;
+                            var e_2, _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
                                         addressRepo = transactionManager.getCustomRepository(this.addressRepository_);
@@ -390,56 +363,47 @@ var CartService = /** @class */ (function (_super) {
                                         if (!data.email) return [3 /*break*/, 2];
                                         return [4 /*yield*/, this.createOrFetchUserFromEmail_(data.email)];
                                     case 1:
-                                        customer = _c.sent();
+                                        customer = _b.sent();
                                         rawCart.customer = customer;
                                         rawCart.customer_id = customer.id;
                                         rawCart.email = customer.email;
-                                        _c.label = 2;
+                                        _b.label = 2;
                                     case 2: return [4 /*yield*/, this.regionService_
                                             .withTransaction(transactionManager)
                                             .retrieve(region_id, {
                                             relations: ["countries"],
                                         })];
                                     case 3:
-                                        region = _c.sent();
+                                        region = _b.sent();
                                         regCountries = region.countries.map(function (_a) {
                                             var iso_2 = _a.iso_2;
                                             return iso_2;
                                         });
                                         rawCart.region_id = region.id;
-                                        if (!(data.shipping_address_id !== undefined)) return [3 /*break*/, 7];
-                                        if (!data.shipping_address_id) return [3 /*break*/, 5];
-                                        return [4 /*yield*/, addressRepo.findOne(data.shipping_address_id)];
-                                    case 4:
-                                        _a = _c.sent();
-                                        return [3 /*break*/, 6];
-                                    case 5:
-                                        _a = null;
-                                        _c.label = 6;
-                                    case 6:
-                                        shippingAddress = _a;
-                                        if (shippingAddress &&
-                                            !regCountries.includes(shippingAddress.country_code)) {
-                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
-                                        }
-                                        rawCart.shipping_address = shippingAddress;
-                                        _c.label = 7;
-                                    case 7:
-                                        if (!data.shipping_address) {
-                                            if (region.countries.length === 1) {
-                                                // Preselect the country if the region only has 1
-                                                // and create address entity
-                                                rawCart.shipping_address = addressRepo.create({
-                                                    country_code: regCountries[0],
-                                                });
-                                            }
+                                        if (!(!data.shipping_address && !data.shipping_address_id)) return [3 /*break*/, 4];
+                                        if (region.countries.length === 1) {
+                                            rawCart.shipping_address = addressRepo.create({
+                                                country_code: regCountries[0],
+                                            });
                                         }
-                                        else {
+                                        return [3 /*break*/, 6];
+                                    case 4:
+                                        if (data.shipping_address) {
                                             if (!regCountries.includes(data.shipping_address.country_code)) {
                                                 throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
                                             }
                                             rawCart.shipping_address = data.shipping_address;
                                         }
+                                        if (!data.shipping_address_id) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, addressRepo.findOne(data.shipping_address_id)];
+                                    case 5:
+                                        addr = _b.sent();
+                                        if (addr && !regCountries.includes(addr.country_code)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
+                                        }
+                                        rawCart.shipping_address_id = data.shipping_address_id;
+                                        _b.label = 6;
+                                    case 6:
                                         remainingFields = [
                                             "billing_address_id",
                                             "context",
@@ -453,6 +417,9 @@ var CartService = /** @class */ (function (_super) {
                                                 remainingField = remainingFields_1_1.value;
                                                 if (typeof data[remainingField] !== "undefined" &&
                                                     remainingField !== "object") {
+                                                    /* TODO: See how to fix the error TS2590 properly while keeping the DeepPartial type */
+                                                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                                                    // @ts-ignore
                                                     rawCart[remainingField] = data[remainingField];
                                                 }
                                             }
@@ -460,21 +427,21 @@ var CartService = /** @class */ (function (_super) {
                                         catch (e_2_1) { e_2 = { error: e_2_1 }; }
                                         finally {
                                             try {
-                                                if (remainingFields_1_1 && !remainingFields_1_1.done && (_b = remainingFields_1.return)) _b.call(remainingFields_1);
+                                                if (remainingFields_1_1 && !remainingFields_1_1.done && (_a = remainingFields_1.return)) _a.call(remainingFields_1);
                                             }
                                             finally { if (e_2) throw e_2.error; }
                                         }
                                         createdCart = cartRepo.create(rawCart);
                                         return [4 /*yield*/, cartRepo.save(createdCart)];
-                                    case 8:
-                                        cart = _c.sent();
+                                    case 7:
+                                        cart = _b.sent();
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(transactionManager)
                                                 .emit(CartService.Events.CREATED, {
                                                 id: cart.id,
                                             })];
-                                    case 9:
-                                        _c.sent();
+                                    case 8:
+                                        _b.sent();
                                         return [2 /*return*/, cart];
                                 }
                             });
@@ -759,33 +726,55 @@ var CartService = /** @class */ (function (_super) {
      * @return void
      */
     CartService.prototype.adjustFreeShipping_ = function (cart, shouldAdd) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var shippingMethodRepository_1;
+            var transactionManager, shippingMethodRepository_1;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (!((_a = cart.shipping_methods) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 3];
-                        shippingMethodRepository_1 = this.transactionManager_.getCustomRepository(this.shippingMethodRepository_);
-                        if (!shouldAdd) return [3 /*break*/, 1];
-                        return [2 /*return*/, shippingMethodRepository_1.update({
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        if (!((_b = cart.shipping_methods) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 4];
+                        shippingMethodRepository_1 = transactionManager.getCustomRepository(this.shippingMethodRepository_);
+                        if (!shouldAdd) return [3 /*break*/, 2];
+                        return [4 /*yield*/, shippingMethodRepository_1.update({
                                 id: (0, typeorm_1.In)(cart.shipping_methods.map(function (shippingMethod) { return shippingMethod.id; })),
                             }, {
                                 price: 0,
                             })];
-                    case 1: return [4 /*yield*/, Promise.all(cart.shipping_methods.map(function (shippingMethod) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                // if free shipping discount is removed, we adjust the shipping
-                                // back to its original amount
-                                shippingMethod.price = shippingMethod.shipping_option.amount;
-                                return [2 /*return*/, shippingMethodRepository_1.save(shippingMethod)];
+                    case 1:
+                        _c.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, Promise.all(cart.shipping_methods.map(function (shippingMethod) { return __awaiter(_this, void 0, void 0, function () {
+                            var _a, _b;
+                            var _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0:
+                                        // if free shipping discount is removed, we adjust the shipping
+                                        // back to its original amount
+                                        // if shipping option amount is null, we assume the option is calculated
+                                        _a = shippingMethod;
+                                        if (!((_c = shippingMethod.shipping_option.amount) !== null && _c !== void 0)) return [3 /*break*/, 1];
+                                        _b = _c;
+                                        return [3 /*break*/, 3];
+                                    case 1: return [4 /*yield*/, this.shippingOptionService_.getPrice_(shippingMethod.shipping_option, shippingMethod.data, cart)];
+                                    case 2:
+                                        _b = (_d.sent());
+                                        _d.label = 3;
+                                    case 3:
+                                        // if free shipping discount is removed, we adjust the shipping
+                                        // back to its original amount
+                                        // if shipping option amount is null, we assume the option is calculated
+                                        _a.price = _b;
+                                        return [2 /*return*/, shippingMethodRepository_1.save(shippingMethod)];
+                                }
                             });
                         }); }))];
-                    case 2:
-                        _b.sent();
-                        _b.label = 3;
-                    case 3: return [2 /*return*/];
+                    case 3:
+                        _c.sent();
+                        _c.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -798,9 +787,9 @@ var CartService = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
                             var cartRepo, cart, customer, countryCode, addrRepo, billingAddress, shippingAddress, previousDiscounts, hasFreeShipping, prevContext, updatedCart;
                             var _this = this;
-                            var _a, _b, _c, _d, _e, _f;
-                            return __generator(this, function (_g) {
-                                switch (_g.label) {
+                            var _a, _b, _c, _d, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
                                         return [4 /*yield*/, this.retrieve(cartId, {
@@ -827,52 +816,52 @@ var CartService = /** @class */ (function (_super) {
                                                 ],
                                             })];
                                     case 1:
-                                        cart = _g.sent();
+                                        cart = _f.sent();
                                         if (!data.customer_id) return [3 /*break*/, 3];
                                         return [4 /*yield*/, this.updateCustomerId_(cart, data.customer_id)];
                                     case 2:
-                                        _g.sent();
+                                        _f.sent();
                                         return [3 /*break*/, 5];
                                     case 3:
                                         if (!(typeof data.email !== "undefined")) return [3 /*break*/, 5];
                                         return [4 /*yield*/, this.createOrFetchUserFromEmail_(data.email)];
                                     case 4:
-                                        customer = _g.sent();
+                                        customer = _f.sent();
                                         cart.customer = customer;
                                         cart.customer_id = customer.id;
                                         cart.email = customer.email;
-                                        _g.label = 5;
+                                        _f.label = 5;
                                     case 5:
                                         if (!(typeof data.region_id !== "undefined")) return [3 /*break*/, 7];
                                         countryCode = (_b = (data.country_code || ((_a = data.shipping_address) === null || _a === void 0 ? void 0 : _a.country_code))) !== null && _b !== void 0 ? _b : null;
                                         return [4 /*yield*/, this.setRegion_(cart, data.region_id, countryCode)];
                                     case 6:
-                                        _g.sent();
-                                        _g.label = 7;
+                                        _f.sent();
+                                        _f.label = 7;
                                     case 7:
                                         if (!(typeof data.customer_id !== "undefined" ||
                                             typeof data.region_id !== "undefined")) return [3 /*break*/, 9];
                                         return [4 /*yield*/, this.updateUnitPrices_(cart, data.region_id, data.customer_id)];
                                     case 8:
-                                        _g.sent();
-                                        _g.label = 9;
+                                        _f.sent();
+                                        _f.label = 9;
                                     case 9:
                                         addrRepo = transactionManager.getCustomRepository(this.addressRepository_);
                                         billingAddress = (_c = data.billing_address_id) !== null && _c !== void 0 ? _c : data.billing_address;
                                         if (!(billingAddress !== undefined)) return [3 /*break*/, 11];
                                         return [4 /*yield*/, this.updateBillingAddress_(cart, billingAddress, addrRepo)];
                                     case 10:
-                                        _g.sent();
-                                        _g.label = 11;
+                                        _f.sent();
+                                        _f.label = 11;
                                     case 11:
                                         shippingAddress = (_d = data.shipping_address_id) !== null && _d !== void 0 ? _d : data.shipping_address;
                                         if (!(shippingAddress !== undefined)) return [3 /*break*/, 13];
                                         return [4 /*yield*/, this.updateShippingAddress_(cart, shippingAddress, addrRepo)];
                                     case 12:
-                                        _g.sent();
-                                        _g.label = 13;
+                                        _f.sent();
+                                        _f.label = 13;
                                     case 13:
-                                        if (!((_e = data.discounts) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 18];
+                                        if (!(typeof data.discounts !== "undefined")) return [3 /*break*/, 18];
                                         previousDiscounts = __spreadArray([], __read(cart.discounts), false);
                                         cart.discounts.length = 0;
                                         return [4 /*yield*/, Promise.all(data.discounts.map(function (_a) {
@@ -880,39 +869,39 @@ var CartService = /** @class */ (function (_super) {
                                                 return _this.applyDiscount(cart, code);
                                             }))];
                                     case 14:
-                                        _g.sent();
+                                        _f.sent();
                                         hasFreeShipping = cart.discounts.some(function (_a) {
                                             var rule = _a.rule;
                                             return (rule === null || rule === void 0 ? void 0 : rule.type) === "free_shipping";
                                         });
                                         if (!(previousDiscounts.some(function (_a) {
                                             var rule = _a.rule;
-                                            return (rule === null || rule === void 0 ? void 0 : rule.type) === "free_shipping";
+                                            return rule.type === "free_shipping";
                                         }) &&
                                             !hasFreeShipping)) return [3 /*break*/, 16];
                                         return [4 /*yield*/, this.adjustFreeShipping_(cart, false)];
                                     case 15:
-                                        _g.sent();
-                                        _g.label = 16;
+                                        _f.sent();
+                                        _f.label = 16;
                                     case 16:
                                         if (!hasFreeShipping) return [3 /*break*/, 18];
                                         return [4 /*yield*/, this.adjustFreeShipping_(cart, true)];
                                     case 17:
-                                        _g.sent();
-                                        _g.label = 18;
+                                        _f.sent();
+                                        _f.label = 18;
                                     case 18:
                                         if (!("gift_cards" in data)) return [3 /*break*/, 20];
                                         cart.gift_cards = [];
-                                        return [4 /*yield*/, Promise.all(((_f = data.gift_cards) !== null && _f !== void 0 ? _f : []).map(function (_a) {
+                                        return [4 /*yield*/, Promise.all(((_e = data.gift_cards) !== null && _e !== void 0 ? _e : []).map(function (_a) {
                                                 var code = _a.code;
                                                 return _this.applyGiftCard_(cart, code);
                                             }))];
                                     case 19:
-                                        _g.sent();
-                                        _g.label = 20;
+                                        _f.sent();
+                                        _f.label = 20;
                                     case 20:
-                                        if ("metadata" in data) {
-                                            cart.metadata = this.setMetadata_(cart, data.metadata);
+                                        if (data === null || data === void 0 ? void 0 : data.metadata) {
+                                            cart.metadata = (0, utils_1.setMetadata)(cart, data.metadata);
                                         }
                                         if ("context" in data) {
                                             prevContext = cart.context || {};
@@ -926,19 +915,19 @@ var CartService = /** @class */ (function (_super) {
                                         }
                                         return [4 /*yield*/, cartRepo.save(cart)];
                                     case 21:
-                                        updatedCart = _g.sent();
+                                        updatedCart = _f.sent();
                                         if (!("email" in data || "customer_id" in data)) return [3 /*break*/, 23];
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(transactionManager)
                                                 .emit(CartService.Events.CUSTOMER_UPDATED, updatedCart.id)];
                                     case 22:
-                                        _g.sent();
-                                        _g.label = 23;
+                                        _f.sent();
+                                        _f.label = 23;
                                     case 23: return [4 /*yield*/, this.eventBus_
                                             .withTransaction(transactionManager)
                                             .emit(CartService.Events.UPDATED, updatedCart)];
                                     case 24:
-                                        _g.sent();
+                                        _f.sent();
                                         return [2 /*return*/, updatedCart];
                                 }
                             });
@@ -1168,7 +1157,7 @@ var CartService = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, this.discountService_
                                             .withTransaction(transactionManager)
-                                            .retrieveByCode(discountCode, ["rule", "regions"])];
+                                            .retrieveByCode(discountCode, { relations: ["rule", "regions"] })];
                                     case 1:
                                         discount = _a.sent();
                                         return [4 /*yield*/, this.discountService_
@@ -1189,7 +1178,7 @@ var CartService = /** @class */ (function (_super) {
                                         newDiscounts = toParse.map(function (discountToParse) {
                                             var _a;
                                             switch ((_a = discountToParse.rule) === null || _a === void 0 ? void 0 : _a.type) {
-                                                case "free_shipping":
+                                                case models_1.DiscountRuleType.FREE_SHIPPING:
                                                     if (discountToParse.rule.type === rule.type) {
                                                         return discount;
                                                     }
@@ -1373,7 +1362,7 @@ var CartService = /** @class */ (function (_super) {
                                         session = _b.sent();
                                         return [4 /*yield*/, this.retrieve(cart.id, {
                                                 select: ["total"],
-                                                relations: ["payment_sessions"],
+                                                relations: ["payment_sessions", "items", "items.adjustments"],
                                             })];
                                     case 3:
                                         freshCart = _b.sent();
@@ -1510,6 +1499,7 @@ var CartService = /** @class */ (function (_super) {
                                                 ],
                                                 relations: [
                                                     "items",
+                                                    "items.adjustments",
                                                     "discounts",
                                                     "discounts.rule",
                                                     "gift_cards",
@@ -1847,28 +1837,29 @@ var CartService = /** @class */ (function (_super) {
         return customOption;
     };
     CartService.prototype.updateUnitPrices_ = function (cart, regionId, customer_id) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var region_1, _b;
+            var transactionManager, region_1, _c;
             var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        if (!((_a = cart.items) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 3];
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        if (!((_b = cart.items) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.regionService_
                                 .withTransaction(this.transactionManager_)
                                 .retrieve(regionId || cart.region_id, {
                                 relations: ["countries"],
                             })];
                     case 1:
-                        region_1 = _c.sent();
-                        _b = cart;
+                        region_1 = _d.sent();
+                        _c = cart;
                         return [4 /*yield*/, Promise.all(cart.items.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
                                 var availablePrice;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.priceSelectionStrategy_
-                                                .withTransaction(this.transactionManager_)
+                                                .withTransaction(transactionManager)
                                                 .calculateVariantPrice(item.variant_id, {
                                                 region_id: region_1.id,
                                                 currency_code: region_1.currency_code,
@@ -1882,13 +1873,13 @@ var CartService = /** @class */ (function (_super) {
                                             if (!(availablePrice !== undefined &&
                                                 availablePrice.calculatedPrice !== null)) return [3 /*break*/, 2];
                                             return [2 /*return*/, this.lineItemService_
-                                                    .withTransaction(this.transactionManager_)
+                                                    .withTransaction(transactionManager)
                                                     .update(item.id, {
                                                     has_shipping: false,
                                                     unit_price: availablePrice.calculatedPrice,
                                                 })];
                                         case 2: return [4 /*yield*/, this.lineItemService_
-                                                .withTransaction(this.transactionManager_)
+                                                .withTransaction(transactionManager)
                                                 .delete(item.id)];
                                         case 3:
                                             _a.sent();
@@ -1897,8 +1888,8 @@ var CartService = /** @class */ (function (_super) {
                                 });
                             }); }))];
                     case 2:
-                        _b.items = (_c.sent()).filter(function (item) { return !!item; });
-                        _c.label = 3;
+                        _c.items = (_d.sent()).filter(function (item) { return !!item; });
+                        _d.label = 3;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -1912,11 +1903,13 @@ var CartService = /** @class */ (function (_super) {
      * @return the result of the update operation
      */
     CartService.prototype.setRegion_ = function (cart, regionId, countryCode) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var region, addrRepo, shippingAddress, updated, updated, paymentSessionRepo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var transactionManager, region, addrRepo, shippingAddress, updated, updated, paymentSessionRepo;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
                         if (cart.completed_at || cart.payment_authorized_at) {
                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot change the region of a completed cart");
                         }
@@ -1926,8 +1919,8 @@ var CartService = /** @class */ (function (_super) {
                                 relations: ["countries"],
                             })];
                     case 1:
-                        region = _a.sent();
-                        addrRepo = this.transactionManager_.getCustomRepository(this.addressRepository_);
+                        region = _b.sent();
+                        addrRepo = transactionManager.getCustomRepository(this.addressRepository_);
                         cart.region = region;
                         cart.region_id = region.id;
                         shippingAddress = {};
@@ -1936,8 +1929,8 @@ var CartService = /** @class */ (function (_super) {
                                 where: { id: cart.shipping_address_id },
                             })];
                     case 2:
-                        shippingAddress = (_a.sent());
-                        _a.label = 3;
+                        shippingAddress = (_b.sent());
+                        _b.label = 3;
                     case 3:
                         if (!(countryCode !== null)) return [3 /*break*/, 5];
                         if (!region.countries.find(function (_a) {
@@ -1949,7 +1942,7 @@ var CartService = /** @class */ (function (_super) {
                         updated = __assign(__assign({}, shippingAddress), { country_code: countryCode.toLowerCase() });
                         return [4 /*yield*/, addrRepo.save(updated)];
                     case 4:
-                        _a.sent();
+                        _b.sent();
                         return [3 /*break*/, 7];
                     case 5:
                         updated = __assign({}, shippingAddress);
@@ -1963,16 +1956,16 @@ var CartService = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.updateShippingAddress_(cart, updated, addrRepo)];
                     case 6:
-                        _a.sent();
-                        _a.label = 7;
+                        _b.sent();
+                        _b.label = 7;
                     case 7:
                         if (!(cart.shipping_methods && cart.shipping_methods.length)) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.shippingOptionService_
-                                .withTransaction(this.transactionManager_)
+                                .withTransaction(transactionManager)
                                 .deleteShippingMethods(cart.shipping_methods)];
                     case 8:
-                        _a.sent();
-                        _a.label = 9;
+                        _b.sent();
+                        _b.label = 9;
                     case 9:
                         if (cart.discounts && cart.discounts.length) {
                             cart.discounts = cart.discounts.filter(function (discount) {
@@ -1984,15 +1977,15 @@ var CartService = /** @class */ (function (_super) {
                         }
                         cart.gift_cards = [];
                         if (!(cart.payment_sessions && cart.payment_sessions.length)) return [3 /*break*/, 11];
-                        paymentSessionRepo = this.transactionManager_.getCustomRepository(this.paymentSessionRepository_);
+                        paymentSessionRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
                         return [4 /*yield*/, paymentSessionRepo.delete({
                                 id: (0, typeorm_1.In)(cart.payment_sessions.map(function (paymentSession) { return paymentSession.id; })),
                             })];
                     case 10:
-                        _a.sent();
+                        _b.sent();
                         cart.payment_sessions.length = 0;
                         cart.payment_session = null;
-                        _a.label = 11;
+                        _b.label = 11;
                     case 11: return [2 /*return*/];
                 }
             });
@@ -2059,7 +2052,7 @@ var CartService = /** @class */ (function (_super) {
                                 switch (_b.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
-                                        validatedId = this.validateId_(cartId);
+                                        validatedId = (0, utils_1.validateId)(cartId);
                                         if (typeof key !== "string") {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
                                         }
@@ -2126,17 +2119,19 @@ var CartService = /** @class */ (function (_super) {
         });
     };
     CartService.prototype.refreshAdjustments_ = function (cart) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var nonReturnLineIDs;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var transactionManager, nonReturnLineIDs;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
                         nonReturnLineIDs = cart.items
                             .filter(function (item) { return !item.is_return; })
                             .map(function (i) { return i.id; });
                         // delete all old non return line item adjustments
                         return [4 /*yield*/, this.lineItemAdjustmentService_
-                                .withTransaction(this.transactionManager_)
+                                .withTransaction(transactionManager)
                                 .delete({
                                 item_id: nonReturnLineIDs,
                             })
@@ -2144,14 +2139,14 @@ var CartService = /** @class */ (function (_super) {
                         ];
                     case 1:
                         // delete all old non return line item adjustments
-                        _a.sent();
+                        _b.sent();
                         // potentially create/update line item adjustments
                         return [4 /*yield*/, this.lineItemAdjustmentService_
-                                .withTransaction(this.transactionManager_)
+                                .withTransaction(transactionManager)
                                 .createAdjustments(cart)];
                     case 2:
                         // potentially create/update line item adjustments
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -2174,7 +2169,7 @@ var CartService = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0:
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
-                                        validatedId = this.validateId_(cartId);
+                                        validatedId = (0, utils_1.validateId)(cartId);
                                         if (typeof key !== "string") {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
                                         }
@@ -2208,6 +2203,6 @@ var CartService = /** @class */ (function (_super) {
         UPDATED: "cart.updated",
     };
     return CartService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = CartService;
 //# sourceMappingURL=cart.js.map