controllers/search: Add support for search query filter processing

Author: Turbo87

app/controllers/search.js

@@ -7,6 +7,7 @@ import { restartableTask } from 'ember-concurrency';
 import { bool, reads } from 'macro-decorators';
 
 import { pagination } from '../utils/pagination';
+import { processSearchQuery } from '../utils/search';
 
 export default class SearchController extends Controller {
   @service store;
@@ -61,6 +62,10 @@ export default class SearchController extends Controller {
       q = q.trim();
     }
 
-    return yield this.store.query('crate', { all_keywords, page, per_page, q, sort });
+    let searchOptions = all_keywords
+      ? { page, per_page, sort, q, all_keywords }
+      : { page, per_page, sort, ...processSearchQuery(q) };
+
+    return yield this.store.query('crate', searchOptions);
   }
 }

tests/acceptance/search-test.js

@@ -191,4 +191,42 @@ module('Acceptance | search', function (hooks) {
     await visit('/search?q=rust&page=3&per_page=15&sort=new&all_keywords=fire ball');
     assert.verifySteps(['/api/v1/crates']);
   });
+
+  test('supports `keyword:bla` filters', async function (assert) {
+    this.server.get('/api/v1/crates', function (schema, request) {
+      assert.step('/api/v1/crates');
+
+      assert.deepEqual(request.queryParams, {
+        all_keywords: 'fire ball',
+        page: '3',
+        per_page: '15',
+        q: 'rust',
+        sort: 'new',
+      });
+
+      return { crates: [], meta: { total: 0 } };
+    });
+
+    await visit('/search?q=rust keywords:fire,ball&page=3&per_page=15&sort=new');
+    assert.verifySteps(['/api/v1/crates']);
+  });
+
+  test('`all_keywords` query parameter takes precedence over `keyword` filters', async function (assert) {
+    this.server.get('/api/v1/crates', function (schema, request) {
+      assert.step('/api/v1/crates');
+
+      assert.deepEqual(request.queryParams, {
+        all_keywords: 'fire ball',
+        page: '3',
+        per_page: '15',
+        q: 'rust keywords:foo',
+        sort: 'new',
+      });
+
+      return { crates: [], meta: { total: 0 } };
+    });
+
+    await visit('/search?q=rust keywords:foo&page=3&per_page=15&sort=new&all_keywords=fire ball');
+    assert.verifySteps(['/api/v1/crates']);
+  });
 });