Replaced GQL with NQL

refs TryGhost#10105 [ci skip]
kirrg001 · Dec 9, 2018 · 20c4805 · 20c4805
1 parent 3d7b4dc
commit 20c4805
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/core/server/models/plugins/filter.js b/core/server/models/plugins/filter.js
@@ -1,8 +1,10 @@
-var _ = require('lodash'),
-    gql = require('ghost-gql'),
-    common = require('../../lib/common'),
-    filter,
-    filterUtils;
+const _ = require('lodash');
+const gql = require('ghost-gql');
+const debug = require('ghost-ignition').debug('models:plugins:filter');
+const common = require('../../lib/common');
+
+let filter;
+let filterUtils;
 
 filterUtils = {
     /**
@@ -175,36 +177,33 @@ filter = function filter(Bookshelf) {
         },
 
         /**
-         * ## Apply Filters
-         * Method which makes the necessary query builder calls (through knex) for the filters set
-         * on this model instance
-         * @param {Object} options
-         * @returns {Bookshelf.Model}
+         * @TODO:
+         *
+         * - release nql with latest mongo-knex
+         * - NQL must forward options to mongo-knex
          */
         applyDefaultAndCustomFilters: function applyDefaultAndCustomFilters(options) {
-            var self = this;
-
-            // @TODO figure out a better place/way to trigger loading filters
-            if (!this._filters) {
-                this.fetchAndCombineFilters(options);
-            }
-
-            if (this._filters) {
-                if (this.debug) {
-                    gql.json.printStatements(this._filters.statements);
-                }
-
-                this.preProcessFilters(options);
-
-                this.query(function (qb) {
-                    gql.knexify(qb, self._filters);
+            const nql = require('@nexes/nql');
+
+            const customFilter = options.filter;
+            const defaultFilters = this.enforcedFilters(options);
+            const enforcedFilters = this.enforcedFilters(options);
+
+            debug('custom', customFilter);
+            debug('default', defaultFilters);
+            debug('enforced', enforcedFilters);
+
+            if (customFilter) {
+                this.query((qb) => {
+                    nql(customFilter, {relations: {tags: {
+                        tableName: 'tags',
+                        type: 'manyToMany',
+                        join_table: 'posts_tags',
+                        join_from: 'post_id',
+                        join_to: 'tag_id'
+                    }}}).querySQL(qb);
                 });
-
-                // Replaces processGQLResult
-                this.postProcessFilters(options);
             }
-
-            return this;
         }
     });
 

diff --git a/core/test/functional/api/v2/content/posts_spec.js b/core/test/functional/api/v2/content/posts_spec.js
@@ -98,8 +98,8 @@ describe('Posts', function () {
             });
     });
 
-    it('browse posts with basic filters', function (done) {
-        request.get(localUtils.API.getApiQuery(`posts/?key=${validKey}&filter=tag:kitchen-sink,featured:true&include=tags`))
+    it.only('browse posts with basic filters', function (done) {
+        request.get(localUtils.API.getApiQuery(`posts/?key=${validKey}&filter=tags.slug:kitchen-sink,featured:true&include=tags`))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
             .expect(200)