@optimiser/common 1.0.373 → 1.0.375

package/dist/lib/event.js

@@ -76,16 +76,15 @@ var Event = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var notificationDataObj, userObj, userDeviceInfoObj, notificationCount, message, response, error_1, uniqueID, params;
-                        var _a, _b;
-                        return __generator(this, function (_c) {
-                            switch (_c.label) {
+                        var notificationDataObj, userObj, userDeviceInfoObj, message, response, error_1, uniqueID, params;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
                                 case 0:
-                                    if (!(db && userId && data && data.PushNotificationObj && !data.PushNotificationObj["endpoint"])) return [3 /*break*/, 9];
+                                    if (!(db && userId && data && data.PushNotificationObj && !data.PushNotificationObj["endpoint"])) return [3 /*break*/, 8];
                                     notificationDataObj = data.PushNotificationObj;
                                     return [4 /*yield*/, db.collection('UserNotification').findOne({ UserID: new mongodb_1.ObjectId(userId) })];
                                 case 1:
-                                    userObj = _c.sent();
+                                    userObj = _a.sent();
                                     if (userObj && userObj.endpoint && userObj.keys && data.PushNotificationObj) {
                                         data.PushNotificationObj["endpoint"] = userObj.endpoint;
                                         data.PushNotificationObj["keys"] = userObj.keys;
@@ -94,34 +93,12 @@ var Event = /** @class */ (function () {
                                         delete data.PushNotificationObj;
                                     }
                                     console.log("notificationDataObj Before calling fcm send--------", notificationDataObj);
-                                    if (!this.FCMMobileServiceAccountKey) return [3 /*break*/, 8];
+                                    if (!this.FCMMobileServiceAccountKey) return [3 /*break*/, 7];
                                     return [4 /*yield*/, db.collection('UserMobileNotification').findOne({ UserID: new mongodb_1.ObjectId(userId) })];
                                 case 2:
-                                    userDeviceInfoObj = _c.sent();
+                                    userDeviceInfoObj = _a.sent();
                                     console.log("userDeviceInfoObj", userDeviceInfoObj);
-                                    if (!(userDeviceInfoObj && userDeviceInfoObj.deviceToken && notificationDataObj)) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, db.collection('Notification').aggregate([{
-                                                $match: {
-                                                    'Users': { $elemMatch: { 'UserID': new mongodb_1.ObjectId(userId) } },
-                                                    'IsActive': true
-                                                }
-                                            }, {
-                                                $facet: {
-                                                    TotalUnseenNoti: [{
-                                                            $unwind: "$Users"
-                                                        }, {
-                                                            $match: { "Users.UserID": new mongodb_1.ObjectId(userId), "Users.IsNew": true }
-                                                        }, {
-                                                            $count: 'count'
-                                                        }]
-                                                }
-                                            }]).toArray()];
-                                case 3:
-                                    notificationCount = _c.sent();
-                                    if ((notificationDataObj === null || notificationDataObj === void 0 ? void 0 : notificationDataObj.isBackgroundPushnotification) != true) {
-                                        console.log("notificationCount", (_a = notificationCount[0].TotalUnseenNoti[0]) === null || _a === void 0 ? void 0 : _a.count);
-                                        notificationDataObj['notificationCount'] = (_b = notificationCount[0].TotalUnseenNoti[0]) === null || _b === void 0 ? void 0 : _b.count;
-                                    }
+                                    if (!(userDeviceInfoObj && userDeviceInfoObj.deviceToken && notificationDataObj)) return [3 /*break*/, 6];
                                     message = {
                                         token: userDeviceInfoObj.deviceToken,
                                         notification: {
@@ -146,28 +123,28 @@ var Event = /** @class */ (function () {
                                     };
                                     //changes by sunny ,send background notifcation
                                     if (notificationDataObj && (notificationDataObj === null || notificationDataObj === void 0 ? void 0 : notificationDataObj.isBackgroundPushnotification) == true) {
-                                        delete message.notification;
+                                        delete message.notification && delete message.android.notification; // added by komal, notifications under android has been deleted for backgorund notifications
                                         console.log("message.notification deleted");
                                     }
                                     console.log("FCM message payload------>", message);
                                     console.log("notificationDataObj inside if condition------>", JSON.stringify(notificationDataObj));
-                                    _c.label = 4;
-                                case 4:
-                                    _c.trys.push([4, 6, , 7]);
+                                    _a.label = 3;
+                                case 3:
+                                    _a.trys.push([3, 5, , 6]);
                                     return [4 /*yield*/, admin.messaging().send(message)];
-                                case 5:
-                                    response = _c.sent();
+                                case 4:
+                                    response = _a.sent();
                                     console.log('Successfully sent FCM notify(Mobile) message:', response);
-                                    return [3 /*break*/, 7];
-                                case 6:
-                                    error_1 = _c.sent();
+                                    return [3 /*break*/, 6];
+                                case 5:
+                                    error_1 = _a.sent();
                                     console.log('ERROR WHILE sent FCM notify(Mobile) message:', error_1.stack);
-                                    return [3 /*break*/, 7];
-                                case 7: return [3 /*break*/, 9];
-                                case 8:
+                                    return [3 /*break*/, 6];
+                                case 6: return [3 /*break*/, 8];
+                                case 7:
                                     console.log('Attention!!-- We are not sending mobile notifications due to lack of FIREBASE ADMIN APP configurations.\n Please provide firebaseSet-up.JSON file.');
-                                    _c.label = 9;
-                                case 9:
+                                    _a.label = 8;
+                                case 8:
                                     // if (userId && data.SocketObj && !data.SocketObj.userId) {
                                     //QPC-7064, Ankush changes added    
                                     if (userId && data.SocketObj && data.SocketObj.userId != userId) {

package/dist/lib/utility.js

@@ -3351,11 +3351,11 @@ exports.ConvertJsonToXLXS = ConvertJsonToXLXS;
 function SendResetPasswordMail(db, userDetails, type) {
     if (type === void 0) { type = "newUser"; }
     return __awaiter(this, void 0, void 0, function () {
-        var Email, FirstName, Phone, LastName, Mobile, UserStatus, _id, companyId, CreatedBy, dbObj, hash, SetSessionObject, imagepath, mailObj;
+        var Email, FirstName, Phone, LastName, Mobile, UserStatus, _id, companyId, CreatedBy, userName, dbObj, hash, SetSessionObject, imagepath, mailObj;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    Email = userDetails.Email, FirstName = userDetails.FirstName, Phone = userDetails.Phone, LastName = userDetails.LastName, Mobile = userDetails.Mobile, UserStatus = userDetails.UserStatus, _id = userDetails._id, companyId = userDetails.companyId, CreatedBy = userDetails.CreatedBy;
+                    Email = userDetails.Email, FirstName = userDetails.FirstName, Phone = userDetails.Phone, LastName = userDetails.LastName, Mobile = userDetails.Mobile, UserStatus = userDetails.UserStatus, _id = userDetails._id, companyId = userDetails.companyId, CreatedBy = userDetails.CreatedBy, userName = userDetails.userName;
                     dbObj = {
                         FirstName: FirstName,
                         Mobile: Mobile,
@@ -3386,7 +3386,7 @@ function SendResetPasswordMail(db, userDetails, type) {
                     else {
                         mailObj.subject = "Welcome to ".concat(constants_1.default.ProjectName, ": Please activate your account");
                         //QPC-7971: called MailTemplateStructure for email body. and updated the link
-                        mailObj.html = MailTemplateStructure("<p style=\"margin-top: 1em;\">Dear User,</p>\n        <p>Congratulations! We are pleased to advise that your user profile has been created and is ready to use. Just click on the link below to set up your password then you\u2019ll be ready to go.</p>\n        <br>\n        <p style=\"word-break: break-all;\">\n        <a href='".concat(constants_1.default.ProjectDomain, "?page=SetPassword&uid=").concat(hash, "'>").concat(constants_1.default.ProjectDomain, "?page=SetPassword&uid=").concat(hash, "</a>\n        </p>\n        <br>\n        <p>We hope that you enjoy your Optimiser platform; if you ever require assistance, our Support Team will be happy to help.</p>\n        <p>Email : <a href=\"mailto:support@optimiser.com\">support@optimiser.com</a>, Phone : +44 (0)203 972 1666</p>\n        <br>"));
+                        mailObj.html = MailTemplateStructure("<p style=\"margin-top: 1em;\">Dear User,</p>\n        <p>Congratulations! We are pleased to advise that your user profile has been created and is ready to use. Here's your unique Username: ".concat(userName, ". Just click on the link below to set up your password then you\u2019ll be ready to go.</p>\n        <br>\n        <p style=\"word-break: break-all;\">\n        <a href='").concat(constants_1.default.ProjectDomain, "?page=SetPassword&uid=").concat(hash, "'>").concat(constants_1.default.ProjectDomain, "?page=SetPassword&uid=").concat(hash, "</a>\n        </p>\n        <br>\n        <p>We hope that you enjoy your Optimiser platform; if you ever require assistance, our Support Team will be happy to help.</p>\n        <p>Email : <a href=\"mailto:support@optimiser.com\">support@optimiser.com</a>, Phone : +44 (0)203 972 1666</p>\n        <br>"));
                     }
                     return [2 /*return*/, new Promise(function (resolve, reject) {
                             (0, mail_1.SendMail)(mailObj).then(function (status) {

package/package.json

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