@optimiser/common 1.0.280 → 1.0.283

package/dist/lib/utility.js

@@ -1797,9 +1797,7 @@ function BuildGridFieldProjection(project, field, group) {
             project[fldName] = 1;
             project[alias] = 1;
             for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                // 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] }, [" "]] });
+                searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
                 if (i < field.Schema.LookupFields.length - 1) {
                     searchConcatArry.push([" "]);
                 }
@@ -1810,7 +1808,8 @@ function BuildGridFieldProjection(project, field, group) {
                 $reduce: {
                     input: { $concatArrays: searchConcatArry },
                     initialValue: "",
-                    in: { $concat: ["$$value", "$$this"] }
+                    //in: { $concat: ["$$value", "$$this"] }        // Commented by and below line was added by Shahzaib, make int to string 
+                    in: { $concat: ["$$value", { $toString: "$$this" }] }
                 }
             };
             break;
@@ -1840,9 +1839,7 @@ function BuildGridFieldProjection(project, field, group) {
             project[alias] = 1;
             if (field.Schema.LookupObject) {
                 for (var i = 0; i < field.Schema.LookupFields.length; i++) {
-                    // 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] }, [" "]] });
+                    searchConcatArry.push({ "$ifNull": ['$' + alias + '.' + field.Schema.LookupFields[i], [" "]] });
                     if (i < field.Schema.LookupFields.length - 1) {
                         searchConcatArry.push([" "]);
                     }
@@ -3994,12 +3991,12 @@ 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;
+        var userData, userProfile_1, error_3, objectIDs_1, modules_1, licenceDetail, companylicenceDetail, receptionLicense, moduleList, _loop_17, i, error_4;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _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 } })];
+                    _b.trys.push([0, 12, , 13]);
+                    return [4 /*yield*/, db.collection("User").findOne({ '_id': new mongodb_1.ObjectId(msp_d.ui), IsActive: true }, { projection: { 'LicenceDetail': 1, 'CompanyID': 1 } })];
                 case 1:
                     userData = _b.sent();
                     if (!userData) {
@@ -4038,7 +4035,7 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     if (!(!userProfile_1 || userProfile_1.length <= 0)) return [3 /*break*/, 6];
                     return [2 /*return*/, { statusCode: 500, message: "User's profile data not found.", data: {} }];
                 case 6:
-                    if (!(userData.LicenceDetail && userData.LicenceDetail.length > 0)) return [3 /*break*/, 8];
+                    if (!(userData.LicenceDetail && userData.LicenceDetail.length > 0)) return [3 /*break*/, 10];
                     objectIDs_1 = [];
                     userData.LicenceDetail.forEach(function (licenceDetail) {
                         if (licenceDetail.Status == "active")
@@ -4048,6 +4045,22 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     return [4 /*yield*/, mdb.collection("Licences").find({ '_id': { $in: objectIDs_1 }, 'Status': 'active', 'IsActive': true }).toArray()];
                 case 7:
                     licenceDetail = _b.sent();
+                    if (!(userData && userData.CompanyID)) return [3 /*break*/, 9];
+                    return [4 /*yield*/, mdb.collection("CompanyLicence").find({ 'CompanyID': userData.CompanyID, 'Status': 'active', 'IsActive': true }).toArray()];
+                case 8:
+                    companylicenceDetail = _b.sent();
+                    if (companylicenceDetail && companylicenceDetail.length > 0) {
+                        receptionLicense = companylicenceDetail.find(function (licence) { return licence.LicenceName === "Reception" && licence.LicenceType === "App"; });
+                        if (receptionLicense) {
+                            licenceDetail.push({
+                                "Modules": [
+                                    "reception"
+                                ]
+                            });
+                        }
+                    }
+                    _b.label = 9;
+                case 9:
                     if (licenceDetail && licenceDetail.length > 0) {
                         licenceDetail.forEach(function (licence) {
                             modules_1 = modules_1.concat(licence.Modules);
@@ -4076,15 +4089,15 @@ function GetUserProfile(msp_d, db, mdb, next) {
                     else {
                         return [2 /*return*/, { statusCode: 200, message: "Licence data is not found in Master database.", data: {} }];
                     }
-                    return [3 /*break*/, 9];
-                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:
+                    return [3 /*break*/, 11];
+                case 10: return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
+                case 11: return [3 /*break*/, 13];
+                case 12:
                     error_4 = _b.sent();
                     console.error("Internal Error in GetUserProfile Utility function : " + error_4);
                     next(error_4);
-                    return [3 /*break*/, 11];
-                case 11: return [2 /*return*/];
+                    return [3 /*break*/, 13];
+                case 13: return [2 /*return*/];
             }
         });
     });

package/package.json

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