Added ability to use filter in the first level

CHANGELOG.md

@@ -12,6 +12,10 @@
 
 ---
 
+## [v1.6.0](https://github.com/foxifyjs/foxify-restify-odin/releases/tag/v1.6.0) - *(2018-12-28)*
+
+- :star2: Added ability to use `has` filter in the first `and` level
+
 ## [v1.5.0](https://github.com/foxifyjs/foxify-restify-odin/releases/tag/v1.5.0) - *(2018-12-16)*
 
 - :zap: Added `Odin`'s `whereHas` compatibility

README.md

@@ -42,7 +42,7 @@ Easily restify odin databases
 
 - [Node.js](https://nodejs.org/en/download) `8.12` or higher is required.
 - [foxify](https://github.com/foxifyjs/foxify) `0.10.20` or higher is required.
-- [@foxify/odin](https://github.com/foxifyjs/odin) `0.6.0` or higher is required.
+- [@foxify/odin](https://github.com/foxifyjs/odin) `0.8.0` or higher is required.
 
 ### Installation
 
@@ -183,7 +183,7 @@ possible operators:
 qs.stringify({
   include: [
     "relation1",
-    "relation2",
+    "relation2.subRelation1.subRelation2",
   ]
 })
 ```
@@ -218,13 +218,13 @@ qs.stringify({
 
 ## Versioning
 
-We use [SemVer](http://semver.org) for versioning. For the versions available, see the [tags on this repository](https://github.com/foxifyjs/foxify/tags).
+We use [SemVer](http://semver.org) for versioning. For the versions available, see the [tags on this repository](https://github.com/foxifyjs/foxify-restify-odin/tags).
 
 ## Authors
 
 - **Ardalan Amini** - *Owner/Developer* - [@ardalanamini](https://github.com/ardalanamini)
 
-See also the list of [contributors](https://github.com/foxifyjs/foxify/contributors) who participated in this project.
+See also the list of [contributors](https://github.com/foxifyjs/foxify-restify-odin/contributors) who participated in this project.
 
 ## License
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foxify-restify-odin",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Easily restify odin databases",
   "author": "Ardalan Amini <[email protected]> [https://github.com/ardalanamini]",
   "license": "MIT",
@@ -38,11 +38,12 @@
     "qs": "^6.6.0"
   },
   "peerDependencies": {
-    "@foxify/odin": ">=0.7.5",
+    "@foxify/odin": ">=0.8.0",
     "foxify": ">=0.10.20"
   },
   "devDependencies": {
-    "@foxify/odin": "^0.7.5",
+    "@foxify/odin": "^0.8.0",
+    "@foxify/schema": "^1.0.1",
     "@types/body-parser": "^1.17.0",
     "@types/jest": "^23.3.10",
     "@types/qs": "^6.5.1",
@@ -52,9 +53,9 @@
     "jest": "^23.6.0",
     "jest-environment-node": "^23.4.0",
     "mongodb": "^3.1.10",
-    "mongodb-memory-server": "^2.8.0",
+    "mongodb-memory-server": "^2.9.1",
     "ts-jest": "^23.10.5",
-    "tslint": "^5.11.0",
+    "tslint": "^5.12.0",
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "^3.2.2"
   },

src/builders/filter.ts

@@ -40,14 +40,25 @@ const operate = (query: typeof Odin, field: string, operator: Operator, value: a
   }
 };
 
-const and = (query: any, filters: Array<FilterObject | Filter>, had: boolean): any => filters
-  .reduce((prev, curr) => prev.where((q: any) => filter(q, curr, had)), query);
+const and = (
+  query: any, filters: Array<FilterObject | Filter>, had: boolean, level: number,
+): any => filters
+  .reduce(
+    (prev, curr) => {
+      if ((curr as any).has) return filter(prev, curr, had, level);
 
-const or = (query: any, filters: Array<FilterObject | Filter>, had: boolean): any => filters.reduce(
+      return prev.where((q: any) => filter(q, curr, had, level + 1));
+    },
+    query,
+  );
+
+const or = (
+  query: any, filters: Array<FilterObject | Filter>, had: boolean, level: number,
+): any => filters.reduce(
   (prev, curr, index) => {
-    if (index === 0) return prev.where((q: any) => filter(q, curr, had));
+    if (index === 0) return prev.where((q: any) => filter(q, curr, had, level + 1));
 
-    return prev.orWhere((q: any) => filter(q, curr, had));
+    return prev.orWhere((q: any) => filter(q, curr, had, level + 1));
   },
   query,
 );
@@ -66,23 +77,24 @@ const has = (
   );
 };
 
-const filter = (model: any, filters: any, had = false) => {
+const filter = (model: any, filters: any, had = false, level = 0) => {
   if (filters.and) {
     if (filters.or || filters.has) {
       throw new TypeError("filter can only have one of [\"and\", \"or\", \"has\"]");
     }
 
-    return and(model, filters.and, had);
+    return and(model, filters.and, had, level);
   }
 
   if (filters.or) {
     if (filters.has) throw new TypeError("filter can only have one of [\"and\", \"or\", \"has\"]");
 
-    return or(model, filters.or, had);
+    return or(model, filters.or, had, level);
   }
 
   if (filters.has) {
     if (had) throw new Error("Can't use \"has\" inside has");
+    if (level !== 0) throw new Error("Can't use \"has\" at this level");
 
     return has(model, filters.has);
   }