@optimiser/common 1.0.446 → 1.0.447

package/dist/lib/utility.js

@@ -4661,11 +4661,11 @@ 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_5, objectIDs_1, modules_1, licenceDetail_1, companyLevelLicenceDetail, moduleList, _loop_17, i, error_6;
+        var userData, userProfile_1, error_5, objectIDs_1, modules_1, licenceDetail_1, companyLevelLicenceAll, companylicenceDetail_1, companyLevelLicenceDetail, moduleList, _loop_17, i, error_6;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _b.trys.push([0, 11, , 12]);
+                    _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();
@@ -4705,7 +4705,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*/, 9];
+                    if (!(userData.LicenceDetail && userData.LicenceDetail.length > 0)) return [3 /*break*/, 10];
                     objectIDs_1 = [];
                     userData.LicenceDetail.forEach(function (licenceDetail) {
                         if (licenceDetail.Status == "active")
@@ -4715,9 +4715,13 @@ 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_1 = _b.sent();
-                    return [4 /*yield*/, mdb.collection("Licences").find({ "IsCompanyLevelLicence": true, "Status": "active", "IsActive": true }, { projection: { Modules: 1 } }).toArray()];
+                    return [4 /*yield*/, mdb.collection("Licences").find({ "IsCompanyLevelLicence": true, "Status": "active", "IsActive": true }, { projection: { Modules: 1, LicenceName: 1, LicenceType: 1 } }).toArray()];
                 case 8:
-                    companyLevelLicenceDetail = _b.sent();
+                    companyLevelLicenceAll = _b.sent();
+                    return [4 /*yield*/, mdb.collection("CompanyLicence").find({ 'CompanyID': userData.CompanyID, 'Status': 'active', 'IsActive': true }).toArray()];
+                case 9:
+                    companylicenceDetail_1 = _b.sent();
+                    companyLevelLicenceDetail = companyLevelLicenceAll.filter(function (x) { return companylicenceDetail_1.some(function (y) { return x.LicenceName === y.LicenceName && x.LicenceType === y.LicenceType; }); });
                     if (companyLevelLicenceDetail && companyLevelLicenceDetail.length > 0) {
                         companyLevelLicenceDetail.map(function (x) {
                             var _a;
@@ -4754,15 +4758,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*/, 10];
-                case 9: return [2 /*return*/, { statusCode: 200, message: "There is no licence assigned to this user, please contact your administrator.", data: {} }];
-                case 10: return [3 /*break*/, 12];
-                case 11:
+                    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_6 = _b.sent();
                     console.error("Internal Error in GetUserProfile Utility function : ".concat(error_6));
                     next(error_6);
-                    return [3 /*break*/, 12];
-                case 12: 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.446",
+  "version": "1.0.447",
   "description": "",
   "main": "dist/index.js",
   "scripts": {