✨ Added support for one negation case for relations

refs #7 - `tags.slug:-animal`
TryGhost · Nov 15, 2018 · 4a67b37 · 4a67b37
1 parent 811e4e6
commit 4a67b37
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lib/convertor.js b/lib/convertor.js
@@ -161,10 +161,10 @@ class MongoToKnex {
 
             if (reference.config.type === 'manyToMany') {
                 if (isCompOp(reference.operator)) {
-                    const comp = compOps[reference.operator] || '=';
+                    const comp = reference.operator === '$ne' || reference.operator === '$nin' ? 'NOT IN' : 'IN';
 
                     // CASE: post.id IN (SELECT ...)
-                    qb.where(`${this.tableName}.id`, 'IN', function () {
+                    qb.where(`${this.tableName}.id`, comp, function () {
                         const innerQB = this
                             .select(`${reference.config.join_table}.${reference.config.join_from}`)
                             .from(`${reference.config.join_table}`)
@@ -173,7 +173,7 @@ class MongoToKnex {
                         _.each(statements, (value, key) => {
                             debug(`(buildRelationQuery) build relation where statements for ${key}`);
 
-                            innerQB.where(`${value.join_table || value.table}.${value.column}`, comp, value.value);
+                            innerQB.where(`${value.join_table || value.table}.${value.column}`, 'IN', !_.isArray(value.value) ? [value.value] : value.value);
                         });
 
                         return innerQB;

diff --git a/test/integration/relations.test.js b/test/integration/relations.test.js
@@ -103,6 +103,24 @@ describe('Relations', function () {
             });
         });
 
+        describe('NEGATION', function () {
+            // should return posts without tags
+            // if a post has more than 1 tag, if one tag is animal, do not return
+            it('tags.slug is NOT "animal"', function () {
+                const mongoJSON = {
+                    'tags.slug': {$ne: 'animal'}
+                };
+
+                const query = makeQuery(mongoJSON);
+
+                return query
+                    .select()
+                    .then((result) => {
+                        result.should.be.an.Array().with.lengthOf(4);
+                    });
+            });
+        });
+
         describe('Multiple where clauses for relations', function () {
             it('tags.slug equals "animal" and posts_tags.sort_order is 0 and featured is true', function () {
                 // where primary tag is "animal"