@optimiser/common 1.0.283 → 1.0.286

package/dist/constants.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     LookupAlias: string;
     LookupTypeFields: string[];
+    SearchValueAlias: string;
     USER_STATUS: {
         ACTIVE: string;
         SUSPEND: string;

package/dist/constants.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     LookupAlias: '_LookupData',
     LookupTypeFields: ["lookup", "multilookup", "dropdown", "multiselect", "file", "image"],
+    SearchValueAlias: '_SearchValue',
     USER_STATUS: {
         ACTIVE: 'Active',
         SUSPEND: 'Suspend',

package/dist/lib/utility.d.ts

@@ -28,6 +28,9 @@ declare function SyncFieldInSameCollection(objectName: string, objectIDs: Object
 declare function SyncFieldInSameCollectionByObjectID(objectName: string, objectID: ObjectId, db: Db): void;
 declare function SyncFieldInSameCollectionByObjectIDWithPromise(objectName: string, objectID: ObjectId, db: Db): Promise<any>;
 declare function SyncFieldInOtherCollection(syncFields: AnyObjectInterface[], db: Db): Promise<any>;
+/** Special Note: Need to create seachValue for it in QPC-6169.
+    I've not done yet, cause it was not calling from anywhere.
+*/
 declare function SyncUserInOtherCollection(options: AnyObjectInterface, db: Db, callback: callBackInterface, next: NextFunction): void;
 declare function BuildLookupDataField(fieldSchema: AnyObjectInterface, updateObj: AnyObjectInterface, db: Db): Promise<void>;
 declare function CheckDataBeforeAdd(updateObj: AnyObjectInterface, objectSchema: AnyObjectInterface, db: Db): Promise<void>;
@@ -224,7 +227,8 @@ declare function GetMailFromString(fromUser: string): string;
 /**
  * TODO: Return On behalf String in Calendar Invitation mails
  * @param fromUser  From User Name
+ * @param fromEmail  From User Email
  * @returns string
  */
-declare function InvitationMailReplyContent(fromUser: string): string;
+declare function InvitationMailReplyContent(fromUser: string, fromEmail: string): string;
 export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, FieldsGridHeaderFilters, AddLog, CheckFilterFieldsProjection, VerifyEmailPassword, GetMyTeamUsers, ExtractChildUsersTree, GetMaxKeyValueListSchema, VerifyAWSEmailConfig, GenerateId, SyncUserDetailsWithMasterDB, SignoutUserFromAllDevices, SignoutUsersWithPromise, SignoutMultipleUsersFromAllDevices, UserLicenseConsumeCalculate, sendMailWithUserAccount, GetEmailClientConfigs, GetCompanyEncryptionKey, ExecuteDynamicDMLQuery, ExecuteDynamicDQLQuery, GetUserProfilePermissions, MakeUserPasswordInvalid, ConvertJsonToXLXS, SendResetPasswordMail, SendMailToSupport, MailTemplateStructure, SendMailToCustomer, parseMSPCookie, GetIPDetailsFromReq, isEmptyObj, SyncListSchemaFieldInOtherCollection, UpdateTagCountAfterDelete, SyncTagCountAfterUpdate, ReactivateFieldInOtherCollection, SyncUserLicenceConsumedCount, BroadCastEventToAllCompanyUsers, CheckDataPermission, SyncCompanyLicenceInMasterCompanyAfterAdd, NextServiceDateForDashboard, CheckDateNotInPast, GetWeekDayByDayAndOccurance, GetInterValFromOccurance, GetWeekDayInfoInMonth, GetDayIndex, RemoveFieldsFromFilters, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, ValidateSanitizeUserInput, CreateBanquetingVATSettingsData, CheckReportFolderAccess, GetMailFromString, InvitationMailReplyContent };

package/dist/lib/utility.js

@@ -1020,7 +1020,7 @@ function SyncFieldInSameCollection(objectName, objectIDs, db) {
                                     }
                                     db.collection(objectName).find(findObj).forEach(function (objectData) {
                                         return __awaiter(this, void 0, void 0, function () {
-                                            var updateObj, i, fieldSchema, lookupData, ex_1;
+                                            var updateObj, i, fieldSchema, lookupData, searchValue, ex_1;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -1038,8 +1038,13 @@ function SyncFieldInSameCollection(objectName, objectIDs, db) {
                                                     case 3:
                                                         _a.sent();
                                                         lookupData = objectData[fieldSchema.Name + constants_1.default.LookupAlias];
-                                                        if (lookupData !== undefined)
+                                                        if (lookupData !== undefined) {
                                                             updateObj[fieldSchema.Name + constants_1.default.LookupAlias] = lookupData;
+                                                        }
+                                                        searchValue = objectData[fieldSchema.Name + constants_1.default.SearchValueAlias];
+                                                        if (searchValue !== undefined) {
+                                                            updateObj[fieldSchema.Name + constants_1.default.SearchValueAlias] = searchValue;
+                                                        }
                                                         _a.label = 4;
                                                     case 4:
                                                         i++;
@@ -1095,7 +1100,7 @@ function SyncFieldInSameCollectionByObjectID(objectName, objectID, db) {
             if (fieldArr_2) {
                 db.collection(objectName).findOne({ '_id': objectID }, function (err, objectData) {
                     return __awaiter(this, void 0, void 0, function () {
-                        var updateObj, i, fieldSchema, lookupData;
+                        var updateObj, i, fieldSchema, lookupData, searchValue;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -1110,8 +1115,13 @@ function SyncFieldInSameCollectionByObjectID(objectName, objectID, db) {
                                 case 2:
                                     _a.sent();
                                     lookupData = objectData[fieldSchema.Name + constants_1.default.LookupAlias];
-                                    if (lookupData !== undefined)
+                                    if (lookupData !== undefined) {
                                         updateObj[fieldSchema.Name + constants_1.default.LookupAlias] = lookupData;
+                                    }
+                                    searchValue = objectData[fieldSchema.Name + constants_1.default.SearchValueAlias];
+                                    if (searchValue !== undefined) {
+                                        updateObj[fieldSchema.Name + constants_1.default.SearchValueAlias] = searchValue;
+                                    }
                                     _a.label = 3;
                                 case 3:
                                     i++;
@@ -1140,7 +1150,7 @@ function SyncFieldInSameCollectionByObjectIDWithPromise(objectName, objectID, db
                 if (fieldArr_3) {
                     db.collection(objectName).findOne({ '_id': objectID }, function (err, objectData) {
                         return __awaiter(this, void 0, void 0, function () {
-                            var updateObj, i, fieldSchema, lookupData;
+                            var updateObj, i, fieldSchema, lookupData, searchValue;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -1155,8 +1165,13 @@ function SyncFieldInSameCollectionByObjectIDWithPromise(objectName, objectID, db
                                     case 2:
                                         _a.sent();
                                         lookupData = objectData[fieldSchema.Name + constants_1.default.LookupAlias];
-                                        if (lookupData !== undefined)
+                                        if (lookupData !== undefined) {
                                             updateObj[fieldSchema.Name + constants_1.default.LookupAlias] = lookupData;
+                                        }
+                                        searchValue = objectData[fieldSchema.Name + constants_1.default.SearchValueAlias];
+                                        if (searchValue !== undefined) {
+                                            updateObj[fieldSchema.Name + constants_1.default.SearchValueAlias] = searchValue;
+                                        }
                                         _a.label = 3;
                                     case 3:
                                         i++;
@@ -1188,6 +1203,7 @@ function SyncFieldInSameCollectionByObjectIDWithPromise(objectName, objectID, db
     });
 }
 exports.SyncFieldInSameCollectionByObjectIDWithPromise = SyncFieldInSameCollectionByObjectIDWithPromise;
+//** SyncFieldInOtherCollection function is moved in fieldlistener service by Satyam */
 //Sync field in other collection after update
 function SyncFieldInOtherCollection(syncFields, db) {
     var _this = this;
@@ -1306,6 +1322,9 @@ exports.SyncFieldInOtherCollection = SyncFieldInOtherCollection;
 /*Sync user in other collection after replace user
  *this function is used in /replaceuser api
 */
+/** Special Note: Need to create seachValue for it in QPC-6169.
+    I've not done yet, cause it was not calling from anywhere.
+*/
 function SyncUserInOtherCollection(options, db, callback, next) {
     var userData = options.userData;
     var msp_d = options.msp_d;
@@ -1454,6 +1473,7 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
             var fldName = fieldSchema.Name;
             var fldValue_1 = updateObj[fldName];
             var alias_1 = fldName + constants_1.default.LookupAlias;
+            var searchAlias_1 = fldName + constants_1.default.SearchValueAlias;
             var fldLookupData_1 = null;
             if (fldValue_1) {
                 var aggregateArry = [];
@@ -1495,6 +1515,22 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                             else if (data && data.length > 0) {
                                 fldLookupData_1 = data[0];
                                 updateObj[alias_1] = fldLookupData_1;
+                                //** Below code is added by Shahzaib on 05/09/2022 to create SearchValue */
+                                var result = '';
+                                if (fieldSchema.LookupFields != undefined) {
+                                    var _loop_10 = function (j) {
+                                        if (fieldSchema.ExcludeLookupFieldsOnSearch && fieldSchema.ExcludeLookupFieldsOnSearch.filter(function (x) { return x == fieldSchema.LookupFields[j]; }).length != 0) {
+                                            return "continue";
+                                        }
+                                        if (fldLookupData_1[fieldSchema.LookupFields[j]] != undefined)
+                                            result += fldLookupData_1[fieldSchema.LookupFields[j]].toString() + ' ';
+                                    };
+                                    for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
+                                        _loop_10(j);
+                                    }
+                                }
+                                updateObj[searchAlias_1] = result === null || result === void 0 ? void 0 : result.trim();
+                                //** Ends here */
                             }
                             resolve();
                         });
@@ -1524,6 +1560,19 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                             else if (data && data.length > 0) {
                                 fldLookupData_1 = data;
                                 updateObj[alias_1] = fldLookupData_1;
+                                //** Below code is added by Shahzaib on 05/09/2022 to create SearchValue */
+                                var result = '';
+                                for (var i = 0; i < data.length; i++) {
+                                    var lookupRecord = data[i];
+                                    if (fieldSchema.LookupFields != undefined) {
+                                        for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
+                                            if (lookupRecord[fieldSchema.LookupFields[j]] != undefined)
+                                                result += lookupRecord[fieldSchema.LookupFields[j]].toString() + ' ';
+                                        }
+                                    }
+                                }
+                                updateObj[searchAlias_1] = result === null || result === void 0 ? void 0 : result.trim();
+                                //** Ends here */
                             }
                             resolve();
                         });
@@ -1625,6 +1674,10 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
             }
             else {
                 updateObj[alias_1] = fldLookupData_1;
+                // Below if cond was added by Shahzaib on 05/09/2022
+                if (fieldSchema.UIDataType == 'lookup' || fieldSchema.UIDataType == 'multilookup') {
+                    updateObj[searchAlias_1] = fldLookupData_1;
+                }
                 resolve();
             }
         }
@@ -1637,11 +1690,11 @@ exports.BuildLookupDataField = BuildLookupDataField;
 //CheckDataBeforeAdd it sync object before add
 function CheckDataBeforeAdd(updateObj, objectSchema, db) {
     return __awaiter(this, void 0, void 0, function () {
-        var _loop_10, _i, _a, fldName;
+        var _loop_11, _i, _a, fldName;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _loop_10 = function (fldName) {
+                    _loop_11 = function (fldName) {
                         var fieldSchema, sequenceDocument, val, j, item, num;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -1687,7 +1740,7 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                 case 1:
                     if (!(_i < _a.length)) return [3 /*break*/, 4];
                     fldName = _a[_i];
-                    return [5 /*yield**/, _loop_10(fldName)];
+                    return [5 /*yield**/, _loop_11(fldName)];
                 case 2:
                     _b.sent();
                     _b.label = 3;
@@ -1703,11 +1756,11 @@ exports.CheckDataBeforeAdd = CheckDataBeforeAdd;
 //CheckDataBeforeAdd it sync object before update
 function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
     return __awaiter(this, void 0, void 0, function () {
-        var _loop_11, _i, _a, fldName;
+        var _loop_12, _i, _a, fldName;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _loop_11 = function (fldName) {
+                    _loop_12 = function (fldName) {
                         var fieldSchema, oldValue, newValue, isSame;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -1750,7 +1803,7 @@ function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
                 case 1:
                     if (!(_i < _a.length)) return [3 /*break*/, 4];
                     fldName = _a[_i];
-                    return [5 /*yield**/, _loop_11(fldName)];
+                    return [5 /*yield**/, _loop_12(fldName)];
                 case 2:
                     _b.sent();
                     _b.label = 3;
@@ -1769,50 +1822,55 @@ function BuildGridFieldProjection(project, field, group) {
     if (group && group.IsRealLookup)
         fldName = group.Name + '.' + fldName;
     var alias;
+    var searchAlias = fldName + constants_1.default.SearchValueAlias;
     var searchConcatArry = [];
     switch (field.Schema.UIDataType) {
+        // below code was added by Shahzaib on 05/09/2022
         case "lookup":
-            alias = fldName + constants_1.default.LookupAlias;
-            project[fldName] = 1;
-            project[alias] = 1;
-            var _loop_12 = function (i) {
-                if (field.Schema.ExcludeLookupFieldsOnSearch && field.Schema.ExcludeLookupFieldsOnSearch.filter(function (x) { return x == field.Schema.LookupFields[i]; }).length != 0) {
-                    return "continue";
-                }
-                // searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
-                // added by Shahzaib, make int to string and concat  
-                searchConcatArry.push({ "$ifNull": [{ $toString: '$' + alias + '.' + field.Schema.LookupFields[i] }, ""] });
-                if (i < field.Schema.LookupFields.length - 1) {
-                    searchConcatArry.push(" ");
-                }
-            };
-            for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                _loop_12(i);
-            }
-            ;
-            project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
-            break;
         case "multilookup":
             alias = fldName + constants_1.default.LookupAlias;
             project[fldName] = 1;
             project[alias] = 1;
-            for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
-                if (i < field.Schema.LookupFields.length - 1) {
-                    searchConcatArry.push([" "]);
-                }
-            }
-            ;
-            //project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
-            project[fldName + '_SearchValue'] = {
-                $reduce: {
-                    input: { $concatArrays: searchConcatArry },
-                    initialValue: "",
-                    //in: { $concat: ["$$value", "$$this"] }        // Commented by and below line was added by Shahzaib, make int to string 
-                    in: { $concat: ["$$value", { $toString: "$$this" }] }
-                }
-            };
+            project[searchAlias] = 1;
             break;
+        // Below code was commented by Shahzaib on 05/09/2022, searchAlias was added instead of it.
+        // case "lookup":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //         if (field.Schema.ExcludeLookupFieldsOnSearch && field.Schema.ExcludeLookupFieldsOnSearch.filter((x: AnyObjectInterface) => x == field.Schema.LookupFields[i]).length != 0) {
+        //             continue;
+        //         }
+        //         // searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], ""] });
+        //         // added by Shahzaib, make int to string and concat  
+        //         searchConcatArry.push({ "$ifNull": [{$toString : '$' + alias + '.' + field.Schema.LookupFields[i]}, ""] });
+        //         if (i < field.Schema.LookupFields.length - 1) {
+        //             searchConcatArry.push(" ");
+        //         }
+        //     };
+        //     project[fldName + '_SearchValue'] = { $concat: searchConcatArry };
+        //     break;
+        // case "multilookup":
+        //     alias = fldName + constants.LookupAlias;
+        //     project[fldName] = 1;
+        //     project[alias] = 1;
+        //     for (let i = 0; i < field.Schema.LookupFields.length; i++) {
+        //         searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
+        //         if (i < field.Schema.LookupFields.length - 1) {
+        //             searchConcatArry.push([" "]);
+        //         }
+        //     };
+        //     //project[fldName + '_SearchValue'] = { $concatArrays: searchConcatArry };
+        //     project[fldName + '_SearchValue'] = {
+        //         $reduce: {
+        //             input: { $concatArrays: searchConcatArry },
+        //             initialValue: "",
+        //             //in: { $concat: ["$$value", "$$this"] }        // Commented by and below line was added by Shahzaib, make int to string 
+        //             in: { $concat: ["$$value", { $toString : "$$this" }] }
+        //         }
+        //     };
+        //     break;
         case "dropdown":
             alias = fldName + constants_1.default.LookupAlias;
             project[fldName] = 1;
@@ -4435,9 +4493,10 @@ exports.GetMailFromString = GetMailFromString;
 /**
  * TODO: Return On behalf String in Calendar Invitation mails
  * @param fromUser  From User Name
+ * @param fromEmail  From User Email
  * @returns string
  */
-function InvitationMailReplyContent(fromUser) {
-    return "Please do not 'reply' to this email as it is an automated message and replies are routed to an unmonitored mailbox.  If you wish to propose an alternative time, or send a message, please contact " + fromUser + " directly.";
+function InvitationMailReplyContent(fromUser, fromEmail) {
+    return "Please do not 'reply' to this email as it is an automated message and replies are routed to an unmonitored mailbox. If you wish to propose an alternative time or send a message, please contact " + fromUser + " at " + fromEmail + " directly.";
 }
 exports.InvitationMailReplyContent = InvitationMailReplyContent;

package/package.json

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