@optimiser/common 1.0.308 → 1.0.309

package/dist/lib/utility.js

@@ -2130,6 +2130,7 @@ function FilterConditions(condition, match, fields) {
             sets = match.$or;
         }
         var _loop_13 = function (i) {
+            var _a, _b, _c;
             var obj = condition.Filters[i];
             if (obj.Type == "Child") {
                 var childMatch = {};
@@ -2178,6 +2179,8 @@ function FilterConditions(condition, match, fields) {
                                 break;
                         }
                     }
+                    // Or Condition code in NOT_CONTAINS filter was added by Shahzaib for QPC-6368
+                    var orCondInNotContains = void 0;
                     // Below If condition added by Nidhi - QPC-5338
                     if (field.Schema.UIDataType === 'date' || field.Schema.UIDataType === 'datetime') {
                         var operator = obj.Operator;
@@ -2187,7 +2190,7 @@ function FilterConditions(condition, match, fields) {
                             endCompareDate = moment_1.default((_b = obj.Value) === null || _b === void 0 ? void 0 : _b.To, "DD-MMM-YYYY").endOf('day');
                         }
                         else {
-                            var _a = helper_1.GetDateRangeFromOperatorValue(operator, obj.FiscalMonth, obj.FiscalFrom), startDate = _a.startDate, endDate = _a.endDate;
+                            var _d = helper_1.GetDateRangeFromOperatorValue(operator, obj.FiscalMonth, obj.FiscalFrom), startDate = _d.startDate, endDate = _d.endDate;
                             startCompareDate = moment_1.default(startDate, "DD-MMM-YYYY").startOf('day');
                             endCompareDate = moment_1.default(endDate, "DD-MMM-YYYY").endOf('day');
                         }
@@ -2210,8 +2213,14 @@ function FilterConditions(condition, match, fields) {
                                 else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType) || field.Schema.SearchType == 'multiselect') {
                                     matchValue = { '$nin': obj.Value };
                                 }
-                                else
-                                    matchValue = { '$regex': '^((?!' + obj.Value + ').)*$', '$options': 'i' };
+                                else {
+                                    // Or Condition code in NOT_CONTAINS filter was added by Shahzaib for QPC-6368
+                                    orCondInNotContains = [
+                                        (_a = {}, _a[fldName] = { '$regex': '^((?!' + obj.Value + ').)*$', '$options': 'i' }, _a),
+                                        (_b = {}, _b[fldName] = { $exists: false }, _b),
+                                        (_c = {}, _c[fldName] = { '$in': [null, ''] }, _c)
+                                    ];
+                                }
                                 break;
                             case "EQUAL":
                                 if (obj.Value === '')
@@ -2292,7 +2301,13 @@ function FilterConditions(condition, match, fields) {
                         }
                     }
                     var fieldMatch = {};
-                    fieldMatch[fldName] = matchValue;
+                    // Below only if condition part was added by Shahzaib for QPC-6368
+                    if (obj.Operator == 'NOT_CONTAINS' && (orCondInNotContains === null || orCondInNotContains === void 0 ? void 0 : orCondInNotContains.length) > 0) {
+                        fieldMatch.$or = orCondInNotContains;
+                    }
+                    else {
+                        fieldMatch[fldName] = matchValue;
+                    }
                     sets.push(fieldMatch);
                 }
             }

package/package.json

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