@optimiser/common 1.0.318 → 1.0.319

package/dist/lib/utility.js

@@ -194,7 +194,7 @@ exports.CheckUserProfileField = CheckUserProfileField;
 function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
     db.collection("Page").findOne({ 'PageName': pageName }, function (err, pageData) {
         return __awaiter(this, void 0, void 0, function () {
-            var response, hasAccess;
+            var hasAccess;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -205,14 +205,8 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                             callback(pageData);
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
-                    case 1:
-                        response = _a.sent();
-                        if (response && response.message == 'success') {
-                            pageData['UserProfile'] = response.data;
-                        }
                         return [4 /*yield*/, CheckPageAuthentication(pageData, msp_d, db, mdb, next)];
-                    case 2:
+                    case 1:
                         hasAccess = _a.sent();
                         if (!hasAccess) {
                             callback('Unauthorised');
@@ -1013,7 +1007,7 @@ function SyncFieldInSameCollection(objectName, objectIDs, db) {
     var _this = this;
     return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            console.log("succass");
+            console.log("success");
             try {
                 db.collection("ObjectSchema").findOne({ 'Name': objectName }, function (err, objectSchema) {
                     return __awaiter(this, void 0, void 0, function () {
@@ -3818,20 +3812,30 @@ exports.SyncUserLicenceConsumedCount = SyncUserLicenceConsumedCount;
  */
 function BroadCastEventToAllCompanyUsers(params) {
     try {
-        params.db.collection('User').find({
-            IsActive: true,
-            UserStatus: constants_1.default.USER_STATUS.ACTIVE
-        }, {
-            projection: { "_id": 1 }
-        }).toArray(function (err, res) {
+        var aggregateArry = [];
+        aggregateArry.push({
+            $match: {
+                'IsActive': true,
+                'UserStatus': constants_1.default.USER_STATUS.ACTIVE
+            }
+        });
+        if (params.Match != undefined) {
+            aggregateArry.push({
+                $match: params.Match
+            });
+        }
+        aggregateArry.push({
+            $project: { '_id': 1 }
+        });
+        params.db.collection('User').aggregate(aggregateArry, { "allowDiskUse": true }).toArray(function (err, usersData) {
             if (err) {
                 console.log("Error while sending notification " + (params.EventName || "") + " to all company users. ==>", err);
                 return;
             }
-            else if (res && res.length > 0) {
-                for (var i = 0; i < res.length; i++) {
+            else if (usersData && usersData.length > 0) {
+                for (var i = 0; i < usersData.length; i++) {
                     //not sending notification to sender
-                    if (params.UserID && params.UserID.toString() == res[i]._id.toString()) {
+                    if (params.UserID && params.UserID.toString() == usersData[i]._id.toString()) {
                         continue;
                     }
                     //params.userID to handle
@@ -3843,9 +3847,9 @@ function BroadCastEventToAllCompanyUsers(params) {
                                 var socketObjectData = {
                                     eventType: eventItem.EventName,
                                     data: eventItem.EventData,
-                                    userId: res[i]._id.toString()
+                                    userId: usersData[i]._id.toString()
                                 };
-                                //socketUtility.TriggerSockerEvent(req, res[i]._id.toString(), eventName, data);
+                                //socketUtility.TriggerSockerEvent(req, usersData[i]._id.toString(), eventName, data);
                                 params.event.CreateEvent(null, null, { SocketObj: socketObjectData }).then(function (socketResult) {
                                     if (socketResult) {
                                         console.log("Success");
@@ -4297,26 +4301,19 @@ exports.GetUserProfile = GetUserProfile;
 function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var hasAccess, userProfile, response, auth, i, moduleData;
+        var hasAccess, response, userProfile, auth, i, moduleData;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     hasAccess = false;
                     if (!(pageData.IsPermissionRequired == false)) return [3 /*break*/, 1];
                     hasAccess = true;
-                    return [3 /*break*/, 5];
-                case 1:
-                    userProfile = void 0;
-                    if (!pageData.UserProfile) return [3 /*break*/, 2];
-                    userProfile = pageData.UserProfile;
-                    return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
-                case 3:
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
+                case 2:
                     response = _c.sent();
-                    userProfile = response === null || response === void 0 ? void 0 : response.data;
-                    _c.label = 4;
-                case 4:
-                    if (userProfile) {
+                    if (response && response.message == 'success') {
+                        userProfile = response.data;
                         auth = userProfile.Permissions;
                         for (i = 0; i < auth.length; i++) {
                             moduleData = auth[i].ModuleData;
@@ -4329,11 +4326,10 @@ function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
                         }
                     }
                     else {
-                        console.log('User Profile data is not found while checking Page authentication.');
-                        hasAccess = false;
+                        console.log(response === null || response === void 0 ? void 0 : response.message);
                     }
-                    _c.label = 5;
-                case 5: return [2 /*return*/, hasAccess];
+                    _c.label = 3;
+                case 3: return [2 /*return*/, hasAccess];
             }
         });
     });

package/package.json

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