@optimiser/common 1.0.341 → 1.0.342

package/dist/lib/utility.js

@@ -1505,18 +1505,18 @@ exports.GetObjectByString = GetObjectByString;
 function BuildLookupDataField(fieldSchema, updateObj, db) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var fldValue, fldName, alias, searchAlias, fldLookupData, aggregateArry, project, i, obj, lookupObj, i, i, data, _c, result, _loop_10, j, i, unionDetail, unionPipeline, unionObj, result, i, lookupRecord, j, result, j, result, i, lookupRecord, j, result, i, lookupRecord, alias, error_2, fieldValueType, errMsg;
+        var fldValue, fldName, alias, searchAlias, fldLookupData, aggregateArry, project, i, obj, lookupObj, i, i, data, _c, result, _loop_10, j, i, unionDetail, unionPipeline, unionObj, result, i, lookupRecord, j, result, j, result, i, lookupRecord, j, result, i, lookupRecord, error_2, fieldValueType, errMsg;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     fldValue = null;
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 25, , 26]);
-                    if (!fieldSchema.UIDataType) return [3 /*break*/, 24];
+                    _d.trys.push([1, 23, , 24]);
+                    if (!fieldSchema.UIDataType) return [3 /*break*/, 22];
                     fldName = fieldSchema.Name;
                     fldValue = updateObj[fldName];
-                    if (!constants_1.default.LookupTypeFields.includes(fieldSchema.UIDataType)) return [3 /*break*/, 23];
+                    if (!constants_1.default.LookupTypeFields.includes(fieldSchema.UIDataType)) return [3 /*break*/, 22];
                     alias = fldName + constants_1.default.LookupAlias;
                     searchAlias = fldName + constants_1.default.SearchValueAlias;
                     fldLookupData = null;
@@ -1780,15 +1780,6 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                     _d.label = 22;
                 case 22: return [3 /*break*/, 24];
                 case 23:
-                    if (constants_1.default.QrPendingFields === fieldSchema.UIDataType) {
-                        alias = fldName + constants_1.default.QrPendingAlias;
-                        if (fldValue) {
-                            updateObj[alias] = true;
-                        }
-                    }
-                    _d.label = 24;
-                case 24: return [3 /*break*/, 26];
-                case 25:
                     error_2 = _d.sent();
                     fieldValueType = (Array.isArray(fldValue) ? 'array' : '');
                     if (!fieldValueType) {
@@ -1796,8 +1787,8 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                     }
                     errMsg = "Error Info: Error in Function BuildLookupDataField in Common Module for Company - " + (db.databaseName) + ", ObjectName - " + (fieldSchema.LookupObject || '') + ", FieldName - " + (fieldSchema.Name || '') + " for value - " + fldValue + " and data type of values is " + (fieldValueType || '') + " ";
                     console.error(errMsg, '\n', error_2);
-                    return [3 /*break*/, 26];
-                case 26: return [2 /*return*/];
+                    return [3 /*break*/, 24];
+                case 24: return [2 /*return*/];
             }
         });
     });
@@ -1816,16 +1807,22 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                             switch (_a.label) {
                                 case 0:
                                     fieldSchema = objectSchema.Fields.find(function (x) { return x.Name == fldName; });
-                                    if (!fieldSchema) return [3 /*break*/, 5];
+                                    if (!fieldSchema) return [3 /*break*/, 7];
                                     if (!constants_1.default.LookupTypeFields.includes(fieldSchema.UIDataType)) return [3 /*break*/, 2];
                                     return [4 /*yield*/, BuildLookupDataField(fieldSchema, updateObj, db)];
                                 case 1:
                                     _a.sent();
-                                    return [3 /*break*/, 5];
+                                    return [3 /*break*/, 7];
                                 case 2:
-                                    if (!(fieldSchema.UIDataType == 'autoincrement')) return [3 /*break*/, 4];
-                                    return [4 /*yield*/, db.collection('AutoIncrement').findOneAndUpdate({ _id: fieldSchema.AutoIncrementID }, { $inc: { SequenceValue: 1 } })];
+                                    if (!(constants_1.default.QrPendingFields === fieldSchema.UIDataType)) return [3 /*break*/, 4];
+                                    return [4 /*yield*/, BuildQRDataField(fieldSchema, updateObj, db)];
                                 case 3:
+                                    _a.sent();
+                                    return [3 /*break*/, 7];
+                                case 4:
+                                    if (!(fieldSchema.UIDataType == 'autoincrement')) return [3 /*break*/, 6];
+                                    return [4 /*yield*/, db.collection('AutoIncrement').findOneAndUpdate({ _id: fieldSchema.AutoIncrementID }, { $inc: { SequenceValue: 1 } })];
+                                case 5:
                                     sequenceDocument = _a.sent();
                                     val = "";
                                     for (j = 0; j < sequenceDocument.value.Formats.length; j++) {
@@ -1842,12 +1839,12 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                                         }
                                     }
                                     updateObj[fldName] = val;
-                                    return [3 /*break*/, 5];
-                                case 4:
+                                    return [3 /*break*/, 7];
+                                case 6:
                                     if (fieldSchema.UIDataType == 'formula')
                                         delete updateObj[fldName];
-                                    _a.label = 5;
-                                case 5: return [2 /*return*/];
+                                    _a.label = 7;
+                                case 7: return [2 /*return*/];
                             }
                         });
                     };
@@ -5409,16 +5406,29 @@ function GetEncryptedURL(options) {
         var recordIdStr = record.toString();
         var url = cryptoService.encrypt(secretKey, companyId + "-" + recordIdStr).cipherText;
         var apiEncryptedURL = "" + prefixUrl + apiUrl + url;
+        var qrFieldWithAlias = fieldName + "_" + constants_1.default.QrPendingAlias;
         bulkOps.push({
             updateMany: {
                 filter: (_a = {},
                     _a[fieldName] = { $exists: false },
                     _a[filterKey] = record,
                     _a),
-                update: { $set: (_b = {}, _b[fieldName] = apiEncryptedURL, _b) }
+                update: { $set: (_b = {}, _b[fieldName] = apiEncryptedURL, _b[qrFieldWithAlias] = false, _b) }
             }
         });
     });
     return bulkOps;
 }
 exports.GetEncryptedURL = GetEncryptedURL;
+function BuildQRDataField(fieldSchema, updateObj, db) {
+    if (constants_1.default.QrPendingFields === fieldSchema.UIDataType) {
+        var fldValue = null;
+        var fldName = fieldSchema.Name;
+        fldValue = updateObj[fldName];
+        var alias = fldName + constants_1.default.QrPendingAlias;
+        if (fldValue) {
+            updateObj[alias] = true;
+        }
+    }
+    return updateObj;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.341",
+  "version": "1.0.342",
   "description": "",
   "main": "dist/index.js",
   "scripts": {