Merge pull request #9 from AParks/fix-not-exists

fix null matching on objects with null id
ZengineHQ · Mar 13, 2018 · 8035beb · 8035beb
2 parents ef01e35 + 694bd71
commit 8035beb
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -308,7 +308,9 @@ var znFilterMatcher = (function() {
 			} else if (recordValue.id !== undefined) {
 				recordValue = recordValue.id;
 			}
-		} else if (recordValue === null || recordValue === undefined) {
+		}
+
+		if (recordValue === null || recordValue === undefined) {
 			return '';
 		}
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zn-filter-matcher",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Zengine Filter Matcher",
   "main": "index.js",
   "scripts": {

diff --git a/tests/index-spec.js b/tests/index-spec.js
@@ -66,6 +66,27 @@ describe('znFilterMatcher', function() {
 
 			});
 
+			it('should return true with null object', function() {
+
+				record.field1 = {
+					id: null,
+					name: null
+				};
+
+				filter = {
+					and: [
+						{
+							prefix: '',
+							attribute: 'field1',
+							value: null
+						}
+					]
+				};
+
+				expect(znFilterMatcher.recordMatchesFilter(record, filter)).toBe(true);
+
+			});
+
 		});
 
 		/**
@@ -117,6 +138,27 @@ describe('znFilterMatcher', function() {
 
 			});
 
+			it('should return true with null object', function() {
+
+				record.field1 = {
+					id: null,
+					name: null
+				};
+
+				filter = {
+					and: [
+						{
+							prefix: 'not',
+							attribute: 'field1',
+							value: 'null'
+						}
+					]
+				};
+
+				expect(znFilterMatcher.recordMatchesFilter(record, filter)).toBe(false);
+
+			});
+
 		});
 
 		/**