From 6c6d88e88b0aec8749512381d5c0be156ea10808 Mon Sep 17 00:00:00 2001
From: Shweelan Samson <shweelan@genieacs.com>
Date: Fri, 8 Mar 2019 15:19:20 +0300
Subject: [PATCH] Add more cases for tags in mongoQueryToFilter

---
 lib/mongodb-functions.ts  | 3 +++
 test/mongodb-functions.ts | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/mongodb-functions.ts b/lib/mongodb-functions.ts
index 95ce76d..cd00614 100644
--- a/lib/mongodb-functions.ts
+++ b/lib/mongodb-functions.ts
@@ -458,6 +458,8 @@ export function mongoQueryToFilter(query): Expression {
 
           if (v.hasOwnProperty("$ne"))
             expressions.push(["IS NULL", ["PARAM", `Tags.${v["$ne"]}`]]);
+          else if (v.hasOwnProperty("$eq"))
+            expressions.push(["IS NOT NULL", ["PARAM", `Tags.${v["$eq"]}`]]);
           else throw new Error(`Invalid tag query`);
         } else {
           expressions.push(["IS NOT NULL", ["PARAM", `Tags.${v}`]]);
@@ -465,6 +467,7 @@ export function mongoQueryToFilter(query): Expression {
       } else if (k.startsWith("Tags.")) {
         let exists: boolean;
         if (typeof v === "boolean") exists = v;
+        else if (v.hasOwnProperty("$eq")) exists = !!v["$eq"];
         else if (v.hasOwnProperty("$ne")) exists = !v["$ne"];
         else if (v.hasOwnProperty("$exists")) exists = !!v["$exists"];
         else throw new Error(`Invalid tag query`);
diff --git a/test/mongodb-functions.ts b/test/mongodb-functions.ts
index bc14ff1..5e35ec0 100644
--- a/test/mongodb-functions.ts
+++ b/test/mongodb-functions.ts
@@ -15,8 +15,11 @@ ava("mongoQueryToFilter", t => {
     [{ "Tags.test": { $exists: false } }, "Tags.test IS NULL"],
     [{ "Tags.test": { $ne: true } }, "Tags.test IS NULL"],
     [{ "Tags.test": { $ne: false } }, "Tags.test IS NOT NULL"],
+    [{ "Tags.test": { $eq: true } }, "Tags.test IS NOT NULL"],
+    [{ "Tags.test": { $eq: false } }, "Tags.test IS NULL"],
     [{ _tags: "test" }, "Tags.test IS NOT NULL"],
     [{ _tags: { $ne: "test" } }, "Tags.test IS NULL"],
+    [{ _tags: { $eq: "test" } }, "Tags.test IS NOT NULL"],
     [
       { $and: [{ test: "test" }, { test: { $ne: "test" } }] },
       'test = "test" AND test <> "test"'
@@ -35,9 +38,9 @@ ava("mongoQueryToFilter", t => {
   const shouldFailTests = [
     [{ test: { $gee: "test" } }, "Operator $gee not supported"],
     [{ test: [] }, "Invalid type"],
-    [{ "Tags.test": { $eq: true } }, "Invalid tag query"],
+    [{ "Tags.test": { $gt: true } }, "Invalid tag query"],
     [{ _tags: [] }, "Invalid type"],
-    [{ _tags: { $eq: "test" } }, "Invalid tag query"],
+    [{ _tags: { $gt: "test" } }, "Invalid tag query"],
     [{ $nor: [] }, "Operator $nor not supported"]
   ];