@balena/odata-parser 2.4.1 → 2.4.2

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Test that `/$count` works with a `$filter`containing an 'and'
+      hash: cda0a1a54b2830cd393240dd5dddf1e4b42877c4
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+  version: 2.4.2
+  title: ""
+  date: 2022-11-03T09:07:24.960Z
 - commits:
     - subject: Switch from balenaCI to flowzone
       hash: 3e0435348860242b9252c2725427a42e28925b4f
@@ -8,7 +19,7 @@
       author: Pagan Gazzard
   version: 2.4.1
   title: ""
-  date: 2022-10-14T16:21:02.394Z
+  date: 2022-10-14T16:23:39.381Z
 - commits:
     - subject: Add support for `/$count` with nested `$filter` in $orderby & $orderby
       hash: 350c08b3a8a8877290f1c753a57e86404f0d9548

package/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v2.4.2
+## (2022-11-03)
+
+* Test that `/$count` works with a `$filter`containing an 'and' [Thodoris Greasidis]
+
 # v2.4.1
 ## (2022-10-14)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -42,6 +42,6 @@
     "_": "test/run.js"
   },
   "versionist": {
-    "publishedAt": "2022-10-14T16:21:02.571Z"
+    "publishedAt": "2022-11-03T09:07:25.110Z"
   }
 }

package/test/filterby.js

@@ -422,16 +422,16 @@ export default function (test) {
 
 			it('count options are present on the Product count', () => {
 				assert.notEqual(result.options.$filter[1].options, null);
-				console.log('***', result.options.$filter[1].options);
 			});
 
 			it('A filter should be present on the Product count lhs', () =>
 				assert.notEqual(result.options.$filter[1].options.$filter, null));
 
-			it(`has a Product count filter that is an instance of 'ge'`, () =>
-				assert.equal(result.options.$filter[1].options.$filter[0], 'lt'));
+			it(`has a Product count filter that is an instance of 'lt'`, () => {
+				assert.equal(result.options.$filter[1].options.$filter[0], 'lt');
+			});
 
-			it(`has an lhs on the Product count filter that is an instance of 'ge'`, () => {
+			it(`has an lhs on the Product count filter that is 'Price'`, () => {
 				expect(result.options.$filter[1].options.$filter[1])
 					.to.have.property('name')
 					.that.equals('Price');
@@ -443,8 +443,54 @@ export default function (test) {
 					.that.equals(0);
 			});
 
-			it('rhr should be $1', () =>
-				assert.equal(result.options.$filter[2].bind, 1));
+			it('rhr should be $1', () => {
+				assert.equal(result.options.$filter[2].bind, 1);
+			});
+		},
+	);
+
+	test(
+		'$filter=Products/$count($filter=Price gt 5 and Price lt 10) ge 1',
+		[5, 10, 1],
+		function (result) {
+			it('A filter should be present', () =>
+				assert.notEqual(result.options.$filter, null));
+
+			it("Filter should be an instance of 'ge'", () =>
+				assert.equal(result.options.$filter[0], 'ge'));
+
+			it('lhr should have the Product count', function () {
+				expect(result.options.$filter[1]).to.have.property('name', 'Products');
+				expect(result.options.$filter[1]).to.have.property('count', true);
+			});
+
+			it('count options are present on the Product count', () => {
+				assert.notEqual(result.options.$filter[1].options, null);
+			});
+
+			it('A filter should be present on the Product count lhs', () =>
+				assert.notEqual(result.options.$filter[1].options.$filter, null));
+
+			it(`has a Product count filter that is an instance of 'and'`, () =>
+				assert.equal(result.options.$filter[1].options.$filter[0], 'and'));
+
+			it(`has an lhs on the 'and' of the Product count filter that is Price gt $0`, () => {
+				const filter = result.options.$filter[1].options.$filter[1];
+				assert.equal(filter[0], 'gt');
+				expect(filter[1]).to.have.property('name', 'Price');
+				expect(filter[2]).to.have.property('bind', 0);
+			});
+
+			it(`has an lhs on the 'and' of the Product count filter that is Price lt $1`, () => {
+				const filter = result.options.$filter[1].options.$filter[2];
+				assert.equal(filter[0], 'lt');
+				expect(filter[1]).to.have.property('name', 'Price');
+				expect(filter[2]).to.have.property('bind', 1);
+			});
+
+			it('rhr should be $2', () => {
+				assert.equal(result.options.$filter[2].bind, 2);
+			});
 		},
 	);