@optimiser/common 1.0.264 → 1.0.267

package/dist/lib/connection.js

@@ -316,25 +316,54 @@ var Connection = /** @class */ (function () {
      */
     Connection.prototype.FindAndReturnDBConnection = function (DBName, DBAddress) {
         var _this = this;
+        /*Code Updated By Suraj on 07-Apr-2022, Try catch and some If conditions added to prevent from breaking the code.*/
         return new Promise(function (resolve, reject) {
-            if (DBAddress && _this.connections[Buffer.from(DBAddress).toString('base64')]) {
-                _this.connections[Buffer.from(DBAddress).toString('base64')].db(DBName);
-            }
-            var masterDb = _this.connections[Buffer.from(_this.masterConfig.MASTER_CONNECTION_STRING).toString('base64')].db(_this.masterConfig.MASTER_DB_NAME);
-            if (DBName == _this.masterConfig.MASTER_DB_NAME) {
-                return resolve(masterDb);
-            }
-            masterDb.collection("Company").findOne({ DBName: DBName }).then(function (companyData) {
-                if (companyData) {
-                    _this.ConnectToDb({
-                        DBAddress: companyData.DBAddress,
-                        DBName: companyData.DBName
-                    }).then(function (success) { return resolve(_this.connections[Buffer.from(companyData.DBAddress).toString('base64')].db(companyData.DBName)); });
+            try {
+                if (DBAddress && _this.connections[Buffer.from(DBAddress).toString('base64')]) {
+                    _this.connections[Buffer.from(DBAddress).toString('base64')].db(DBName);
+                }
+                var masterDb = null;
+                if (_this.connections[Buffer.from(_this.masterConfig.MASTER_CONNECTION_STRING).toString('base64')]) {
+                    masterDb = _this.connections[Buffer.from(_this.masterConfig.MASTER_CONNECTION_STRING).toString('base64')].db(_this.masterConfig.MASTER_DB_NAME);
+                }
+                //checking master db connection
+                if (!masterDb) {
+                    console.log("Master db connection not available");
+                    reject(new Error("Master db connection not available"));
+                    return;
                 }
-                else {
-                    reject();
+                if (DBName == _this.masterConfig.MASTER_DB_NAME) {
+                    return resolve(masterDb);
                 }
-            }, function (error) { return reject(error); });
+                masterDb.collection("Company").findOne({ DBName: DBName }).then(function (companyData) {
+                    if (companyData) {
+                        _this.ConnectToDb({
+                            DBAddress: companyData.DBAddress,
+                            DBName: companyData.DBName
+                        }).then(function () {
+                            //Checking company connection first, if exists then resolve
+                            if (_this.connections[Buffer.from(companyData.DBAddress).toString('base64')]) {
+                                resolve(_this.connections[Buffer.from(companyData.DBAddress).toString('base64')].db(companyData.DBName));
+                            }
+                            else {
+                                console.log("Company db connection not established");
+                                reject(new Error("Company db connection not established"));
+                            }
+                        });
+                    }
+                    else {
+                        reject();
+                    }
+                }, function (error) {
+                    console.log("Error occurred :", error);
+                    reject(error);
+                });
+            }
+            catch (ex) {
+                console.log("Error occurred :", ex);
+                ex.message += "- db connection error";
+                reject(ex);
+            }
         });
     };
     /**
@@ -344,7 +373,6 @@ var Connection = /** @class */ (function () {
      */
     Connection.prototype.ConnectToCompanyDB = function (DBName, DBAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var masterdb;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -355,7 +383,7 @@ var Connection = /** @class */ (function () {
                             DBName: this.masterConfig.MASTER_DB_NAME
                         })];
                     case 2:
-                        masterdb = _a.sent();
+                        _a.sent();
                         return [2 /*return*/, this.FindAndReturnDBConnection(DBName, DBAddress)];
                 }
             });
@@ -395,7 +423,7 @@ var Connection = /** @class */ (function () {
                                     Type: "ERROR"
                                 })];
                         }
-                        db.collection("User").findOne({ _id: new mongodb_1.ObjectID(req.cookies.msp_d.ui) }).then(function (user) {
+                        db.collection("User").findOne({ _id: new mongodb_1.ObjectId(req.cookies.msp_d.ui) }).then(function (user) {
                             if (!user) {
                                 return _this.ReturnJsonResponse(req, res, {
                                     Data: {},

package/dist/lib/event.js

@@ -57,7 +57,7 @@ var Event = /** @class */ (function () {
                             switch (_a.label) {
                                 case 0:
                                     if (!(db && userId && data && data.PushNotificationObj && !data.PushNotificationObj["endpoint"])) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, db.collection('UserNotification').findOne({ UserID: new mongodb_1.ObjectID(userId) })];
+                                    return [4 /*yield*/, db.collection('UserNotification').findOne({ UserID: new mongodb_1.ObjectId(userId) })];
                                 case 1:
                                     userObj = _a.sent();
                                     if (userObj && userObj.endpoint && userObj.keys && data.PushNotificationObj) {
@@ -130,8 +130,8 @@ var Event = /** @class */ (function () {
                     CreatedDate: new Date(),
                     Users: [],
                     EventObjectName: data.EventObjectName,
-                    EventID: new mongodb_1.ObjectID(data.EventID),
-                    CreatedBy: new mongodb_1.ObjectID(data.CreatedBy),
+                    EventID: new mongodb_1.ObjectId(data.EventID),
+                    CreatedBy: new mongodb_1.ObjectId(data.CreatedBy),
                     Message: data.Message
                 };
                 var Userid = [];
@@ -139,7 +139,7 @@ var Event = /** @class */ (function () {
                     Userid.push({
                         "IsSeen": false,
                         "IsNew": true,
-                        "UserID": new mongodb_1.ObjectID(id)
+                        "UserID": new mongodb_1.ObjectId(id)
                     });
                 });
                 saveObj.Users = Userid;

package/dist/lib/helper.d.ts

@@ -1,4 +1,4 @@
-import { Db, ObjectID } from "mongodb";
+import { Db, ObjectId } from "mongodb";
 import { AnyObjectInterface } from "../modals/utility.modal";
 declare function GetCompanyDetails(Master_DB: Db, companyId: string): Promise<any>;
 declare function GetListSchema(db: Db, listName: string): Promise<Error | AnyObjectInterface[] | []>;
@@ -6,7 +6,7 @@ declare function GetEmailwiseUnsubscribeData(db: Db, mailID: string, domainID?:
 declare function GenerateAutoIncrementFieldValue(db: Db, autoIncrementID: string): Promise<null | string>;
 declare function GetAccountDetailByName(db: Db, accountName: string): Promise<AnyObjectInterface | null>;
 declare function GetContactDetailByEmail(db: Db, contactEmail: string): Promise<null | AnyObjectInterface>;
-declare function GetSystemEmailTemplate(db: Db, TemplateIDArray: ObjectID[]): Promise<null | AnyObjectInterface>;
+declare function GetSystemEmailTemplate(db: Db, TemplateIDArray: ObjectId[]): Promise<null | AnyObjectInterface>;
 declare function UpdateContactDetails(db: Db, contactData: AnyObjectInterface): void;
 declare function CreateContact(db: Db, contactData: AnyObjectInterface): Promise<null | AnyObjectInterface>;
 declare function MapAccountContact(db: Db, dataObj: AnyObjectInterface): void;
@@ -50,7 +50,7 @@ declare const GetEmailSubscribeStatus: (db: Db, email: string) => Promise<Error
  * @param {mongodbQueryOptions} object, params to pass on db queries
  * @returns resolve success | error object
  */
-declare const SubscribeEmailForAllDomains: (db: Db, email: string, isSubscribe: boolean, companyID: ObjectID, comment?: string, mongodbQueryOptions?: any) => Promise<unknown>;
+declare const SubscribeEmailForAllDomains: (db: Db, email: string, isSubscribe: boolean, companyID: ObjectId, comment?: string, mongodbQueryOptions?: any) => Promise<unknown>;
 /**
  * checking phone number is valid and has dialing code
  * if it has dialing code then get country code, get its optimiser country phone code

package/dist/lib/helper.js

@@ -45,7 +45,7 @@ var constants_1 = __importDefault(require("../constants"));
 var moment_1 = __importDefault(require("moment"));
 var libphonenumber_js_1 = require("libphonenumber-js");
 function GetCompanyDetails(Master_DB, companyId) {
-    return Master_DB.collection('Company').findOne({ _id: new mongodb_1.ObjectID(companyId) });
+    return Master_DB.collection('Company').findOne({ _id: new mongodb_1.ObjectId(companyId) });
 }
 exports.GetCompanyDetails = GetCompanyDetails;
 function GetListSchema(db, listName) {

package/dist/lib/operautilitycommon.js

@@ -519,7 +519,7 @@ var EmailPrioritySearch = function (params) { return __awaiter(void 0, void 0, v
                             if (!(memoryServerSearchData && Object.keys(memoryServerSearchData.response).length !== 0)) return [3 /*break*/, 4];
                             id = (_b = memoryServerSearchData === null || memoryServerSearchData === void 0 ? void 0 : memoryServerSearchData.response) === null || _b === void 0 ? void 0 : _b._id;
                             if (!(id && id !== '')) return [3 /*break*/, 3];
-                            convertedToObjectID = new mongodb_1.ObjectID(id);
+                            convertedToObjectID = new mongodb_1.ObjectId(id);
                             return [4 /*yield*/, params.db.collection(params.ProfileType).findOne({ '_id': convertedToObjectID }, mongodbTransactionQueryopts)];
                         case 2:
                             result = _c.sent();

package/dist/lib/taskutils.js

@@ -157,7 +157,7 @@ function GenerateTaskNotifications(req, options, db, event) {
                     if (!tasks_1[0].ListSublist)
                         return [2 /*return*/];
                     return [4 /*yield*/, db.collection('TaskList').findOne({
-                            _id: new mongodb_1.ObjectID(tasks_1[0].ListSublist)
+                            _id: new mongodb_1.ObjectId(tasks_1[0].ListSublist)
                         })];
                 case 3:
                     list = _b.sent();
@@ -179,12 +179,12 @@ function GenerateTaskNotifications(req, options, db, event) {
                     info['taskBeforeEdit'] = options.taskBeforeEdit;
                     return [3 /*break*/, 8];
                 case 4: return [4 /*yield*/, db.collection('Task').findOne({
-                        _id: new mongodb_1.ObjectID(options.taskID)
+                        _id: new mongodb_1.ObjectId(options.taskID)
                     })];
                 case 5:
                     task = _b.sent();
                     return [4 /*yield*/, db.collection('TaskList').findOne({
-                            _id: new mongodb_1.ObjectID(task.ListSublist)
+                            _id: new mongodb_1.ObjectId(task.ListSublist)
                         })];
                 case 6:
                     list = _b.sent();
@@ -262,10 +262,10 @@ function CreateNotificationContent(info, req, db, event) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    UserID = new mongodb_1.ObjectID(req.cookies.msp_d.ui);
+                    UserID = new mongodb_1.ObjectId(req.cookies.msp_d.ui);
                     Payload = {};
                     FetchUsers = function (query) { return db.collection('User').find(query).toArray(); };
-                    ListInfo = function (id) { return db.collection('TaskList').findOne({ _id: new mongodb_1.ObjectID(id) }); };
+                    ListInfo = function (id) { return db.collection('TaskList').findOne({ _id: new mongodb_1.ObjectId(id) }); };
                     TaskInfo = function (TaskNumber) { return db.collection('Task').findOne({ TaskNumber: TaskNumber }); };
                     NotificationContent = {};
                     _a = info.page;
@@ -354,7 +354,7 @@ function CreateNotificationContent(info, req, db, event) {
                     creator = _b.sent();
                     creator = creator[0];
                     return [3 /*break*/, 13];
-                case 11: return [4 /*yield*/, FetchUsers({ _id: new mongodb_1.ObjectID(info.receiverId), "UserStatus": { $not: { $eq: "Blocked" } } })];
+                case 11: return [4 /*yield*/, FetchUsers({ _id: new mongodb_1.ObjectId(info.receiverId), "UserStatus": { $not: { $eq: "Blocked" } } })];
                 case 12:
                     users = _b.sent();
                     creator = info.senderData[0];
@@ -398,7 +398,7 @@ function CreateNotificationContent(info, req, db, event) {
                     if (!(info.event == 'EDIT_TASK')) return [3 /*break*/, 17];
                     if ((req.body.AssignedTo ? req.body.AssignedTo.$oid : (oldTaskData.AssignedTo).toString()) == (oldTaskData.OwnerID).toString())
                         return [2 /*return*/];
-                    receiverId_1 = new mongodb_1.ObjectID((req.cookies.msp_d.ui == (oldTaskData.AssignedTo).toString()) ? oldTaskData.OwnerID : (oldTaskData.AssignedTo).toString());
+                    receiverId_1 = new mongodb_1.ObjectId((req.cookies.msp_d.ui == (oldTaskData.AssignedTo).toString()) ? oldTaskData.OwnerID : (oldTaskData.AssignedTo).toString());
                     return [4 /*yield*/, FetchUsers({
                             _id: receiverId_1,
                             "UserStatus": { $not: { $eq: "Blocked" } }
@@ -492,7 +492,7 @@ function CreateNotificationContent(info, req, db, event) {
                     return [3 /*break*/, 20];
                 case 17:
                     if (!(info.event == "EDIT_TASK_INLINE")) return [3 /*break*/, 20];
-                    receiverId_2 = new mongodb_1.ObjectID((req.cookies.msp_d.ui == (oldTaskData.AssignedTo).toString()) ? oldTaskData.OwnerID : (oldTaskData.AssignedTo).toString());
+                    receiverId_2 = new mongodb_1.ObjectId((req.cookies.msp_d.ui == (oldTaskData.AssignedTo).toString()) ? oldTaskData.OwnerID : (oldTaskData.AssignedTo).toString());
                     return [4 /*yield*/, FetchUsers({ _id: receiverId_2, "UserStatus": { $not: { $eq: "Blocked" } } })];
                 case 18:
                     receiverData_2 = _b.sent();

package/dist/lib/utility.d.ts

@@ -1,6 +1,6 @@
 import { Moment } from "moment";
 import { NextFunction, Response } from "express";
-import { ObjectID, ObjectId, Db } from "mongodb";
+import { ObjectId, Db } from "mongodb";
 import { ResponseStructure, OPT_ERROR } from "../modals/connection.modal";
 import { Express } from '../modals/log.modal';
 import { AnyObjectInterface, callBackInterface } from "../modals/utility.modal";
@@ -14,10 +14,10 @@ declare function CheckUserProfileField(pageData: AnyObjectInterface, profileData
 declare function GetPageFieldData(pageName: string, db: any, mdb: any, msp_d: any, next: NextFunction, callback: callBackInterface): void;
 declare function GetPageObjectSchema(pageName: string, db: Db, next: NextFunction, callback: callBackInterface): void;
 declare function GetFieldDetail(objectName: string, fieldName: string, db: any, callback: callBackInterface, next: NextFunction): void;
-declare function UpdateRecentViewObject(objectName: string, objectID: ObjectID, userID: ObjectID, db: Db): void;
-declare function UpdateRecentViewFields(objectName: string, fieldID: string, userID: ObjectID, db: Db): void;
-declare function SyncChildObjectData(pageData: AnyObjectInterface, objectID: ObjectID, db: Db): Promise<void>;
-declare function SyncParentObjectData(pageData: AnyObjectInterface, objectID: ObjectID, db: Db): Promise<void>;
+declare function UpdateRecentViewObject(objectName: string, objectID: ObjectId, userID: ObjectId, db: Db): void;
+declare function UpdateRecentViewFields(objectName: string, fieldID: string, userID: ObjectId, db: Db): void;
+declare function SyncChildObjectData(pageData: AnyObjectInterface, objectID: ObjectId, db: Db): Promise<void>;
+declare function SyncParentObjectData(pageData: AnyObjectInterface, objectID: ObjectId, db: Db): Promise<void>;
 /**
  * Delete field in other collection after delete records
  * @param mongodbTransactionQueryopts to maintain session for transactions

package/dist/lib/utility.js

@@ -1348,7 +1348,7 @@ function SyncUserInOtherCollection(options, db, callback, next) {
                             else if (field.UIDataType == "multilookup") {
                                 query.match = (_b = {}, _b[field.Name] = { "$nin": [null] }, _b[field.Name + constants_1.default.LookupAlias] = { "$nin": [null] }, _b);
                                 query.set[field.Name + '.$[e]'] = userData["toUserData"]._id;
-                                query.set["ModifiedBy"] = new mongodb_1.ObjectID(msp_d.ui);
+                                query.set["ModifiedBy"] = new mongodb_1.ObjectId(msp_d.ui);
                                 query.set["ModifiedDate"] = new Date();
                                 query.arrayFilters = (_c = {}, _c['e._id'] = userData["fromUserData"]._id, _c);
                                 if (query.set && query.arrayFilters)
@@ -1420,12 +1420,29 @@ exports.SyncUserInOtherCollection = SyncUserInOtherCollection;
 //Build _LookupDataField before save
 function BuildLookupDataField(fieldSchema, updateObj, db) {
     return new Promise(function (resolve, reject) {
+        /**
+         * Added By Suraj on 06-Apr-2022,
+         * helper function for all below cases to print error log on console.
+         * @param fieldValue value of a field
+         * @param err error occurred during processing
+         */
+        var errorHandler = function (fieldValue, err) {
+            var fieldValueType = (Array.isArray(fieldValue) ? 'array' : '');
+            if (!fieldValueType) {
+                fieldValueType = typeof (fieldValue);
+            }
+            var errorInfo = "##### COMMON MOUDLE ERROR INFO ####";
+            errorInfo += "\n Function Name : BuildLookupDataField";
+            errorInfo += "\n Error Info: Error while building Lookup Data for Company - " + (db.databaseName) + ", ObjectName - " + (fieldSchema.LookupObject || '') + ", FieldName - " + (fieldSchema.Name || '') + " for value - " + fieldValue + " and data type of values is " + (fieldValueType || '') + " ";
+            console.log("Error Information : ", errorInfo);
+            console.log("Error Full Object : ", err);
+        };
         if (fieldSchema.UIDataType && constants_1.default.LookupTypeFields.includes(fieldSchema.UIDataType)) {
             var fldName = fieldSchema.Name;
-            var fldValue = updateObj[fldName];
+            var fldValue_1 = updateObj[fldName];
             var alias_1 = fldName + constants_1.default.LookupAlias;
             var fldLookupData_1 = null;
-            if (fldValue) {
+            if (fldValue_1) {
                 var aggregateArry = [];
                 var project = { '_id': 1, IsActive: 1 };
                 if (fieldSchema.ExtraLookupObjects) {
@@ -1456,13 +1473,13 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                 }
                 switch (fieldSchema.UIDataType) {
                     case "lookup":
-                        aggregateArry.push({ $match: { '_id': fldValue } });
+                        aggregateArry.push({ $match: { '_id': fldValue_1 } });
                         aggregateArry.push({ $project: project });
                         db.collection(fieldSchema.LookupObject).aggregate(aggregateArry).toArray(function (err, data) {
                             if (err) {
-                                //not handel
+                                errorHandler(fldValue_1, err);
                             }
-                            if (data && data.length > 0) {
+                            else if (data && data.length > 0) {
                                 fldLookupData_1 = data[0];
                                 updateObj[alias_1] = fldLookupData_1;
                             }
@@ -1470,7 +1487,7 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                         });
                         break;
                     case "multilookup":
-                        aggregateArry.push({ $match: { '_id': { $in: fldValue } } });
+                        aggregateArry.push({ $match: { '_id': { $in: fldValue_1 } } });
                         aggregateArry.push({ $project: project });
                         if (fieldSchema.UnionWith && fieldSchema.UnionWith.length > 0) {
                             for (var i = 0; i < fieldSchema.UnionWith.length; i++) {
@@ -1478,7 +1495,7 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                                 if (unionDetail) {
                                     var unionPipeline = [];
                                     unionPipeline.push({
-                                        $match: { '_id': { $in: fldValue } }
+                                        $match: { '_id': { $in: fldValue_1 } }
                                     });
                                     unionPipeline.push({ $project: project });
                                     var unionObj = { coll: unionDetail.LookupObject, pipeline: unionPipeline };
@@ -1488,9 +1505,10 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                         }
                         db.collection(fieldSchema.LookupObject).aggregate(aggregateArry).toArray(function (err, data) {
                             if (err) {
-                                throw new Error(err.toString());
+                                // throw new Error(err.toString());
+                                errorHandler(fldValue_1, err);
                             }
-                            if (data && data.length > 0) {
+                            else if (data && data.length > 0) {
                                 fldLookupData_1 = data;
                                 updateObj[alias_1] = fldLookupData_1;
                             }
@@ -1499,13 +1517,13 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                         break;
                     case "dropdown":
                         if (fieldSchema.LookupObject) {
-                            aggregateArry.push({ $match: { _id: fldValue } });
+                            aggregateArry.push({ $match: { _id: fldValue_1 } });
                             aggregateArry.push({ $project: project });
                             db.collection(fieldSchema.LookupObject).aggregate(aggregateArry).toArray(function (err, data) {
                                 if (err) {
-                                    //not handel
+                                    errorHandler(fldValue_1, err);
                                 }
-                                if (data && data.length > 0) {
+                                else if (data && data.length > 0) {
                                     fldLookupData_1 = data[0];
                                     updateObj[alias_1] = fldLookupData_1;
                                 }
@@ -1521,12 +1539,12 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                             }
                             aggregateArry.push({ $unwind: { path: '$Data' } });
                             aggregateArry.push({ $project: { _id: 0, Key: '$Data.Key', Value: '$Data.Value', IsActive: '$Data.IsActive' } });
-                            aggregateArry.push({ $match: { 'Key': fldValue } });
+                            aggregateArry.push({ $match: { 'Key': fldValue_1 } });
                             db.collection('ListSchema').aggregate(aggregateArry).toArray(function (err, data) {
                                 if (err) {
-                                    //not handel
+                                    errorHandler(fldValue_1, err);
                                 }
-                                if (data && data.length > 0) {
+                                else if (data && data.length > 0) {
                                     fldLookupData_1 = data[0];
                                     updateObj[alias_1] = fldLookupData_1;
                                 }
@@ -1536,13 +1554,13 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                         break;
                     case "multiselect":
                         if (fieldSchema.LookupObject) {
-                            aggregateArry.push({ $match: { '_id': { $in: fldValue } } });
+                            aggregateArry.push({ $match: { '_id': { $in: fldValue_1 } } });
                             aggregateArry.push({ $project: project });
                             db.collection(fieldSchema.LookupObject).aggregate(aggregateArry).toArray(function (err, data) {
                                 if (err) {
-                                    //not handel
+                                    errorHandler(fldValue_1, err);
                                 }
-                                if (data && data.length > 0) {
+                                else if (data && data.length > 0) {
                                     fldLookupData_1 = data;
                                     updateObj[alias_1] = fldLookupData_1;
                                 }
@@ -1553,12 +1571,12 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                             aggregateArry.push({ $match: { 'Name': fieldSchema.ListSchemaName } });
                             aggregateArry.push({ $unwind: { path: '$Data' } });
                             aggregateArry.push({ $project: { _id: 0, Key: '$Data.Key', Value: '$Data.Value', IsActive: '$Data.IsActive' } });
-                            aggregateArry.push({ $match: { 'Key': { $in: fldValue } } });
+                            aggregateArry.push({ $match: { 'Key': { $in: fldValue_1 } } });
                             db.collection('ListSchema').aggregate(aggregateArry).toArray(function (err, data) {
                                 if (err) {
-                                    //not handel
+                                    errorHandler(fldValue_1, err);
                                 }
-                                if (data && data.length > 0) {
+                                else if (data && data.length > 0) {
                                     fldLookupData_1 = data;
                                     updateObj[alias_1] = fldLookupData_1;
                                 }
@@ -1569,14 +1587,14 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                     case "file":
                     case "image":
                         if (!fieldSchema.IsMultiple) {
-                            aggregateArry.push({ $match: { '_id': fldValue } });
+                            aggregateArry.push({ $match: { '_id': fldValue_1 } });
                             project['FileName'] = 1;
                             aggregateArry.push({ $project: project });
                             db.collection('Drive').aggregate(aggregateArry).toArray(function (err, data) {
                                 if (err) {
-                                    //not handel
+                                    errorHandler(fldValue_1, err);
                                 }
-                                if (data && data.length > 0) {
+                                else if (data && data.length > 0) {
                                     fldLookupData_1 = data[0];
                                     updateObj[alias_1] = fldLookupData_1;
                                 }
@@ -2032,7 +2050,7 @@ function FilterConditions(condition, match, fields) {
                             case "multiselect":
                                 if (field.Schema.LookupObject) {
                                     for (var i_7 = 0; i_7 < obj.Value.length; i_7++) {
-                                        obj.Value[i_7] = new mongodb_1.ObjectID(obj.Value[i_7]);
+                                        obj.Value[i_7] = new mongodb_1.ObjectId(obj.Value[i_7]);
                                     }
                                 }
                                 break;
@@ -2153,9 +2171,19 @@ function GirdHeaderFilters(filters, fields) {
             var matchValue = null;
             var fldName = field.UniqueID;
             if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
-                fldName += '_SearchValue';
+                //added by nirbhay on 12 apr 2022, added dropdown and multiselect for lookup and multilookup field
+                if (field.Schema.SearchType == 'dropdown') {
+                    matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+                }
+                else if (field.Schema.SearchType == 'multiselect') {
+                    matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+                }
+                else {
+                    fldName += '_SearchValue';
+                    matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
+                }
             }
-            if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
+            else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
                 if (field.Schema.LookupObject) {
                     matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
                 }
@@ -2178,6 +2206,10 @@ function GirdHeaderFilters(filters, fields) {
             else if (["decimal", "percent"].includes(field.Schema.UIDataType))
                 matchValue = { '$eq': mongodb_1.Decimal128.fromString(obj.Value) };
             else if (field.Schema.UIDataType == 'objectid')
+                matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+            else if (field.Schema.IsEqualAndCaseInsensitiveSearch === true)
+                matchValue = new RegExp('^' + obj.Value + '$', 'i');
+            else if (field.Schema.IsEqualSearch === true)
                 matchValue = { '$eq': obj.Value };
             else
                 matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
@@ -2258,7 +2290,7 @@ function AddLog(req, objectName, logAction, objLogProp, db, next) {
     logObj.Action = logAction;
     if (objLogProp.ObjectID)
         if (objLogProp.ObjectID.$oid) {
-            logObj.ObjectID = new mongodb_1.ObjectID(objLogProp.ObjectID.$oid);
+            logObj.ObjectID = new mongodb_1.ObjectId(objLogProp.ObjectID.$oid);
         }
         else {
             logObj.ObjectID = objLogProp.ObjectID;
@@ -2352,7 +2384,7 @@ caledar sharing settings : caledar sharing settings
 function GetMyTeamUsers(options, next) {
     var usersList = [];
     var db = options.db;
-    db.collection("Company").findOne({ '_id': new mongodb_1.ObjectID(options.CompanyID) }, function (error, result) {
+    db.collection("Company").findOne({ '_id': new mongodb_1.ObjectId(options.CompanyID) }, function (error, result) {
         if (result) {
             var calendarSetting = result.Setting;
             if (calendarSetting.CalendarShare == "private") {
@@ -2388,8 +2420,8 @@ function GetMyTeamUsers(options, next) {
                     pendingCalls_1 = pendingCalls_1 - 1;
                     db.collection("User").find({
                         $or: [
-                            { '_id': new mongodb_1.ObjectID(options.SupervisorID) },
-                            { 'SupervisorID': new mongodb_1.ObjectID(options.SupervisorID) }
+                            { '_id': new mongodb_1.ObjectId(options.SupervisorID) },
+                            { 'SupervisorID': new mongodb_1.ObjectId(options.SupervisorID) }
                         ],
                         'IsActive': true,
                         "MySettings.IsHideFromAllUsers": { $ne: true }
@@ -2434,7 +2466,7 @@ function GetMyTeamUsers(options, next) {
                     counter_2 = counter_2 + 1;
                     pendingCalls_2 = pendingCalls_2 - 1;
                     db.collection("User").find({
-                        'SupervisorID': new mongodb_1.ObjectID(options.SupervisorID),
+                        'SupervisorID': new mongodb_1.ObjectId(options.SupervisorID),
                         'IsActive': true,
                         "MySettings.IsHideFromAllUsers": { $ne: true }
                     }, { projection: { _id: 1, FirstName: 1, LastName: 1, UserStatus: 1 } }).toArray(function (error, result) {
@@ -2483,7 +2515,7 @@ function GetMyTeamUsers(options, next) {
 }
 exports.GetMyTeamUsers = GetMyTeamUsers;
 function ExtractChildUsersTree(userId, childUsersArray, usersTraversed, counter, db, onFetch) {
-    db.collection("User").find({ 'IsActive': true, 'SupervisorID': new mongodb_1.ObjectID(userId), "MySettings.IsHideFromAllUsers": { $ne: true } }, { projection: { _id: 1, FirstName: 1, LastName: 1, UserStatus: 1 } }).toArray(function (error, result) {
+    db.collection("User").find({ 'IsActive': true, 'SupervisorID': new mongodb_1.ObjectId(userId), "MySettings.IsHideFromAllUsers": { $ne: true } }, { projection: { _id: 1, FirstName: 1, LastName: 1, UserStatus: 1 } }).toArray(function (error, result) {
         if (error) {
             //res.json({ message: err.message, status: 'failed' })
         }
@@ -2550,7 +2582,7 @@ exports.VerifyAWSEmailConfig = VerifyAWSEmailConfig;
 function GenerateId(obj) {
     Object.keys(obj).forEach(function (key) {
         if (key == "_id" && obj[key] == "$id") {
-            obj[key] = new mongodb_1.ObjectID();
+            obj[key] = new mongodb_1.ObjectId();
         }
         else if (Array.isArray(obj[key])) {
             for (var i = 0; i < obj[key].length; i++) {
@@ -3906,15 +3938,16 @@ function GetDayIndex(day) {
 }
 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_3, objectIDs_1, modules_1, licenceDetail, moduleList, _loop_17, i, error_4;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _a.trys.push([0, 10, , 11]);
-                    return [4 /*yield*/, db.collection("User").findOne({ '_id': new mongodb_1.ObjectID(msp_d.ui), IsActive: true }, { projection: { 'LicenceDetail': 1 } })];
+                    _b.trys.push([0, 10, , 11]);
+                    return [4 /*yield*/, db.collection("User").findOne({ '_id': new mongodb_1.ObjectId(msp_d.ui), IsActive: true }, { projection: { 'LicenceDetail': 1 } })];
                 case 1:
-                    userData = _a.sent();
+                    userData = _b.sent();
                     if (!userData) {
                         return [2 /*return*/, { statusCode: 500, message: "User data not found.", data: {} }];
                     }
@@ -3922,11 +3955,11 @@ function GetUserProfile(msp_d, db, mdb, next) {
                         return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
                     }
                     userProfile_1 = undefined;
-                    _a.label = 2;
+                    _b.label = 2;
                 case 2:
-                    _a.trys.push([2, 4, , 5]);
+                    _b.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, db.collection("UserProfile").aggregate([
-                            { $match: { _id: new mongodb_1.ObjectID(msp_d.upi), IsActive: true } },
+                            { $match: { _id: new mongodb_1.ObjectId(msp_d.upi), IsActive: true } },
                             {
                                 $lookup: {
                                     from: "ModuleMaster",
@@ -3941,10 +3974,10 @@ function GetUserProfile(msp_d, db, mdb, next) {
                             { $project: { _id: 1, Name: 1, IsAdmin: 1, UserMenu: 1, Permissions: 1, ModuleList: 1, IsSystemDefine: 1 } },
                         ]).toArray()];
                 case 3:
-                    userProfile_1 = _a.sent();
+                    userProfile_1 = _b.sent();
                     return [3 /*break*/, 5];
                 case 4:
-                    error_3 = _a.sent();
+                    error_3 = _b.sent();
                     console.log('No Module provided to userprofile');
                     return [2 /*return*/, { statusCode: 500, message: "Your profile doesn't have any module access. Please contact your Administrator.", data: {} }];
                 case 5:
@@ -3960,7 +3993,7 @@ 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 = _a.sent();
+                    licenceDetail = _b.sent();
                     if (licenceDetail && licenceDetail.length > 0) {
                         licenceDetail.forEach(function (licence) {
                             modules_1 = modules_1.concat(licence.Modules);
@@ -3972,7 +4005,7 @@ function GetUserProfile(msp_d, db, mdb, next) {
                         if (userProfile_1[0].Permissions) {
                             _loop_17 = function (i) {
                                 userProfile_1[0].Permissions[i].ModuleData = moduleList.find(function (x) { return x._id == userProfile_1[0].Permissions[i].ModuleID; });
-                                if (userProfile_1[0].Permissions[i].Operations.includes("Control Panel")) {
+                                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);
                                 }
                             };
@@ -3993,7 +4026,7 @@ function GetUserProfile(msp_d, db, mdb, next) {
                 case 8: return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
                 case 9: return [3 /*break*/, 11];
                 case 10:
-                    error_4 = _a.sent();
+                    error_4 = _b.sent();
                     console.error("Internal Error in GetUserProfile Utility function : " + error_4);
                     next(error_4);
                     return [3 /*break*/, 11];
@@ -4183,7 +4216,7 @@ function ValidateSanitizeUserInput(inputFields, pageData) {
                     if (inputFields.hasOwnProperty(key)) {
                         val = inputFields[key];
                         //if (val !== null && (typeof val === 'object' || mongodb.ObjectID.isValid(val))) {
-                        if (val !== null && (typeof val === 'object' || mongodb_1.ObjectID.isValid(val))) {
+                        if (val !== null && (typeof val === 'object' || mongodb_1.ObjectId.isValid(val))) {
                             inputItem[key] = val;
                         }
                         else {
@@ -4243,7 +4276,7 @@ function CreateBanquetingVATSettingsData(msp_d, db, sdata, next) {
             switch (_b.label) {
                 case 0:
                     _b.trys.push([0, 6, , 7]);
-                    userID = new mongodb_1.ObjectID(msp_d.ui);
+                    userID = new mongodb_1.ObjectId(msp_d.ui);
                     return [4 /*yield*/, db.collection('ObjectSchema').findOne({ Name: "BanquetingVATSettings" })];
                 case 1:
                     schemaData = _b.sent();
@@ -4291,7 +4324,7 @@ function CheckReportFolderAccess(report, db, msp_d, folderActiveStatus) {
             switch (_a.label) {
                 case 0:
                     shareFolderIds = [];
-                    userID = new mongodb_1.ObjectID(msp_d.ui);
+                    userID = new mongodb_1.ObjectId(msp_d.ui);
                     FolderList = [];
                     return [4 /*yield*/, db.collection('User').findOne({ _id: userID }, { projection: { MySettings: 1 } })];
                 case 1:

package/dist/logs/auditlog.js

@@ -569,7 +569,7 @@ var checkForLookupAndListSchema = function (object, key, schema, restoredObject,
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    objectid = mongodb_1.default.ObjectID;
+                    objectid = mongodb_1.default.ObjectId;
                     if (!(schema.find(function (o) { return o.Name == key && o.LookupFields && o.LookupFields.length > 0; }) && key !== 'Tag')) return [3 /*break*/, 1];
                     objSchema = schema.find(function (o) { return o.Name == key; });
                     schemalookupfieldsDisplayValue_1 = objSchema.LookupFields;
@@ -660,7 +660,7 @@ var checkForLookupAndListSchema = function (object, key, schema, restoredObject,
                     if (!(key == 'CreatedBy' && objectid.isValid(object[key]) || key == 'ModifiedBy' && objectid.isValid(object[key]))) return [3 /*break*/, 11];
                     db = global['dbConnections'][req.DBName];
                     return [4 /*yield*/, db.collection('User').findOne({
-                            _id: new mongodb_1.default.ObjectID(object[key])
+                            _id: new mongodb_1.default.ObjectId(object[key])
                         })];
                 case 10:
                     UserInfo = _a.sent();
@@ -808,8 +808,8 @@ var mapAttendeToContactAndUser = function (attendee, key, filterdObj, db) {
             switch (_a.label) {
                 case 0:
                     Users = [];
-                    (attendee.Id) ? Users.push(new mongodb_1.default.ObjectID(attendee.Id)) : '';
-                    (attendee.InvitedBy) ? Users.push(new mongodb_1.default.ObjectID(attendee.InvitedBy)) : '';
+                    (attendee.Id) ? Users.push(new mongodb_1.default.ObjectId(attendee.Id)) : '';
+                    (attendee.InvitedBy) ? Users.push(new mongodb_1.default.ObjectId(attendee.InvitedBy)) : '';
                     return [4 /*yield*/, db.collection('ViewAttendee').find({ _id: { $in: Users } }, { projection: { Name: 1 } }).toArray()];
                 case 1:
                     alluserInfo = _a.sent();
@@ -904,7 +904,7 @@ var mapDriveFolderIdToFolderName = function (driveObj, db) {
                     driveObj['FolderName'] = driveObj.FolderId;
                     delete driveObj.FolderId;
                     return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, db.collection('Drive').findOne({ _id: new mongodb_1.default.ObjectID(driveObj.FolderId) }, { projection: { FileName: 1, _id: 0 } })];
+                case 1: return [4 /*yield*/, db.collection('Drive').findOne({ _id: new mongodb_1.default.ObjectId(driveObj.FolderId) }, { projection: { FileName: 1, _id: 0 } })];
                 case 2:
                     parentFolderName = _a.sent();
                     delete driveObj.FolderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.264",
+  "version": "1.0.267",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -22,12 +22,12 @@
     "aws-sdk": "^2.786.0",
     "axios": "^0.21.1",
     "bson": "^4.2.0",
-    "exceljs": "^4.2.1",
+    "exceljs": "^4.3.0",
     "express": "^4.17.1",
     "express-validator": "^6.9.2",
     "geoip-lite": "^1.4.2",
     "ioredis": "^4.17.3",
-    "libphonenumber-js": "^1.9.23",
+    "libphonenumber-js": "^1.9.51",
     "moment": "^2.25.3",
     "moment-timezone": "^0.5.27",
     "mongo-sanitize": "^1.1.0",