fix & conditional output

hashemirafsan · Sep 8, 2022 · 2b4316f · 2b4316f
1 parent 8e57f8d
commit 2b4316f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
@@ -8,6 +8,4 @@ services:
       dockerfile: Dockerfile.test
     volumes:
       - ../:/usr/src/app
-    depends_on:
-      - redis
     command: npm run test
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elasticsearch-dynamic-query",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A simple query builder, it will helps to develop DSL query for elasticsearch",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/src/parser/statement.ts b/src/parser/statement.ts
@@ -116,13 +116,7 @@ export class Statement {
    * type is Text, then add a Like condition to the conditions array
    */
   private setEqCondition() {
-    if ([DataTypeEnum.ID, DataTypeEnum.NUMBER, DataTypeEnum.BOOLEAN].includes(this.getType())) {
-      this.setCondition(this.getEqCondition(this.data.conditions.$eq));
-    }
-
-    if (this.getType() === DataTypeEnum.TEXT) {
-      this.setLikeCondition(this.data.conditions.$eq);
-    }
+    this.setCondition(this.getEqCondition(this.data.conditions.$eq));
   }
 
   /**
@@ -139,13 +133,7 @@ export class Statement {
    * data type is Text, then add a new NotLike condition to the conditions array
    */
   private setNotEqCondition() {
-    if ([DataTypeEnum.ID, DataTypeEnum.NUMBER, DataTypeEnum.BOOLEAN].includes(this.getType())) {
-      this.condtions.push(new Neq(this.getKey(), this.data.conditions.$neq));
-    }
-
-    if (this.getType() === DataTypeEnum.TEXT) {
-      this.setNotLikeCondition(this.data.conditions.$neq);
-    }
+    this.condtions.push(new Neq(this.getKey(), this.data.conditions.$neq));
   }
 
   /**

diff --git a/tests/compound-bool.test.ts b/tests/compound-bool.test.ts
@@ -20,7 +20,7 @@ test('$eq (TEXT) Conditional Operator', async () => {
         bool: {
             must: [
                 {
-                    match: {
+                    term: {
                         title: title
                     }
                 }
@@ -74,7 +74,7 @@ test('$neq (TEXT) Conditional Operator', async () => {
         bool: {
             must_not: [
                 {
-                    match: {
+                    term: {
                         title: title
                     }
                 }
@@ -680,7 +680,7 @@ test('$or (Partial) Conditional Operator', async () => {
         bool: {
             must: [
                 {
-                    match: {
+                    term: {
                         title: title
                     }
                 }
@@ -773,7 +773,7 @@ test('Multi Conditional Operator (1)', async () => {
         bool: {
             must: [
                 {
-                    match: {
+                    term: {
                         title: title
                     }
                 },
@@ -785,7 +785,7 @@ test('Multi Conditional Operator (1)', async () => {
             ],
             must_not: [
                 {
-                    match: {
+                    term: {
                         title: anotherTitle
                     }
                 },