@optimiser/common 1.0.355 → 1.0.357

package/dist/lib/event.d.ts

@@ -6,6 +6,7 @@ import { GlobalNotificationData } from "../modals/globalNotification.modal";
 export declare class Event {
     private sqs;
     private queueURL;
+    private FCMMobileServiceAccountKey;
     constructor(eventConfig: SQSConfig);
     /**
      * @param userId

package/dist/lib/event.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,6 +59,7 @@ exports.Event = void 0;
 var aws_sdk_1 = require("aws-sdk");
 var uuid_1 = require("uuid");
 var mongodb_1 = require("mongodb");
+var admin = __importStar(require("firebase-admin"));
 var Event = /** @class */ (function () {
     function Event(eventConfig) {
         var _this = this;
@@ -52,11 +72,12 @@ 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 userObj, uniqueID, params;
+                        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*/, 2];
+                                    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 = _a.sent();
@@ -67,8 +88,49 @@ var Event = /** @class */ (function () {
                                     else {
                                         delete data.PushNotificationObj;
                                     }
-                                    _a.label = 2;
+                                    if (!this.FCMMobileServiceAccountKey) return [3 /*break*/, 7];
+                                    return [4 /*yield*/, db.collection('UserMobileNotification').findOne({ UserID: new mongodb_1.ObjectId(userId) })];
                                 case 2:
+                                    userDeviceInfoObj = _a.sent();
+                                    if (!(userDeviceInfoObj && userDeviceInfoObj.deviceToken && notificationDataObj)) return [3 /*break*/, 6];
+                                    message = {
+                                        token: userDeviceInfoObj.deviceToken,
+                                        notification: {
+                                            title: notificationDataObj.title,
+                                            body: notificationDataObj.message
+                                        },
+                                        android: {
+                                            priority: 'high' // You can set the priority to 'high' or 'normal' for Android
+                                        },
+                                        apns: {
+                                            payload: {
+                                                aps: {
+                                                    contentAvailable: true // For iOS, setting contentAvailable to true makes the message a silent notification
+                                                }
+                                            }
+                                        },
+                                        data: {
+                                            title: notificationDataObj.title,
+                                            body: notificationDataObj.message
+                                        }
+                                    };
+                                    _a.label = 3;
+                                case 3:
+                                    _a.trys.push([3, 5, , 6]);
+                                    return [4 /*yield*/, admin.messaging().send(message)];
+                                case 4:
+                                    response = _a.sent();
+                                    console.log('Successfully sent FCM notify(Mobile) message:', response);
+                                    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*/, 6];
+                                case 6: return [3 /*break*/, 8];
+                                case 7:
+                                    console.log('Not able to INITIALISE THE FIREBASE ADMIN APP--');
+                                    _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) {
@@ -165,6 +227,15 @@ var Event = /** @class */ (function () {
             accessKeyId: eventConfig.SQS_ACCESSKEY_ID,
             secretAccessKey: eventConfig.SQS_SECRET_KEY
         });
+        this.FCMMobileServiceAccountKey = eventConfig.FCM_NOTIFICATION_SERVICE_ACCOUNT_KEY;
+        try {
+            admin.initializeApp({
+                credential: admin.credential.cert(this.FCMMobileServiceAccountKey)
+            });
+        }
+        catch (error) {
+            console.log('Error while INITIALIZING FIREBASE ADMIN APP\n Please check service-accountKey.JSON file.\n This will impact mobile app notifications  -----', error);
+        }
     }
     return Event;
 }());

package/dist/lib/utility.js

@@ -5524,26 +5524,28 @@ exports.GetFileFolderDetailsInFolderForDriveSharing = GetFileFolderDetailsInFold
  */
 function SyncTotalSlotRemaining(registrationID, db) {
     return __awaiter(this, void 0, void 0, function () {
-        var registrationData, totalDelegates, maximumRegistration, eventSchema, regDelegates_1, includeGuestInRegCount, registeredDelegates, remainingSlots;
+        var eventSchema, registrationData, totalDelegates, maximumRegistration, regDelegates_1, includeGuestInRegCount, registeredDelegates, remainingSlots;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!registrationID) return [3 /*break*/, 7];
-                    return [4 /*yield*/, db.collection('EventRegistration').findOne({ '_id': registrationID, 'IsActive': true })];
+                    return [4 /*yield*/, db.collection('ObjectSchema').findOne({ Name: "EventRegistration" })];
                 case 1:
+                    eventSchema = _a.sent();
+                    if (!(eventSchema.TotalSlotSyncingIn != 'Custom')) return [3 /*break*/, 7];
+                    return [4 /*yield*/, db.collection('EventRegistration').findOne({ '_id': registrationID, 'IsActive': true })];
+                case 2:
                     registrationData = _a.sent();
                     if (!registrationData) return [3 /*break*/, 7];
                     totalDelegates = 0;
                     maximumRegistration = registrationData.MaximumRegistration;
-                    if (!(maximumRegistration == undefined)) return [3 /*break*/, 3];
+                    if (!(maximumRegistration == undefined)) return [3 /*break*/, 4];
                     return [4 /*yield*/, db.collection('EventRegistration').updateOne({ '_id': registrationID, 'IsActive': true }, { $set: { 'TotalSlotRemaining': null } })];
-                case 2:
+                case 3:
                     _a.sent();
                     return [3 /*break*/, 7];
-                case 3: return [4 /*yield*/, db.collection('ObjectSchema').findOne({ Name: "EventRegistration" })];
                 case 4:
-                    eventSchema = _a.sent();
-                    regDelegates_1 = (eventSchema === null || eventSchema === void 0 ? void 0 : eventSchema.RegisteredDelegates) || [];
+                    regDelegates_1 = eventSchema.RegisteredDelegates || [];
                     includeGuestInRegCount = registrationData.IncludeGuestInRegCount;
                     return [4 /*yield*/, db.collection('EventDelegate').find({ 'EventID': registrationData.EventID, 'RegistrationType': registrationID, 'IsActive': true }).toArray()];
                 case 5:

package/dist/modals/sqsconfig.modal.d.ts

@@ -4,4 +4,5 @@ export interface SQSConfig {
     SQS_REGION: string;
     SQS_ACCESSKEY_ID: string;
     SQS_SECRET_KEY: string;
+    FCM_NOTIFICATION_SERVICE_ACCOUNT_KEY: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.355",
+  "version": "1.0.357",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -25,6 +25,7 @@
     "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",
     "ioredis": "^4.17.3",