@optimiser/common 1.0.332 → 1.0.334

package/dist/lib/utility.js

@@ -491,7 +491,32 @@ function GetFieldDetail(objectName, fieldName, db, callback, next) {
             callback(data.Fields[0]);
         }
         else {
-            callback([]);
+            //if field not found then check in collection field
+            db.collection('ObjectSchema').findOne({ 'Name': objectName, "Fields.UIDataType": "collection", "Fields.Fields.Name": fieldName }, { projection: { _id: 0, Fields: 1 } }, function (err, data) {
+                if (err) {
+                    next(err);
+                }
+                else if (data && data.Fields && data.Fields.length) {
+                    var field = undefined;
+                    var collectionFields = data.Fields.filter(function (x) { return x.UIDataType == "collection"; });
+                    if (collectionFields) {
+                        for (var i = 0; i < collectionFields.length; i++) {
+                            var colField = collectionFields[0];
+                            if (colField.Fields) {
+                                field = colField.Fields.find(function (x) { return x.Name == fieldName; });
+                                break;
+                            }
+                        }
+                    }
+                    if (field)
+                        callback(field);
+                    else
+                        callback({});
+                }
+                else {
+                    callback({});
+                }
+            });
         }
     });
 }
@@ -3746,73 +3771,101 @@ function UpdateTagCount(tagids, objectName, db, params) {
 }
 function SyncUserLicenceConsumedCount(msp_d, db, dbMaster) {
     return __awaiter(this, void 0, void 0, function () {
-        var companySetting, companyLicencesData_1, i, companyLicenceType, j, err_1;
+        var companySetting, companyLicencesData, i, companyLicenceType, j, userLicenceData, u, licenceType, licenceName, licenceTotal, i, companyLicenceType, j, comLicenceInUserLicence, bulkLicenceOps, u, licenceID, licenceTotal, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
+                    _a.trys.push([0, 8, , 9]);
                     return [4 /*yield*/, dbMaster.collection("Company").findOne({ _id: new mongodb_1.ObjectId(msp_d.ci), 'IsActive': true }, { projection: { "Setting.Licences": 1 } })];
                 case 1:
                     companySetting = _a.sent();
-                    if (companySetting && companySetting.Setting) {
-                        companyLicencesData_1 = (companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
-                        if (isEmptyObj(companyLicencesData_1) == false) {
-                            for (i in companyLicencesData_1) {
-                                /*Added by Chetan on 07-Mar-2022, Not necessary for Domain Licence*/
-                                if (i != "Domain") {
-                                    companyLicenceType = companyLicencesData_1[i];
+                    if (!(companySetting && companySetting.Setting)) return [3 /*break*/, 6];
+                    companyLicencesData = (companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
+                    if (!(isEmptyObj(companyLicencesData) == false)) return [3 /*break*/, 4];
+                    for (i in companyLicencesData) {
+                        /*Added by Chetan on 07-Mar-2022, Not necessary for Domain Licence*/
+                        if (i != "Domain") {
+                            companyLicenceType = companyLicencesData[i];
+                            for (j in companyLicenceType) {
+                                companyLicenceType[j].NoOfLicenceConsumed = 0;
+                            }
+                        }
+                    }
+                    return [4 /*yield*/, db.collection('UserLicence').aggregate([
+                            { $match: { Status: 'active', IsActive: true } },
+                            { $group: { _id: { "LicenceType": "$LicenceType", "LicenceName": "$LicenceName" }, Total: { $sum: 1 } } }
+                        ]).toArray()];
+                case 2:
+                    userLicenceData = _a.sent();
+                    if (userLicenceData) {
+                        for (u = 0; u < userLicenceData.length; u++) {
+                            licenceType = userLicenceData[u]._id['LicenceType'];
+                            licenceName = userLicenceData[u]._id['LicenceName'];
+                            licenceTotal = userLicenceData[u].Total;
+                            for (i in companyLicencesData) {
+                                if (i == licenceType) {
+                                    companyLicenceType = companyLicencesData[i];
                                     for (j in companyLicenceType) {
-                                        companyLicenceType[j].NoOfLicenceConsumed = 0;
+                                        if (j == licenceName) {
+                                            companyLicenceType[j].NoOfLicenceConsumed = licenceTotal;
+                                        }
                                     }
                                 }
                             }
-                            db.collection('UserLicence').aggregate([
-                                { $match: { Status: 'active', IsActive: true } },
-                                { $group: { _id: { "LicenceType": "$LicenceType", "LicenceName": "$LicenceName" }, Total: { $sum: 1 } } }
-                            ]).toArray(function (errUserAggregate, userLicenceData) {
-                                if (errUserAggregate) {
-                                    console.log(errUserAggregate, 'In company (' + msp_d.ci + '), Error occurred while syncing user licence consumed count.');
-                                }
-                                else if (userLicenceData) {
-                                    for (var u = 0; u < userLicenceData.length; u++) {
-                                        var licenceType = userLicenceData[u]._id['LicenceType'];
-                                        var licenceName = userLicenceData[u]._id['LicenceName'];
-                                        var licenceTotal = userLicenceData[u].Total;
-                                        for (var i in companyLicencesData_1) {
-                                            if (i == licenceType) {
-                                                var companyLicenceType = companyLicencesData_1[i];
-                                                for (var j in companyLicenceType) {
-                                                    if (j == licenceName) {
-                                                        companyLicenceType[j].NoOfLicenceConsumed = licenceTotal;
-                                                    }
-                                                }
-                                            }
-                                        }
+                        }
+                        dbMaster.collection('Company').updateOne({ _id: new mongodb_1.ObjectId(msp_d.ci), 'IsActive': true }, {
+                            $set: {
+                                "Setting.Licences": companyLicencesData
+                            }
+                        });
+                    }
+                    else {
+                        console.log('In company (' + msp_d.ci + '), User Licence data not found while syncing user licence consumed count.');
+                    }
+                    return [4 /*yield*/, db.collection('UserLicence').aggregate([
+                            { $match: { Status: 'active', IsActive: true } },
+                            { $group: { _id: { "CompanyLicenceID": "$CompanyLicenceID" }, Total: { $sum: 1 } } }
+                        ]).toArray()];
+                case 3:
+                    comLicenceInUserLicence = _a.sent();
+                    if (comLicenceInUserLicence && comLicenceInUserLicence.length) {
+                        bulkLicenceOps = [];
+                        for (u = 0; u < comLicenceInUserLicence.length; u++) {
+                            licenceID = comLicenceInUserLicence[u]._id['CompanyLicenceID'];
+                            licenceTotal = comLicenceInUserLicence[u].Total;
+                            if (licenceID) {
+                                bulkLicenceOps.push({
+                                    updateOne: {
+                                        filter: { '_id': licenceID },
+                                        update: [
+                                            { $set: { 'NoOfLicenceConsumed': licenceTotal } },
+                                            { $set: { 'NoOfRemainingLicence': { $subtract: ["$NoOfLicence", "$NoOfLicenceConsumed"] } } }
+                                        ]
                                     }
-                                    dbMaster.collection('Company').updateOne({ _id: new mongodb_1.ObjectId(msp_d.ci), 'IsActive': true }, {
-                                        $set: {
-                                            "Setting.Licences": companyLicencesData_1
-                                        }
-                                    });
-                                }
-                                else {
-                                    console.log('In company (' + msp_d.ci + '), User Licence data not found while syncing user licence consumed count.');
-                                }
-                            });
+                                });
+                            }
                         }
-                        else {
-                            console.log('Licence data not found in company (' + msp_d.ci + ') setting while syncing user licence consumed count.');
+                        if (bulkLicenceOps.length) {
+                            dbMaster.collection('CompanyLicence').bulkWrite(bulkLicenceOps);
                         }
                     }
                     else {
-                        console.log('Company (' + msp_d.ci + ') data not found while syncing user licence consumed count.');
+                        console.log('In company (' + msp_d.ci + '), copmany licence data not found in user licence while syncing user licence consumed count.');
                     }
-                    return [3 /*break*/, 3];
-                case 2:
+                    return [3 /*break*/, 5];
+                case 4:
+                    console.log('Licence data not found in company (' + msp_d.ci + ') setting while syncing user licence consumed count.');
+                    _a.label = 5;
+                case 5: return [3 /*break*/, 7];
+                case 6:
+                    console.log('Company (' + msp_d.ci + ') data not found while syncing user licence consumed count.');
+                    _a.label = 7;
+                case 7: return [3 /*break*/, 9];
+                case 8:
                     err_1 = _a.sent();
-                    console.log(err_1, 'Error occurred while syncing user licence consumed count.');
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
+                    console.log('Error occurred while syncing user licence consumed count.', err_1);
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     });
@@ -3917,95 +3970,92 @@ exports.CheckDataPermission = CheckDataPermission;
  */
 function SyncCompanyLicenceInMasterCompanyAfterAdd(fieldsObj, dbMaster) {
     return __awaiter(this, void 0, void 0, function () {
-        var companyId_1, companySetting, companyLicencesData_2, setQuery_1, i, companyLicenceType, j, err_2;
+        var companyId, companySetting, companyLicencesData, setQuery, i, companyLicenceType, j, companyLicences, totalNoOfFeatureLicence, totalNoOfAppLicence, totalNoOfDomainLicence, c, licenceType, licenceName, companyLicenceTotal, i, companyLicenceType, j, err_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    companyId_1 = fieldsObj.CompanyID;
-                    return [4 /*yield*/, dbMaster.collection("Company").findOne({ _id: companyId_1, 'IsActive': true }, { projection: { "Setting": 1 } })];
+                    _a.trys.push([0, 5, , 6]);
+                    companyId = fieldsObj.CompanyID;
+                    return [4 /*yield*/, dbMaster.collection("Company").findOne({ _id: companyId, 'IsActive': true }, { projection: { "Setting": 1 } })];
                 case 1:
                     companySetting = _a.sent();
-                    if (companySetting) {
-                        companyLicencesData_2 = (companySetting.Setting && companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
-                        setQuery_1 = { 'Setting': (companySetting.Setting) ? companySetting.Setting : {} };
-                        if (companyLicencesData_2[fieldsObj.LicenceType] == undefined) {
-                            companyLicencesData_2[fieldsObj.LicenceType] = {};
-                        }
-                        if (Object.keys(companyLicencesData_2[fieldsObj.LicenceType]).includes(fieldsObj.LicenceName) == false) {
-                            companyLicencesData_2[fieldsObj.LicenceType][fieldsObj.LicenceName] = {
-                                "NoOfLicence": fieldsObj.NoOfLicence,
-                                "NoOfLicenceConsumed": 0
-                            };
-                        }
-                        for (i in companyLicencesData_2) {
-                            companyLicenceType = companyLicencesData_2[i];
-                            for (j in companyLicenceType) {
-                                companyLicenceType[j].NoOfLicence = 0;
-                            }
+                    if (!companySetting) return [3 /*break*/, 3];
+                    companyLicencesData = (companySetting.Setting && companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
+                    setQuery = { 'Setting': (companySetting.Setting) ? companySetting.Setting : {} };
+                    if (companyLicencesData[fieldsObj.LicenceType] == undefined) {
+                        companyLicencesData[fieldsObj.LicenceType] = {};
+                    }
+                    if (Object.keys(companyLicencesData[fieldsObj.LicenceType]).includes(fieldsObj.LicenceName) == false) {
+                        companyLicencesData[fieldsObj.LicenceType][fieldsObj.LicenceName] = {
+                            "NoOfLicence": fieldsObj.NoOfLicence,
+                            "NoOfLicenceConsumed": 0
+                        };
+                    }
+                    for (i in companyLicencesData) {
+                        companyLicenceType = companyLicencesData[i];
+                        for (j in companyLicenceType) {
+                            companyLicenceType[j].NoOfLicence = 0;
                         }
-                        dbMaster.collection('CompanyLicence').aggregate([
-                            { $match: { CompanyID: companyId_1, Status: 'active', IsActive: true } },
+                    }
+                    return [4 /*yield*/, dbMaster.collection('CompanyLicence').aggregate([
+                            { $match: { CompanyID: companyId, Status: 'active', IsActive: true } },
                             { $group: { _id: { "LicenceType": "$LicenceType", "LicenceName": "$LicenceName" }, Total: { $sum: "$NoOfLicence" } } }
-                        ]).toArray(function (errUserAggregate, companyLicences) {
-                            if (errUserAggregate) {
-                                console.log(errUserAggregate, 'In company (' + companyId_1.toString() + '), Error occurred while syncing user licence consumed count.');
+                        ]).toArray()];
+                case 2:
+                    companyLicences = _a.sent();
+                    if (companyLicences) {
+                        setQuery['TotalStandardLicence'] = 0;
+                        setQuery['TotalEnterpriseLicence'] = 0;
+                        totalNoOfFeatureLicence = 0;
+                        totalNoOfAppLicence = 0;
+                        totalNoOfDomainLicence = 0;
+                        for (c = 0; c < companyLicences.length; c++) {
+                            licenceType = companyLicences[c]._id['LicenceType'];
+                            licenceName = companyLicences[c]._id['LicenceName'];
+                            companyLicenceTotal = companyLicences[c].Total;
+                            if (licenceType == 'Master') {
+                                setQuery['Total' + licenceName + 'Licence'] = parseInt(companyLicenceTotal);
                             }
-                            else if (companyLicences) {
-                                setQuery_1['TotalStandardLicence'] = 0;
-                                setQuery_1['TotalEnterpriseLicence'] = 0;
-                                var totalNoOfFeatureLicence = 0;
-                                var totalNoOfAppLicence = 0;
-                                //Added by Chetan on 22Feb2022, for domain licence
-                                var totalNoOfDomainLicence = 0;
-                                for (var c = 0; c < companyLicences.length; c++) {
-                                    var licenceType = companyLicences[c]._id['LicenceType'];
-                                    var licenceName = companyLicences[c]._id['LicenceName'];
-                                    var companyLicenceTotal = companyLicences[c].Total;
-                                    if (licenceType == 'Master') {
-                                        setQuery_1['Total' + licenceName + 'Licence'] = parseInt(companyLicenceTotal);
-                                    }
-                                    else if (licenceType == 'Feature') {
-                                        totalNoOfFeatureLicence += parseInt(companyLicenceTotal);
-                                    }
-                                    else if (licenceType == 'App') {
-                                        totalNoOfAppLicence += parseInt(companyLicenceTotal);
-                                    }
-                                    else if (licenceType == 'Domain') {
-                                        totalNoOfDomainLicence += parseInt(companyLicenceTotal); /*Added by Chetan on 22Feb2022, for domain licence*/
-                                    }
-                                    for (var i in companyLicencesData_2) {
-                                        if (i == licenceType) {
-                                            var companyLicenceType = companyLicencesData_2[i];
-                                            for (var j in companyLicenceType) {
-                                                if (j == licenceName) {
-                                                    companyLicenceType[j].NoOfLicence = parseInt(companyLicenceTotal);
-                                                }
-                                            }
+                            else if (licenceType == 'Feature') {
+                                totalNoOfFeatureLicence += parseInt(companyLicenceTotal);
+                            }
+                            else if (licenceType == 'App') {
+                                totalNoOfAppLicence += parseInt(companyLicenceTotal);
+                            }
+                            else if (licenceType == 'Domain') {
+                                totalNoOfDomainLicence += parseInt(companyLicenceTotal); /*Added by Chetan on 22Feb2022, for domain licence*/
+                            }
+                            for (i in companyLicencesData) {
+                                if (i == licenceType) {
+                                    companyLicenceType = companyLicencesData[i];
+                                    for (j in companyLicenceType) {
+                                        if (j == licenceName) {
+                                            companyLicenceType[j].NoOfLicence = parseInt(companyLicenceTotal);
                                         }
                                     }
                                 }
-                                setQuery_1['TotalFeatureLicence'] = totalNoOfFeatureLicence;
-                                setQuery_1['TotalAppLicence'] = totalNoOfAppLicence;
-                                //Added by Chetan on 22Feb2022, for domain licence
-                                setQuery_1['TotalDomainLicence'] = totalNoOfDomainLicence;
-                                setQuery_1.Setting["Licences"] = companyLicencesData_2;
-                                dbMaster.collection('Company').updateOne({ _id: companyId_1, 'IsActive': true }, { $set: setQuery_1 });
-                            }
-                            else {
-                                console.log('In company (' + companyId_1.toString() + '), Company Licence data not found while syncing company licence total count in Master Company.');
                             }
-                        });
+                        }
+                        setQuery['TotalFeatureLicence'] = totalNoOfFeatureLicence;
+                        setQuery['TotalAppLicence'] = totalNoOfAppLicence;
+                        //Added by Chetan on 22Feb2022, for domain licence
+                        setQuery['TotalDomainLicence'] = totalNoOfDomainLicence;
+                        setQuery.Setting["Licences"] = companyLicencesData;
+                        dbMaster.collection('Company').updateOne({ _id: companyId, 'IsActive': true }, { $set: setQuery });
                     }
                     else {
-                        console.log('In company (' + companyId_1.toString() + '), Company data not found while syncing company licence total count in Master Company.');
+                        console.log('In company (' + companyId.toString() + '), Company Licence data not found while syncing company licence total count in Master Company.');
                     }
-                    return [3 /*break*/, 3];
-                case 2:
+                    return [3 /*break*/, 4];
+                case 3:
+                    console.log('In company (' + companyId.toString() + '), Company data not found while syncing company licence total count in Master Company.');
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 6];
+                case 5:
                     err_2 = _a.sent();
                     console.log(err_2, 'Error occurred while syncing company licence total count in Master Company.');
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
+                    return [3 /*break*/, 6];
+                case 6: return [2 /*return*/];
             }
         });
     });
@@ -4571,7 +4621,7 @@ function IsAnotherObjectField(pageData, fieldName) {
 function ValidateUserInput(options) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var inputFields, fieldsJsonData, pageData, documentID, db, fiscalSettingData, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _d, pageFields_1, pageField, state_2, countryData, err_3;
+        var inputFields, fieldsJsonData, pageData, documentID, db, mdb, fiscalSettingData, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _d, pageFields_1, pageField, state_2, countryData, err_3;
         return __generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -4581,6 +4631,7 @@ function ValidateUserInput(options) {
                     pageData = options.pageData;
                     documentID = options.objectID;
                     db = options.db;
+                    mdb = options.mdb;
                     return [4 /*yield*/, db.collection('Company').findOne({ IsActive: true }, { projection: { "Setting.FiscalFrom": 1, "Setting.FiscalMonth": 1, "Setting.DateFormat": 1 } })];
                 case 1:
                     fiscalSettingData = _e.sent();
@@ -4614,7 +4665,7 @@ function ValidateUserInput(options) {
                         }
                     }
                     _loop_19 = function (pageField) {
-                        var fieldName, fieldData, field, searchQuery, result, fld, _a, minValue, maxValue, filter, searchObj, result, searchObj, totalRecord, _b, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _i, fieldData_1, obj, searchObj, totalRecord, searchObj, result, _c, fieldData_2, obj;
+                        var fieldName, fieldData, field, searchQuery, result, fld, _a, minValue, maxValue, filter, searchObj, dbConnection, result, searchObj, totalRecord, _b, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _i, fieldData_1, obj, searchObj, totalRecord, searchObj, result, _c, fieldData_2, obj;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -4777,7 +4828,8 @@ function ValidateUserInput(options) {
                                         searchObj.IsActive = true;
                                     }
                                     ;
-                                    return [4 /*yield*/, db.collection(field.LookupObject).findOne(searchObj)];
+                                    dbConnection = (field.UseMasterDatabase && mdb) ? mdb : db;
+                                    return [4 /*yield*/, dbConnection.collection(field.LookupObject).findOne(searchObj)];
                                 case 10:
                                     result = _d.sent();
                                     if (result == null) {

package/package.json

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