kui-crm_actions 0.0.62 → 0.0.63

package/cjs/index.js

@@ -189,27 +189,27 @@ var inspectionsRequestBody = {
             }); }),
         };
     },
-    getPostBodyRegularInspection: function (inspection, roomsImages, metersImages) {
+    getPostBodyRegularInspection: function (inspection, roomsImages) {
         return {
             date: luxon.DateTime.now().toISODate(),
             inspection_type: "regular",
             based_on: null,
             dropbox_link: inspection.dropboxLink,
             photo_groups: roomsImages,
-            regular: this.getPartialInspectionMeters(inspection.meters, metersImages),
+            regular: this.getPartialInspectionMeters(inspection.meters),
         };
     },
-    getPostBodyTransferInspection: function (inspection, roomsImages, metersImages) {
+    getPostBodyTransferInspection: function (inspection, roomsImages) {
         return {
             date: luxon.DateTime.now().toISODate(),
             inspection_type: "transfer",
             based_on: null,
             dropbox_link: inspection.dropboxLink,
             photo_groups: roomsImages,
-            transfer: __assign({ transfer_type: inspection.transferType }, this.getPartialInspectionMeters(inspection.meters, metersImages)),
+            transfer: __assign({ transfer_type: inspection.transferType }, this.getPartialInspectionMeters(inspection.meters)),
         };
     },
-    getPartialInspectionMeters: function (meters, metersImages) {
+    getPartialInspectionMeters: function (meters) {
         var _this = this;
         return {
             meters: meters.map(function (meter, index) { return ({
@@ -217,12 +217,13 @@ var inspectionsRequestBody = {
                 resource_type: meter.resource,
                 meter_type: meter.type,
                 passport_number: meter.number,
-                photos: metersImages[index],
+                photos: _this.getFilesParams(meter.images),
                 values: kuiUtils.clearNotValidFields(_this.getInspectionMeterValues(meter)),
             }); }),
         };
     },
-    getPostBodyInventoryInspection: function (inspection, roomsImages, fillingFiles, metersFiles, metersImages, fillingImages) {
+    getPostBodyInventoryInspection: function (inspection, roomsImages, fillingFiles, metersFiles) {
+        var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return {
             date: luxon.DateTime.now().toISODate(),
@@ -247,16 +248,16 @@ var inspectionsRequestBody = {
                         description: filling.name,
                         serial_code: filling.serialNumber,
                         amount: filling.numberOfSubjects,
-                        photos: fillingImages[index],
+                        photos: _this.getFilesParams(filling.images),
                         instruction: fillingFiles[index],
                     });
-                }) }, this.getInventoryInspectionMeters(inspection.meters, metersFiles, metersImages)),
+                }) }, this.getInventoryInspectionMeters(inspection.meters, metersFiles)),
         };
     },
-    getInventoryInspectionMeters: function (meters, metersFiles, metersImages) {
+    getInventoryInspectionMeters: function (meters, metersFiles) {
         var _this = this;
         return {
-            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: kuiUtils.clearNotValidFields(_this.getInspectionMeterValues(meter, "initialValue")), photos: metersImages[index], no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
+            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: kuiUtils.clearNotValidFields(_this.getInspectionMeterValues(meter, "initialValue")), photos: _this.getFilesParams(meter.images), no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
         };
     },
     getInspectionMeterValues: function (meter, fieldName) {
@@ -299,6 +300,11 @@ var inspectionsRequestBody = {
             last_value: lastValue,
         });
     },
+    getFilesParams: function (files) {
+        return files
+            .map(function (file) { return file.uploadedData; })
+            .filter(function (data) { return data; });
+    },
 };
 
 var inspectionsRequests = {
@@ -317,138 +323,79 @@ var inspectionsRequests = {
             });
         });
     },
-    loadInspectionImages: function (loader, roomsImages) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var promises, images, bedroomCount, roomIndex, bedroomIndex;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        promises = [];
-                        roomsImages.forEach(function (room) {
-                            promises.push(kuiCrm.uploadImages(loader, room.files));
-                        });
-                        return [4 /*yield*/, kuiUtils.callPromises(promises)];
-                    case 1:
-                        images = _b.sent();
-                        bedroomCount = (_a = roomsImages.filter(function (imagesGroup) { return imagesGroup.type === "bedroom"; })) === null || _a === void 0 ? void 0 : _a.length;
-                        roomIndex = bedroomCount || 0;
-                        bedroomIndex = 0;
-                        return [2 /*return*/, roomsImages.map(function (room, index) {
-                                if (room.type === "room") {
-                                    return __assign(__assign({}, _this.getRoomParams(room, images[index])), { 
-                                        // eslint-disable-next-line no-plusplus
-                                        room_order_number: roomIndex++ });
-                                }
-                                if (room.type === "bedroom") {
-                                    return __assign(__assign({}, _this.getRoomParams(room, images[index])), { 
-                                        // eslint-disable-next-line no-plusplus
-                                        room_order_number: bedroomIndex++ });
-                                }
-                                return _this.getRoomParams(room, images[index]);
-                            })];
-                }
-            });
-        });
-    },
     createInitialInspection: function (data, apartmentId, loader) {
         return __awaiter(this, void 0, void 0, function () {
             var roomsImages, body;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        return [4 /*yield*/, this.loadInspectionImages(loader, data.roomsImages)];
-                    case 1:
-                        roomsImages = _a.sent();
-                        body = inspectionsRequestBody.getPostBodyInitialInspection(data, roomsImages);
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyInitialInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createRegularInspection: function (data, apartmentId, loader) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var metersImages, files, body;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        metersImages = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return kuiCrm.uploadImages(loader, meter.images); })) || [];
-                        return [4 /*yield*/, kuiUtils.callPromises(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages)
-                            ], metersImages, true))];
-                    case 1:
-                        files = _b.sent();
-                        body = inspectionsRequestBody.getPostBodyRegularInspection(data, files[0], files.slice(1));
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+            var roomsImages, body;
+            return __generator(this, function (_a) {
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyRegularInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createTransferInspection: function (data, apartmentId, loader) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var metersImages, files, body;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!apartmentId) return [3 /*break*/, 2];
-                        loader.startLoading("inspection creation");
-                        metersImages = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return kuiCrm.uploadImages(loader, meter.images); })) || [];
-                        return [4 /*yield*/, kuiUtils.callPromises(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages)
-                            ], metersImages, true))];
-                    case 1:
-                        files = _b.sent();
-                        body = inspectionsRequestBody.getPostBodyTransferInspection(data, files[0], files.slice(1));
-                        return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
-                    case 2: return [2 /*return*/, null];
+            var roomsImages, body;
+            return __generator(this, function (_a) {
+                if (apartmentId) {
+                    loader.startLoading("inspection creation");
+                    roomsImages = this.getRoomParams(data.roomsImages);
+                    body = inspectionsRequestBody.getPostBodyTransferInspection(data, roomsImages);
+                    return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                 }
+                return [2 /*return*/, null];
             });
         });
     },
     createInventoryInspection: function (data, apartmentId, loader) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var fillingFiles, metersFiles, metersImages, fillingImages, files, body;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var fillingFiles, metersFiles, files, roomsImages, body;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!apartmentId) return [3 /*break*/, 2];
                         loader.startLoading("inspection creation");
                         fillingFiles = data.fillingList.map(function (filling) { return filling.instruction; });
                         metersFiles = ((_a = data.meters) === null || _a === void 0 ? void 0 : _a.map(function (meter) { return meter.passportFile; })) || [];
-                        metersImages = ((_b = data.meters) === null || _b === void 0 ? void 0 : _b.map(function (meter) { return kuiCrm.uploadImages(loader, meter.images); })) || [];
-                        fillingImages = data.fillingList.map(function (filling) {
-                            return kuiCrm.uploadImages(loader, filling.images);
-                        });
-                        return [4 /*yield*/, kuiUtils.callPromises(__spreadArray(__spreadArray([
-                                this.loadInspectionImages(loader, data.roomsImages),
+                        return [4 /*yield*/, kuiUtils.callPromises([
                                 kuiCrm.uploadFiles(loader, fillingFiles),
-                                kuiCrm.uploadFiles(loader, metersFiles)
-                            ], metersImages, true), fillingImages, true))];
+                                kuiCrm.uploadFiles(loader, metersFiles),
+                            ])];
                     case 1:
-                        files = _c.sent();
-                        body = inspectionsRequestBody.getPostBodyInventoryInspection(data, files[0], files[1], files[2], files.slice(3, metersImages.length + 3), files.slice(metersImages.length + 3));
+                        files = _b.sent();
+                        roomsImages = this.getRoomParams(data.roomsImages);
+                        body = inspectionsRequestBody.getPostBodyInventoryInspection(data, roomsImages, files[0], files[1]);
                         return [2 /*return*/, this.createInspection(apartmentId, body, loader)];
                     case 2: return [2 /*return*/, null];
                 }
             });
         });
     },
-    getRoomParams: function (room, photos) {
-        return {
+    getRoomParams: function (rooms) {
+        return rooms.map(function (room) { return ({
             purpose: room.type,
             comment: room.comment,
-            photos: photos || [],
-        };
+            photos: inspectionsRequestBody.getFilesParams(room.files),
+        }); });
     },
 };