@optimiser/common 1.0.434 → 1.0.435

package/dist/lib/utility.js

@@ -3973,35 +3973,51 @@ function UpdateTagCount(tagids, objectName, db, params) {
 }
 function SyncUserLicenceConsumedCount(msp_d, db, dbMaster) {
     return __awaiter(this, void 0, void 0, function () {
-        var companySetting, companyLicencesData, i, companyLicenceType, j, userLicenceData, u, licenceType, licenceName, licenceTotal, i, companyLicenceType, j, comLicenceInUserLicence, bulkLicenceOps, u, licenceID, licenceTotal, err_1;
+        var companySetting, companyLicencesData, companyLevelLicences, _loop_17, i, 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, 8, , 9]);
+                    _a.trys.push([0, 9, , 10]);
                     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)) return [3 /*break*/, 6];
+                    if (!(companySetting && companySetting.Setting)) return [3 /*break*/, 7];
                     companyLicencesData = (companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
-                    if (!(isEmptyObj(companyLicencesData) == false)) return [3 /*break*/, 4];
-                    for (i in companyLicencesData) {
+                    if (!(isEmptyObj(companyLicencesData) == false)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, dbMaster.collection("Licences").find({ IsCompanyLevelLicence: true, "Status": "active", IsActive: true }).toArray()];
+                case 2:
+                    companyLevelLicences = _a.sent();
+                    _loop_17 = function (i) {
                         /*Added by Chetan on 07-Mar-2022, Not necessary for Domain Licence*/
                         if (i != "Domain") {
-                            companyLicenceType = companyLicencesData[i];
-                            for (j in companyLicenceType) {
-                                /*Added by Ashish to stop resetting App.Reception.NoOfLicenceConsumed to "0" QPC-7011 */
-                                if (i == "App" && j == 'Reception') {
-                                    continue;
+                            var companyLicenceType = companyLicencesData[i];
+                            var _loop_18 = function (j) {
+                                //Commented by SurajWasan on 27-May-2025, for story QPC-10970, now this will handle by IsCompanyLevelLicence property, its consumed count will be handle by its own module.
+                                // /*Added by Ashish to stop resetting App.Reception.NoOfLicenceConsumed to "0" QPC-7011 */
+                                // if (i == "App" && j == 'Reception') {
+                                //     continue;
+                                // }
+                                //End
+                                if (companyLevelLicences && companyLevelLicences.length) {
+                                    if (companyLevelLicences.some(function (x) { x.LicenceType == i && x.LicenceName == j; })) {
+                                        return "continue";
+                                    }
                                 }
                                 companyLicenceType[j].NoOfLicenceConsumed = 0;
+                            };
+                            for (var j in companyLicenceType) {
+                                _loop_18(j);
                             }
                         }
+                    };
+                    for (i in companyLicencesData) {
+                        _loop_17(i);
                     }
                     return [4 /*yield*/, db.collection('UserLicence').aggregate([
                             { $match: { Status: 'active', IsActive: true } },
                             { $group: { _id: { "LicenceType": "$LicenceType", "LicenceName": "$LicenceName" }, Total: { $sum: 1 } } }
                         ]).toArray()];
-                case 2:
+                case 3:
                     userLicenceData = _a.sent();
                     if (userLicenceData) {
                         for (u = 0; u < userLicenceData.length; u++) {
@@ -4032,7 +4048,7 @@ function SyncUserLicenceConsumedCount(msp_d, db, dbMaster) {
                             { $match: { Status: 'active', IsActive: true } },
                             { $group: { _id: { "CompanyLicenceID": "$CompanyLicenceID" }, Total: { $sum: 1 } } }
                         ]).toArray()];
-                case 3:
+                case 4:
                     comLicenceInUserLicence = _a.sent();
                     if (comLicenceInUserLicence && comLicenceInUserLicence.length) {
                         bulkLicenceOps = [{
@@ -4064,20 +4080,20 @@ function SyncUserLicenceConsumedCount(msp_d, db, dbMaster) {
                     else {
                         console.log('In company (' + msp_d.ci + '), copmany licence data not found in user licence while syncing user licence consumed count.');
                     }
-                    return [3 /*break*/, 5];
-                case 4:
+                    return [3 /*break*/, 6];
+                case 5:
                     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:
+                    _a.label = 6;
+                case 6: return [3 /*break*/, 8];
+                case 7:
                     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:
+                    _a.label = 8;
+                case 8: return [3 /*break*/, 10];
+                case 9:
                     err_1 = _a.sent();
                     console.log('Error occurred while syncing user licence consumed count.', err_1);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3 /*break*/, 10];
+                case 10: return [2 /*return*/];
             }
         });
     });
@@ -4439,11 +4455,11 @@ exports.GetDayIndex = GetDayIndex;
 function GetUserProfile(msp_d, db, mdb, next) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var userData, userProfile_1, error_4, objectIDs_1, modules_1, licenceDetail, companylicenceDetail, receptionLicense, moduleList, _loop_17, i, error_5;
+        var userData, userProfile_1, error_4, objectIDs_1, modules_1, licenceDetail_1, companyLevelLicenceDetail, moduleList, _loop_19, i, error_5;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _b.trys.push([0, 12, , 13]);
+                    _b.trys.push([0, 11, , 12]);
                     return [4 /*yield*/, db.collection("User").findOne({ '_id': new mongodb_1.ObjectId(msp_d.ui), IsActive: true }, { projection: { 'LicenceDetail': 1, 'CompanyID': 1 } })];
                 case 1:
                     userData = _b.sent();
@@ -4483,7 +4499,7 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     if (!(!userProfile_1 || userProfile_1.length <= 0)) return [3 /*break*/, 6];
                     return [2 /*return*/, { statusCode: 500, message: "User's profile data not found.", data: {} }];
                 case 6:
-                    if (!(userData.LicenceDetail && userData.LicenceDetail.length > 0)) return [3 /*break*/, 10];
+                    if (!(userData.LicenceDetail && userData.LicenceDetail.length > 0)) return [3 /*break*/, 9];
                     objectIDs_1 = [];
                     userData.LicenceDetail.forEach(function (licenceDetail) {
                         if (licenceDetail.Status == "active")
@@ -4492,25 +4508,20 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     modules_1 = [];
                     return [4 /*yield*/, mdb.collection("Licences").find({ '_id': { $in: objectIDs_1 }, 'Status': 'active', 'IsActive': true }).toArray()];
                 case 7:
-                    licenceDetail = _b.sent();
-                    if (!(userData && userData.CompanyID)) return [3 /*break*/, 9];
-                    return [4 /*yield*/, mdb.collection("CompanyLicence").find({ 'CompanyID': userData.CompanyID, 'Status': 'active', 'IsActive': true }).toArray()];
+                    licenceDetail_1 = _b.sent();
+                    return [4 /*yield*/, mdb.collection("Licences").find({ "IsCompanyLevelLicence": true, "Status": "active", "IsActive": true }, { projection: { Modules: 1 } }).toArray()];
                 case 8:
-                    companylicenceDetail = _b.sent();
-                    if (companylicenceDetail && companylicenceDetail.length > 0) {
-                        receptionLicense = companylicenceDetail.find(function (licence) { return licence.LicenceName === "Reception" && licence.LicenceType === "App"; });
-                        if (receptionLicense) {
-                            licenceDetail.push({
-                                "Modules": [
-                                    "reception"
-                                ]
-                            });
-                        }
+                    companyLevelLicenceDetail = _b.sent();
+                    if (companyLevelLicenceDetail && companyLevelLicenceDetail.length > 0) {
+                        companyLevelLicenceDetail.map(function (x) {
+                            var _a;
+                            if (((_a = x.Modules) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                                licenceDetail_1.push({ "Modules": x.Modules });
+                            }
+                        });
                     }
-                    _b.label = 9;
-                case 9:
-                    if (licenceDetail && licenceDetail.length > 0) {
-                        licenceDetail.forEach(function (licence) {
+                    if (licenceDetail_1 && licenceDetail_1.length > 0) {
+                        licenceDetail_1.forEach(function (licence) {
                             modules_1 = modules_1.concat(licence.Modules);
                         });
                         userProfile_1[0].UserMenu = userProfile_1[0].UserMenu.filter(function (m) { return modules_1.includes(m.ModuleID); });
@@ -4518,14 +4529,14 @@ function GetUserProfile(msp_d, db, mdb, next) {
                         moduleList = userProfile_1[0].ModuleList;
                         userProfile_1[0].HasControlPanelAccess = [];
                         if (userProfile_1[0].Permissions) {
-                            _loop_17 = function (i) {
+                            _loop_19 = function (i) {
                                 userProfile_1[0].Permissions[i].ModuleData = moduleList.find(function (x) { return x._id == userProfile_1[0].Permissions[i].ModuleID; });
                                 if ((_a = userProfile_1[0].Permissions[i].Operations) === null || _a === void 0 ? void 0 : _a.includes("Control Panel")) {
                                     userProfile_1[0].HasControlPanelAccess.push(userProfile_1[0].Permissions[i].ModuleID);
                                 }
                             };
                             for (i = 0; i < userProfile_1[0].Permissions.length; i++) {
-                                _loop_17(i);
+                                _loop_19(i);
                             }
                         }
                         if (moduleList.length == 0) {
@@ -4537,15 +4548,15 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     else {
                         return [2 /*return*/, { statusCode: 200, message: "Licence data is not found in Master database.", data: {} }];
                     }
-                    return [3 /*break*/, 11];
-                case 10: return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
-                case 11: return [3 /*break*/, 13];
-                case 12:
+                    return [3 /*break*/, 10];
+                case 9: return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
+                case 10: return [3 /*break*/, 12];
+                case 11:
                     error_5 = _b.sent();
                     console.error("Internal Error in GetUserProfile Utility function : ".concat(error_5));
                     next(error_5);
-                    return [3 /*break*/, 13];
-                case 13: return [2 /*return*/];
+                    return [3 /*break*/, 12];
+                case 12: return [2 /*return*/];
             }
         });
     });
@@ -4847,7 +4858,7 @@ var CustomSanitizeHtml = function (dirtyHtml, uiDataType) {
 function ValidateUserInput(options) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var inputFields, fieldsJsonData, pageData, documentID, db, mdb, fiscalSettingData, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _d, _e, grp, _loop_19, _f, _g, fld, state_2, _loop_20, isValid, isValid, validateResp, _h, pageFields_1, pageField, state_3, countryData, err_3;
+        var inputFields, fieldsJsonData, pageData, documentID, db, mdb, fiscalSettingData, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_20, _i, inputField_1, name_1, state_1, _d, _e, grp, _loop_21, _f, _g, fld, state_2, _loop_22, isValid, isValid, validateResp, _h, pageFields_1, pageField, state_3, countryData, err_3;
         return __generator(this, function (_j) {
             switch (_j.label) {
                 case 0:
@@ -4876,7 +4887,7 @@ function ValidateUserInput(options) {
                     inputField = Object.keys(inputFields);
                     msg = '';
                     if (inputField && inputField.length) {
-                        _loop_18 = function (name_1) {
+                        _loop_20 = function (name_1) {
                             var field = pageFields.find(function (x) { return x.Name == name_1; });
                             if (field == undefined && !IsSystemField(objectName, name_1)) {
                                 msg = name_1 + " is not valid field!";
@@ -4885,7 +4896,7 @@ function ValidateUserInput(options) {
                         };
                         for (_i = 0, inputField_1 = inputField; _i < inputField_1.length; _i++) {
                             name_1 = inputField_1[_i];
-                            state_1 = _loop_18(name_1);
+                            state_1 = _loop_20(name_1);
                             if (state_1 === "break")
                                 break;
                         }
@@ -4894,7 +4905,7 @@ function ValidateUserInput(options) {
                         for (_d = 0, _e = pageData.Groups; _d < _e.length; _d++) {
                             grp = _e[_d];
                             if (grp.IsConditionalGroup) {
-                                _loop_19 = function (fld) {
+                                _loop_21 = function (fld) {
                                     fld = JSON.parse(JSON.stringify(fld));
                                     var schemafld = schemaFields.find(function (x) { return x.Name == fld.Name; });
                                     fld.Schema = schemafld;
@@ -4904,14 +4915,14 @@ function ValidateUserInput(options) {
                                 };
                                 for (_f = 0, _g = grp.Fields; _f < _g.length; _f++) {
                                     fld = _g[_f];
-                                    state_2 = _loop_19(fld);
+                                    state_2 = _loop_21(fld);
                                     if (state_2 === "break")
                                         break;
                                 }
                             }
                         }
                     }
-                    _loop_20 = function (pageField) {
+                    _loop_22 = function (pageField) {
                         var fieldName, fieldData, field, parentData, oldValue, newValue, isSame, searchQuery, result, fld, _k, minValue, maxValue, filter, searchObj, dbConnection, result, searchObj, totalRecord, _l, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _m, fieldData_1, obj, searchObj, totalRecord, searchObj, result, searchVideoObj, videoPromise, thumbnailPromise, searchThumbnailObj, _o, videoResult, thumbnailResult, text, _p, fieldData_2, obj;
                         return __generator(this, function (_q) {
                             switch (_q.label) {
@@ -5387,7 +5398,7 @@ function ValidateUserInput(options) {
                 case 2:
                     if (!(_h < pageFields_1.length)) return [3 /*break*/, 5];
                     pageField = pageFields_1[_h];
-                    return [5 /*yield**/, _loop_20(pageField)];
+                    return [5 /*yield**/, _loop_22(pageField)];
                 case 3:
                     state_3 = _j.sent();
                     if (state_3 === "break")

package/package.json

@@ -1,60 +1,60 @@
-{
-  "name": "@optimiser/common",
-  "version": "1.0.434",
-  "description": "",
-  "main": "dist/index.js",
-  "scripts": {
-    "compile": "tsc",
-    "push": "tsc && npm version patch -git-tag-version false   && npm publish"
-  },
-  "files": [
-    "dist/*"
-  ],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/geoip-lite": "^1.4.0",
-    "@types/promise.allsettled": "^1.0.3",
-    "@types/request": "^2.48.5",
-    "@types/sanitize-html": "^2.11.0",
-    "@types/sequelize": "^4.28.9",
-    "@types/unzipper": "^0.10.3",
-    "@types/uuid": "^8.3.0",
-    "aws-sdk": "^2.786.0",
-    "axios": "^0.21.4",
-    "bson": "^4.2.0",
-    "exceljs": "^4.3.0",
-    "express": "^4.17.1",
-    "express-validator": "^6.9.2",
-    "firebase-admin": "^12.0.0",
-    "geoip-lite": "^1.4.2",
-    "google-libphonenumber": "^3.2.30",
-    "html-to-text": "^8.2.0",
-    "ioredis": "^4.17.3",
-    "libphonenumber-js": "^1.9.51",
-    "moment": "^2.25.3",
-    "moment-timezone": "^0.5.27",
-    "mongo-sanitize": "^1.1.0",
-    "mongodb": "^3.6.2",
-    "nodemailer": "^6.4.11",
-    "promise.allsettled": "^1.0.2",
-    "qrcode": "^1.5.3",
-    "request": "^2.88.2",
-    "sanitize-html": "^2.13.0",
-    "sequelize": "^6.3.5",
-    "typescript": "^5.3.3",
-    "unzipper": "^0.10.11",
-    "uuid": "^8.3.1"
-  },
-  "devDependencies": {
-    "@types/aws-sdk": "^2.7.0",
-    "@types/bson": "^4.0.2",
-    "@types/exceljs": "^1.3.0",
-    "@types/express": "^4.17.8",
-    "@types/ioredis": "^4.17.4",
-    "@types/moment": "^2.13.0",
-    "@types/moment-timezone": "^0.5.30",
-    "@types/mongodb": "^3.5.27",
-    "@types/nodemailer": "^6.4.0"
-  }
-}
+{
+  "name": "@optimiser/common",
+  "version": "1.0.435",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "compile": "tsc",
+    "push": "tsc && npm version patch -git-tag-version false   && npm publish"
+  },
+  "files": [
+    "dist/*"
+  ],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/geoip-lite": "^1.4.0",
+    "@types/promise.allsettled": "^1.0.3",
+    "@types/request": "^2.48.5",
+    "@types/sanitize-html": "^2.11.0",
+    "@types/sequelize": "^4.28.9",
+    "@types/unzipper": "^0.10.3",
+    "@types/uuid": "^8.3.0",
+    "aws-sdk": "^2.786.0",
+    "axios": "^0.21.4",
+    "bson": "^4.2.0",
+    "exceljs": "^4.3.0",
+    "express": "^4.17.1",
+    "express-validator": "^6.9.2",
+    "firebase-admin": "^12.0.0",
+    "geoip-lite": "^1.4.2",
+    "google-libphonenumber": "^3.2.30",
+    "html-to-text": "^8.2.0",
+    "ioredis": "^4.17.3",
+    "libphonenumber-js": "^1.9.51",
+    "moment": "^2.25.3",
+    "moment-timezone": "^0.5.27",
+    "mongo-sanitize": "^1.1.0",
+    "mongodb": "^3.6.2",
+    "nodemailer": "^6.4.11",
+    "promise.allsettled": "^1.0.2",
+    "qrcode": "^1.5.3",
+    "request": "^2.88.2",
+    "sanitize-html": "^2.13.0",
+    "sequelize": "^6.3.5",
+    "typescript": "^5.3.3",
+    "unzipper": "^0.10.11",
+    "uuid": "^8.3.1"
+  },
+  "devDependencies": {
+    "@types/aws-sdk": "^2.7.0",
+    "@types/bson": "^4.0.2",
+    "@types/exceljs": "^1.3.0",
+    "@types/express": "^4.17.8",
+    "@types/ioredis": "^4.17.4",
+    "@types/moment": "^2.13.0",
+    "@types/moment-timezone": "^0.5.30",
+    "@types/mongodb": "^3.5.27",
+    "@types/nodemailer": "^6.4.0"
+  }
+}