@medusajs/medusa 1.3.8 → 1.3.9-alpha.0

package/dist/strategies/batch-jobs/product/import.js

@@ -154,32 +154,37 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * @param csvData - An array of parsed CSV rows.
      */
     ProductImportStrategy.prototype.getImportInstructions = function (csvData) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var shippingProfile, seenProducts, productsCreate, productsUpdate, variantsCreate, variantsUpdate, csvData_1, csvData_1_1, row, e_1_1;
-            var e_1, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.shippingProfileService_.retrieveDefault()];
+            var transactionManager, shippingProfile, seenProducts, productsCreate, productsUpdate, variantsCreate, variantsUpdate, csvData_1, csvData_1_1, row, e_1_1;
+            var e_1, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        return [4 /*yield*/, this.shippingProfileService_
+                                .withTransaction(transactionManager)
+                                .retrieveDefault()];
                     case 1:
-                        shippingProfile = _c.sent();
+                        shippingProfile = _d.sent();
                         seenProducts = {};
                         productsCreate = [];
                         productsUpdate = [];
                         variantsCreate = [];
                         variantsUpdate = [];
-                        _c.label = 2;
+                        _d.label = 2;
                     case 2:
-                        _c.trys.push([2, 8, 9, 10]);
+                        _d.trys.push([2, 8, 9, 10]);
                         csvData_1 = __values(csvData), csvData_1_1 = csvData_1.next();
-                        _c.label = 3;
+                        _d.label = 3;
                     case 3:
                         if (!!csvData_1_1.done) return [3 /*break*/, 7];
                         row = csvData_1_1.value;
                         if (!row["variant.prices"].length) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.prepareVariantPrices(row)];
                     case 4:
-                        _c.sent();
-                        _c.label = 5;
+                        _d.sent();
+                        _d.label = 5;
                     case 5:
                         if (row["variant.id"]) {
                             variantsUpdate.push(row);
@@ -198,27 +203,27 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                             }
                             seenProducts[row["product.handle"]] = true;
                         }
-                        _c.label = 6;
+                        _d.label = 6;
                     case 6:
                         csvData_1_1 = csvData_1.next();
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_1_1 = _c.sent();
+                        e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
-                            if (csvData_1_1 && !csvData_1_1.done && (_a = csvData_1.return)) _a.call(csvData_1);
+                            if (csvData_1_1 && !csvData_1_1.done && (_b = csvData_1.return)) _b.call(csvData_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 10: return [2 /*return*/, (_b = {},
-                            _b[types_1.OperationType.ProductCreate] = productsCreate,
-                            _b[types_1.OperationType.VariantCreate] = variantsCreate,
-                            _b[types_1.OperationType.ProductUpdate] = productsUpdate,
-                            _b[types_1.OperationType.VariantUpdate] = variantsUpdate,
-                            _b)];
+                    case 10: return [2 /*return*/, (_c = {},
+                            _c[types_1.OperationType.ProductCreate] = productsCreate,
+                            _c[types_1.OperationType.VariantCreate] = variantsCreate,
+                            _c[types_1.OperationType.ProductUpdate] = productsUpdate,
+                            _c[types_1.OperationType.VariantUpdate] = variantsUpdate,
+                            _c)];
                 }
             });
         });
@@ -300,36 +305,57 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * @param batchJobId - An id of a job that is being preprocessed.
      */
     ProductImportStrategy.prototype.preProcessBatchJob = function (batchJobId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var batchJob, csvFileKey, csvStream, parsedData, builtData, ops;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.batchJobService_.retrieve(batchJobId)];
+            var transactionManager, batchJob, csvFileKey, csvStream, builtData, parsedData, e_4, ops, totalOperationCount, operationsCounts;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        return [4 /*yield*/, this.batchJobService_
+                                .withTransaction(transactionManager)
+                                .retrieve(batchJobId)];
                     case 1:
-                        batchJob = _a.sent();
+                        batchJob = _b.sent();
                         csvFileKey = batchJob.context.fileKey;
                         return [4 /*yield*/, this.fileService_.getDownloadStream({
                                 fileKey: csvFileKey,
                             })];
                     case 2:
-                        csvStream = _a.sent();
-                        return [4 /*yield*/, this.csvParser_.parse(csvStream)];
+                        csvStream = _b.sent();
+                        _b.label = 3;
                     case 3:
-                        parsedData = _a.sent();
-                        return [4 /*yield*/, this.csvParser_.buildData(parsedData)];
+                        _b.trys.push([3, 6, , 7]);
+                        return [4 /*yield*/, this.csvParser_.parse(csvStream)];
                     case 4:
-                        builtData = _a.sent();
-                        return [4 /*yield*/, this.getImportInstructions(builtData)];
+                        parsedData = _b.sent();
+                        return [4 /*yield*/, this.csvParser_.buildData(parsedData)];
                     case 5:
-                        ops = _a.sent();
-                        return [4 /*yield*/, this.uploadImportOpsFile(batchJobId, ops)];
+                        builtData = _b.sent();
+                        return [3 /*break*/, 7];
                     case 6:
-                        _a.sent();
-                        return [4 /*yield*/, this.batchJobService_.update(batchJobId, {
+                        e_4 = _b.sent();
+                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The csv file parsing failed due to: " + e_4.message);
+                    case 7: return [4 /*yield*/, this.getImportInstructions(builtData)];
+                    case 8:
+                        ops = _b.sent();
+                        return [4 /*yield*/, this.uploadImportOpsFile(batchJobId, ops)];
+                    case 9:
+                        _b.sent();
+                        totalOperationCount = 0;
+                        operationsCounts = {};
+                        Object.keys(ops).forEach(function (key) {
+                            operationsCounts[key] = ops[key].length;
+                            totalOperationCount += ops[key].length;
+                        });
+                        return [4 /*yield*/, this.batchJobService_
+                                .withTransaction(transactionManager)
+                                .update(batchJobId, {
                                 result: {
                                     advancement_count: 0,
                                     // number of update/create operations to execute
-                                    count: Object.keys(ops).reduce(function (acc, k) { return acc + ops[k].length; }, 0),
+                                    count: totalOperationCount,
+                                    operations: operationsCounts,
                                     stat_descriptors: [
                                         {
                                             key: "product-import-count",
@@ -339,8 +365,8 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                                     ],
                                 },
                             })];
-                    case 7:
-                        _a.sent();
+                    case 10:
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -357,22 +383,30 @@ var ProductImportStrategy = /** @class */ (function (_super) {
             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 () {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var batchJob;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.createProducts(batchJobId)];
+                                    case 0: return [4 /*yield*/, this.batchJobService_
+                                            .withTransaction(manager)
+                                            .retrieve(batchJobId)];
                                     case 1:
-                                        _a.sent();
-                                        return [4 /*yield*/, this.updateProducts(batchJobId)];
+                                        batchJob = (_a.sent());
+                                        return [4 /*yield*/, this.createProducts(batchJob)];
                                     case 2:
                                         _a.sent();
-                                        return [4 /*yield*/, this.createVariants(batchJobId)];
+                                        return [4 /*yield*/, this.updateProducts(batchJob)];
                                     case 3:
                                         _a.sent();
-                                        return [4 /*yield*/, this.updateVariants(batchJobId)];
+                                        return [4 /*yield*/, this.createVariants(batchJob)];
                                     case 4:
                                         _a.sent();
-                                        this.finalize(batchJobId);
+                                        return [4 /*yield*/, this.updateVariants(batchJob)];
+                                    case 5:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.finalize(batchJob)];
+                                    case 6:
+                                        _a.sent();
                                         return [2 /*return*/];
                                 }
                             });
@@ -394,8 +428,8 @@ var ProductImportStrategy = /** @class */ (function (_super) {
     ProductImportStrategy.prototype.processSalesChannels = function (data) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, salesChannelServiceTx, salesChannels, data_1, data_1_1, input, channel, e_4, e_5_1;
-            var e_5, _b;
+            var transactionManager, salesChannelServiceTx, salesChannels, data_1, data_1_1, input, channel, e_5, e_6_1;
+            var e_6, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -422,7 +456,7 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         channel = _c.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        e_4 = _c.sent();
+                        e_5 = _c.sent();
                         return [3 /*break*/, 6];
                     case 6:
                         if (!!channel) return [3 /*break*/, 8];
@@ -440,14 +474,14 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 10: return [3 /*break*/, 13];
                     case 11:
-                        e_5_1 = _c.sent();
-                        e_5 = { error: e_5_1 };
+                        e_6_1 = _c.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 13];
                     case 12:
                         try {
                             if (data_1_1 && !data_1_1.done && (_b = data_1.return)) _b.call(data_1);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, salesChannels];
                 }
@@ -457,29 +491,32 @@ var ProductImportStrategy = /** @class */ (function (_super) {
     /**
      * Method creates products using `ProductService` and parsed data from a CSV row.
      *
-     * @param batchJobId - An id of the current batch job being processed.
+     * @param batchJob - The current batch job being processed.
      */
-    ProductImportStrategy.prototype.createProducts = function (batchJobId) {
+    ProductImportStrategy.prototype.createProducts = function (batchJob) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, productOps, productServiceTx, isSalesChannelsFeatureOn, productOps_1, productOps_1_1, productOp, productData, _b, _c, e_6, e_7_1;
-            var e_7, _d;
+            var transactionManager, productOps, productServiceTx, isSalesChannelsFeatureOn, productOps_1, productOps_1_1, productOp, productData, _b, _c, e_7, e_8_1;
+            var e_8, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        if (!batchJob.result.operations[types_1.OperationType.ProductCreate]) {
+                            return [2 /*return*/];
+                        }
                         transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
-                        return [4 /*yield*/, this.downloadImportOpsFile(batchJobId, types_1.OperationType.ProductCreate)];
+                        return [4 /*yield*/, this.downloadImportOpsFile(batchJob.id, types_1.OperationType.ProductCreate)];
                     case 1:
                         productOps = _e.sent();
                         productServiceTx = this.productService_.withTransaction(transactionManager);
                         isSalesChannelsFeatureOn = this.featureFlagRouter_.isFeatureEnabled(sales_channels_1.default.key);
                         _e.label = 2;
                     case 2:
-                        _e.trys.push([2, 12, 13, 14]);
+                        _e.trys.push([2, 13, 14, 15]);
                         productOps_1 = __values(productOps), productOps_1_1 = productOps_1.next();
                         _e.label = 3;
                     case 3:
-                        if (!!productOps_1_1.done) return [3 /*break*/, 11];
+                        if (!!productOps_1_1.done) return [3 /*break*/, 12];
                         productOp = productOps_1_1.value;
                         productData = (0, utils_1.transformProductData)(productOp);
                         _e.label = 4;
@@ -497,27 +534,28 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         _e.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        e_6 = _e.sent();
-                        ProductImportStrategy.throwDescriptiveError(productOp, e_6.message);
+                        e_7 = _e.sent();
+                        ProductImportStrategy.throwDescriptiveError(productOp, e_7.message);
                         return [3 /*break*/, 9];
-                    case 9:
-                        this.updateProgress(batchJobId);
-                        _e.label = 10;
+                    case 9: return [4 /*yield*/, this.updateProgress(batchJob.id)];
                     case 10:
+                        _e.sent();
+                        _e.label = 11;
+                    case 11:
                         productOps_1_1 = productOps_1.next();
                         return [3 /*break*/, 3];
-                    case 11: return [3 /*break*/, 14];
-                    case 12:
-                        e_7_1 = _e.sent();
-                        e_7 = { error: e_7_1 };
-                        return [3 /*break*/, 14];
+                    case 12: return [3 /*break*/, 15];
                     case 13:
+                        e_8_1 = _e.sent();
+                        e_8 = { error: e_8_1 };
+                        return [3 /*break*/, 15];
+                    case 14:
                         try {
                             if (productOps_1_1 && !productOps_1_1.done && (_d = productOps_1.return)) _d.call(productOps_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [2 /*return*/];
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -525,29 +563,32 @@ var ProductImportStrategy = /** @class */ (function (_super) {
     /**
      * Method updates existing products in the DB using a CSV row data.
      *
-     * @param batchJobId - An id of the current batch job being processed.
+     * @param batchJob - The current batch job being processed.
      */
-    ProductImportStrategy.prototype.updateProducts = function (batchJobId) {
+    ProductImportStrategy.prototype.updateProducts = function (batchJob) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, productOps, productServiceTx, isSalesChannelsFeatureOn, productOps_2, productOps_2_1, productOp, productData, _b, _c, e_8, e_9_1;
-            var e_9, _d;
+            var transactionManager, productOps, productServiceTx, isSalesChannelsFeatureOn, productOps_2, productOps_2_1, productOp, productData, _b, _c, e_9, e_10_1;
+            var e_10, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        if (!batchJob.result.operations[types_1.OperationType.ProductUpdate]) {
+                            return [2 /*return*/];
+                        }
                         transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
-                        return [4 /*yield*/, this.downloadImportOpsFile(batchJobId, types_1.OperationType.ProductUpdate)];
+                        return [4 /*yield*/, this.downloadImportOpsFile(batchJob.id, types_1.OperationType.ProductUpdate)];
                     case 1:
                         productOps = _e.sent();
                         productServiceTx = this.productService_.withTransaction(transactionManager);
                         isSalesChannelsFeatureOn = this.featureFlagRouter_.isFeatureEnabled(sales_channels_1.default.key);
                         _e.label = 2;
                     case 2:
-                        _e.trys.push([2, 12, 13, 14]);
+                        _e.trys.push([2, 13, 14, 15]);
                         productOps_2 = __values(productOps), productOps_2_1 = productOps_2.next();
                         _e.label = 3;
                     case 3:
-                        if (!!productOps_2_1.done) return [3 /*break*/, 11];
+                        if (!!productOps_2_1.done) return [3 /*break*/, 12];
                         productOp = productOps_2_1.value;
                         productData = (0, utils_1.transformProductData)(productOp);
                         _e.label = 4;
@@ -565,27 +606,28 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         _e.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        e_8 = _e.sent();
-                        ProductImportStrategy.throwDescriptiveError(productOp, e_8.message);
+                        e_9 = _e.sent();
+                        ProductImportStrategy.throwDescriptiveError(productOp, e_9.message);
                         return [3 /*break*/, 9];
-                    case 9:
-                        this.updateProgress(batchJobId);
-                        _e.label = 10;
+                    case 9: return [4 /*yield*/, this.updateProgress(batchJob.id)];
                     case 10:
+                        _e.sent();
+                        _e.label = 11;
+                    case 11:
                         productOps_2_1 = productOps_2.next();
                         return [3 /*break*/, 3];
-                    case 11: return [3 /*break*/, 14];
-                    case 12:
-                        e_9_1 = _e.sent();
-                        e_9 = { error: e_9_1 };
-                        return [3 /*break*/, 14];
+                    case 12: return [3 /*break*/, 15];
                     case 13:
+                        e_10_1 = _e.sent();
+                        e_10 = { error: e_10_1 };
+                        return [3 /*break*/, 15];
+                    case 14:
                         try {
                             if (productOps_2_1 && !productOps_2_1.done && (_d = productOps_2.return)) _d.call(productOps_2);
                         }
-                        finally { if (e_9) throw e_9.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [2 /*return*/];
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -594,26 +636,29 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * Method creates product variants from a CSV data.
      * Method also handles processing of variant options.
      *
-     * @param batchJobId - An id of the current batch job being processed.
+     * @param batchJob - The current batch job being processed.
      */
-    ProductImportStrategy.prototype.createVariants = function (batchJobId) {
+    ProductImportStrategy.prototype.createVariants = function (batchJob) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, variantOps, _loop_1, this_1, variantOps_1, variantOps_1_1, variantOp, e_10_1;
-            var e_10, _d;
+            var transactionManager, variantOps, _loop_1, this_1, variantOps_1, variantOps_1_1, variantOp, e_11_1;
+            var e_11, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        if (!batchJob.result.operations[types_1.OperationType.VariantCreate]) {
+                            return [2 /*return*/];
+                        }
                         transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
-                        return [4 /*yield*/, this.downloadImportOpsFile(batchJobId, types_1.OperationType.VariantCreate)];
+                        return [4 /*yield*/, this.downloadImportOpsFile(batchJob.id, types_1.OperationType.VariantCreate)];
                     case 1:
                         variantOps = _e.sent();
                         _loop_1 = function (variantOp) {
-                            var variant, product_1, optionIds_1, e_11;
+                            var variant, product_1, optionIds_1, e_12;
                             return __generator(this, function (_f) {
                                 switch (_f.label) {
                                     case 0:
-                                        _f.trys.push([0, 3, , 4]);
+                                        _f.trys.push([0, 4, , 5]);
                                         variant = (0, utils_1.transformVariantData)(variantOp);
                                         return [4 /*yield*/, this_1.productService_
                                                 .withTransaction(transactionManager)
@@ -634,13 +679,15 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                                                 .create(product_1, variant)];
                                     case 2:
                                         _f.sent();
-                                        this_1.updateProgress(batchJobId);
-                                        return [3 /*break*/, 4];
+                                        return [4 /*yield*/, this_1.updateProgress(batchJob.id)];
                                     case 3:
-                                        e_11 = _f.sent();
-                                        ProductImportStrategy.throwDescriptiveError(variantOp, e_11.message);
-                                        return [3 /*break*/, 4];
-                                    case 4: return [2 /*return*/];
+                                        _f.sent();
+                                        return [3 /*break*/, 5];
+                                    case 4:
+                                        e_12 = _f.sent();
+                                        ProductImportStrategy.throwDescriptiveError(variantOp, e_12.message);
+                                        return [3 /*break*/, 5];
+                                    case 5: return [2 /*return*/];
                                 }
                             });
                         };
@@ -662,14 +709,14 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_10_1 = _e.sent();
-                        e_10 = { error: e_10_1 };
+                        e_11_1 = _e.sent();
+                        e_11 = { error: e_11_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (variantOps_1_1 && !variantOps_1_1.done && (_d = variantOps_1.return)) _d.call(variantOps_1);
                         }
-                        finally { if (e_10) throw e_10.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -679,28 +726,31 @@ var ProductImportStrategy = /** @class */ (function (_super) {
     /**
      * Method updates product variants from a CSV data.
      *
-     * @param batchJobId - An id of the current batch job being processed.
+     * @param batchJob - The current batch job being processed.
      */
-    ProductImportStrategy.prototype.updateVariants = function (batchJobId) {
+    ProductImportStrategy.prototype.updateVariants = function (batchJob) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, variantOps, productServiceTx, variantOps_2, variantOps_2_1, variantOp, product, e_12, e_13_1;
-            var e_13, _b;
+            var transactionManager, variantOps, productServiceTx, variantOps_2, variantOps_2_1, variantOp, product, e_13, e_14_1;
+            var e_14, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        if (!batchJob.result.operations[types_1.OperationType.VariantUpdate]) {
+                            return [2 /*return*/];
+                        }
                         transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
-                        return [4 /*yield*/, this.downloadImportOpsFile(batchJobId, types_1.OperationType.VariantUpdate)];
+                        return [4 /*yield*/, this.downloadImportOpsFile(batchJob.id, types_1.OperationType.VariantUpdate)];
                     case 1:
                         variantOps = _c.sent();
                         productServiceTx = this.productService_.withTransaction(transactionManager);
                         _c.label = 2;
                     case 2:
-                        _c.trys.push([2, 12, 13, 14]);
+                        _c.trys.push([2, 13, 14, 15]);
                         variantOps_2 = __values(variantOps), variantOps_2_1 = variantOps_2.next();
                         _c.label = 3;
                     case 3:
-                        if (!!variantOps_2_1.done) return [3 /*break*/, 11];
+                        if (!!variantOps_2_1.done) return [3 /*break*/, 12];
                         variantOp = variantOps_2_1.value;
                         _c.label = 4;
                     case 4:
@@ -718,27 +768,28 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         _c.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        e_12 = _c.sent();
-                        ProductImportStrategy.throwDescriptiveError(variantOp, e_12.message);
+                        e_13 = _c.sent();
+                        ProductImportStrategy.throwDescriptiveError(variantOp, e_13.message);
                         return [3 /*break*/, 9];
-                    case 9:
-                        this.updateProgress(batchJobId);
-                        _c.label = 10;
+                    case 9: return [4 /*yield*/, this.updateProgress(batchJob.id)];
                     case 10:
+                        _c.sent();
+                        _c.label = 11;
+                    case 11:
                         variantOps_2_1 = variantOps_2.next();
                         return [3 /*break*/, 3];
-                    case 11: return [3 /*break*/, 14];
-                    case 12:
-                        e_13_1 = _c.sent();
-                        e_13 = { error: e_13_1 };
-                        return [3 /*break*/, 14];
+                    case 12: return [3 /*break*/, 15];
                     case 13:
+                        e_14_1 = _c.sent();
+                        e_14 = { error: e_14_1 };
+                        return [3 /*break*/, 15];
+                    case 14:
                         try {
                             if (variantOps_2_1 && !variantOps_2_1.done && (_b = variantOps_2.return)) _b.call(variantOps_2);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_14) throw e_14.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [2 /*return*/];
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -750,39 +801,42 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * @param productId - id of variant's product
      */
     ProductImportStrategy.prototype.prepareVariantOptions = function (variantOp, productId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productOptions, productOptions_1, productOptions_1_1, o, option, e_14_1;
-            var e_14, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var transactionManager, productOptions, productServiceTx, productOptions_1, productOptions_1_1, o, option, e_15_1;
+            var e_15, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
                         productOptions = variantOp["variant.options"] || [];
-                        _b.label = 1;
+                        productServiceTx = this.productService_.withTransaction(transactionManager);
+                        _c.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, 7, 8]);
+                        _c.trys.push([1, 6, 7, 8]);
                         productOptions_1 = __values(productOptions), productOptions_1_1 = productOptions_1.next();
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
                         if (!!productOptions_1_1.done) return [3 /*break*/, 5];
                         o = productOptions_1_1.value;
-                        return [4 /*yield*/, this.productService_.retrieveOptionByTitle(o._title, productId)];
+                        return [4 /*yield*/, productServiceTx.retrieveOptionByTitle(o._title, productId)];
                     case 3:
-                        option = _b.sent();
+                        option = _c.sent();
                         o.option_id = option === null || option === void 0 ? void 0 : option.id;
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4:
                         productOptions_1_1 = productOptions_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_14_1 = _b.sent();
-                        e_14 = { error: e_14_1 };
+                        e_15_1 = _c.sent();
+                        e_15 = { error: e_15_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (productOptions_1_1 && !productOptions_1_1.done && (_a = productOptions_1.return)) _a.call(productOptions_1);
+                            if (productOptions_1_1 && !productOptions_1_1.done && (_b = productOptions_1.return)) _b.call(productOptions_1);
                         }
-                        finally { if (e_14) throw e_14.error; }
+                        finally { if (e_15) throw e_15.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -816,7 +870,7 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.fileService_
                                 .withTransaction(transactionManager)
                                 .getUploadStreamDescriptor({
-                                name: "imports/products/ops/".concat(batchJobId, "-").concat(op),
+                                name: ProductImportStrategy.buildFilename(batchJobId, op),
                                 ext: "json",
                             })];
                     case 2:
@@ -854,7 +908,9 @@ var ProductImportStrategy = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.fileService_
                                 .withTransaction(transactionManager)
                                 .getDownloadStream({
-                                fileKey: "imports/products/ops/".concat(batchJobId, "-").concat(op, ".json"),
+                                fileKey: ProductImportStrategy.buildFilename(batchJobId, op, {
+                                    appendExt: ".json",
+                                }),
                             })];
                     case 1:
                         readableStream = _b.sent();
@@ -883,31 +939,51 @@ var ProductImportStrategy = /** @class */ (function (_super) {
     ProductImportStrategy.prototype.deleteOpsFiles = function (batchJobId) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var transactionManager, _b, _c, op;
-            var e_15, _d;
+            var transactionManager, fileServiceTx, _b, _c, op, e_16, e_17_1;
+            var e_17, _d;
             return __generator(this, function (_e) {
-                transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
-                try {
-                    for (_b = __values(Object.keys(types_1.OperationType)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                switch (_e.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        fileServiceTx = this.fileService_.withTransaction(transactionManager);
+                        _e.label = 1;
+                    case 1:
+                        _e.trys.push([1, 8, 9, 10]);
+                        _b = __values(Object.values(types_1.OperationType)), _c = _b.next();
+                        _e.label = 2;
+                    case 2:
+                        if (!!_c.done) return [3 /*break*/, 7];
                         op = _c.value;
+                        _e.label = 3;
+                    case 3:
+                        _e.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, fileServiceTx.delete({
+                                fileKey: ProductImportStrategy.buildFilename(batchJobId, op, {
+                                    appendExt: ".json",
+                                }),
+                            })];
+                    case 4:
+                        _e.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        e_16 = _e.sent();
+                        return [3 /*break*/, 6];
+                    case 6:
+                        _c = _b.next();
+                        return [3 /*break*/, 2];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_17_1 = _e.sent();
+                        e_17 = { error: e_17_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
                         try {
-                            this.fileService_.withTransaction(transactionManager).delete({
-                                fileKey: "imports/products/ops/-".concat(batchJobId, "-").concat(op),
-                            });
+                            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                         }
-                        catch (e) {
-                            // noop
-                        }
-                    }
-                }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
-                    }
-                    finally { if (e_15) throw e_15.error; }
+                        finally { if (e_17) throw e_17.error; }
+                        return [7 /*endfinally*/];
+                    case 10: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };
@@ -915,29 +991,33 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * Update count of processed data in the batch job `result` column
      * and cleanup temp JSON files.
      *
-     * @param batchJobId - An id of the current batch job being processed.
+     * @param batchJob - The current batch job being processed.
      */
-    ProductImportStrategy.prototype.finalize = function (batchJobId) {
+    ProductImportStrategy.prototype.finalize = function (batchJob) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var batchJob, fileKey;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.batchJobService_.retrieve(batchJobId)];
-                    case 1:
-                        batchJob = _a.sent();
-                        delete this.processedCounter[batchJobId];
-                        return [4 /*yield*/, this.batchJobService_.update(batchJobId, {
+            var transactionManager, fileKey;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        delete this.processedCounter[batchJob.id];
+                        return [4 /*yield*/, this.batchJobService_
+                                .withTransaction(transactionManager)
+                                .update(batchJob.id, {
                                 result: { advancement_count: batchJob.result.count },
                             })];
-                    case 2:
-                        _a.sent();
+                    case 1:
+                        _b.sent();
                         fileKey = batchJob.context.fileKey;
-                        return [4 /*yield*/, this.fileService_.delete({ fileKey: fileKey })];
+                        return [4 /*yield*/, this.fileService_
+                                .withTransaction(transactionManager)
+                                .delete({ fileKey: fileKey })];
+                    case 2:
+                        _b.sent();
+                        return [4 /*yield*/, this.deleteOpsFiles(batchJob.id)];
                     case 3:
-                        _a.sent();
-                        return [4 /*yield*/, this.deleteOpsFiles(batchJobId)];
-                    case 4:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -951,28 +1031,36 @@ var ProductImportStrategy = /** @class */ (function (_super) {
      * @param batchJobId - An id of the current batch job being processed.
      */
     ProductImportStrategy.prototype.updateProgress = function (batchJobId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var newCount;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         newCount = (this.processedCounter[batchJobId] || 0) + 1;
                         this.processedCounter[batchJobId] = newCount;
                         if (newCount % BATCH_SIZE !== 0) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, this.batchJobService_.update(batchJobId, {
+                        return [4 /*yield*/, this.batchJobService_
+                                .withTransaction((_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_)
+                                .update(batchJobId, {
                                 result: {
                                     advancement_count: newCount,
                                 },
                             })];
                     case 1:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
+    ProductImportStrategy.buildFilename = function (batchJobId, operation, _a) {
+        var _b = _a === void 0 ? { appendExt: undefined } : _a, appendExt = _b.appendExt;
+        var filename = "imports/products/ops/".concat(batchJobId, "-").concat(operation);
+        return appendExt ? filename + appendExt : filename;
+    };
     ProductImportStrategy.identifier = "product-import-strategy";
     ProductImportStrategy.batchType = "product-import";
     return ProductImportStrategy;
@@ -1004,7 +1092,7 @@ var CSVSchema = {
         { name: "Product Height", mapTo: "product.height" },
         { name: "Product HS Code", mapTo: "product.hs_code" },
         { name: "Product Origin Country", mapTo: "product.origin_country" },
-        { name: "Product Mid Code", mapTo: "product.mid_code" },
+        { name: "Product MID Code", mapTo: "product.mid_code" },
         { name: "Product Material", mapTo: "product.material" },
         // PRODUCT-COLLECTION
         { name: "Product Collection Title", mapTo: "product.collection.title" },
@@ -1042,7 +1130,7 @@ var CSVSchema = {
         { name: "Variant Height", mapTo: "variant.height" },
         { name: "Variant HS Code", mapTo: "variant.hs_code" },
         { name: "Variant Origin Country", mapTo: "variant.origin_country" },
-        { name: "Variant Mid Code", mapTo: "variant.mid_code" },
+        { name: "Variant MID Code", mapTo: "variant.mid_code" },
         { name: "Variant Material", mapTo: "variant.material" },
         // ==== DYNAMIC FIELDS ====
         // PRODUCT_OPTIONS