[#154,model/query][m]: refactor to new filter structure (see ticket) updating FilterEditor widget and backends.

* ElasticSearch changes represents a significant refactor and now support filters and query via constant_score (did not support this before!)

test/backend/elasticsearch.test.js

@@ -3,32 +3,52 @@ module("Backend ElasticSearch - Wrapper");
 
 test("queryNormalize", function() { 
   var backend = new recline.Backend.ElasticSearch.Wrapper();
+
   var in_ = new recline.Model.Query();
   var out = backend._normalizeQuery(in_);
-  equal(out.size, 100);
+  var exp = {
+    constant_score: {
+      query: {
+        match_all: {}
+      }
+    }
+  };
+  deepEqual(out, exp);
 
   var in_ = new recline.Model.Query();
   in_.set({q: ''});
   var out = backend._normalizeQuery(in_);
-  equal(out.q, undefined);
-  deepEqual(out.query.match_all, {});
-
-  var in_ = new recline.Model.Query().toJSON();
-  in_.q = '';
-  var out = backend._normalizeQuery(in_);
-  equal(out.q, undefined);
-  deepEqual(out.query.match_all, {});
-
-  var in_ = new recline.Model.Query().toJSON();
-  in_.q = 'abc';
-  var out = backend._normalizeQuery(in_);
-  equal(out.query.query_string.query, 'abc');
+  deepEqual(out, exp);
 
   var in_ = new recline.Model.Query();
-  in_.addTermFilter('xyz', 'XXX');
-  in_ = in_.toJSON();
+  in_.attributes.q = 'abc';
   var out = backend._normalizeQuery(in_);
-  deepEqual(out.filter.and[0], {term: { xyz: 'XXX'}});
+  equal(out.constant_score.query.query_string.query, 'abc');
+
+  var in_ = new recline.Model.Query();
+  in_.addFilter({
+    type: 'term',
+    field: 'xyz',
+    term: 'XXX'
+  });
+  var out = backend._normalizeQuery(in_);
+  var exp = {
+    constant_score: {
+      query: {
+        match_all: {}
+      },
+      filter: {
+        and: [
+          {
+            term: {
+              xyz: 'XXX'
+            }
+          }
+        ]
+      }
+    }
+  };
+  deepEqual(out, exp);
 });
 
 var mapping_data = {

test/backend/memory.test.js

@@ -60,7 +60,7 @@ test('query string', function () {
 test('filters', function () {
   var data = _wrapData();
   var query = new recline.Model.Query();
-  query.addTermFilter('country', 'UK');
+  query.addFilter({type: 'term', field: 'country', term: 'UK'});
   var out = data.query(query.toJSON());
   equal(out.total, 3);
   deepEqual(_.pluck(out.records, 'country'), ['UK', 'UK', 'UK']);
@@ -198,7 +198,7 @@ test('query string', function () {
 
 test('filters', function () {
   var dataset = makeBackendDataset();
-  dataset.queryState.addTermFilter('country', 'UK');
+  dataset.queryState.addFilter({type: 'term', field: 'country', term: 'UK'});
   dataset.query().then(function() {
     equal(dataset.currentRecords.length, 3);
     deepEqual(dataset.currentRecords.pluck('country'), ['UK', 'UK', 'UK']);

test/model.test.js

@@ -151,27 +151,23 @@ test('Query', function () {
 
 test('Query.addFilter', function () {
   var query = new recline.Model.Query();
-  query.addFilter('term', 'xyz');
+  query.addFilter({type: 'term', field: 'xyz'});
   var exp = {
-    term: {
-      xyz: '',
-      _field: 'xyz',
-      _type: 'term'
-    }
+    field: 'xyz',
+    type: 'term',
+    term: ''
   };
-  deepEqual(exp, query.get('filters')[0]);
+  deepEqual(query.get('filters')[0], exp);
 
-  query.addFilter('geo_distance', 'xyz');
+  query.addFilter({type: 'geo_distance', field: 'xyz'});
   var exp = {
-    geo_distance: {
-      distance: '10km',
-      xyz: {
-        lon: 0,
-        lat: 0
-      },
-      _field: 'xyz',
-      _type: 'geo_distance'
-    }
+    distance: '10km',
+    point: {
+      lon: 0,
+      lat: 0
+    },
+    field: 'xyz',
+    type: 'geo_distance'
   };
   deepEqual(exp, query.get('filters')[1]);
 });

test/widget.filtereditor.test.js

@@ -21,12 +21,12 @@ test('basics', function () {
   ok(!$addForm.is(":visible"));
   $editForm = view.el.find('form.js-edit');
   equal($editForm.find('.filter-term').length, 1)
-  equal(_.keys(dataset.queryState.attributes.filters[0].term)[0], 'country');
+  equal(dataset.queryState.attributes.filters[0].field, 'country');
 
   // now set filter value and apply
   $editForm.find('input').val('UK');
   $editForm.submit();
-  equal(dataset.queryState.attributes.filters[0].term.country, 'UK');
+  equal(dataset.queryState.attributes.filters[0].term, 'UK');
   equal(dataset.currentRecords.length, 3);
 
   // now remove filter
@@ -55,12 +55,13 @@ test('geo_distance', function () {
   // now check we have new filter
   $editForm = view.el.find('form.js-edit');
   equal($editForm.find('.filter-geo_distance').length, 1)
-  deepEqual(_.keys(dataset.queryState.attributes.filters[0].geo_distance), ['distance', 'lon', '_type', '_field']);
+  deepEqual(_.keys(dataset.queryState.attributes.filters[0]), ['distance',
+    'point', 'type', 'field']);
 
   // now set filter value and apply
   $editForm.find('input[name="lat"]').val(10);
   $editForm.submit();
-  equal(dataset.queryState.attributes.filters[0].geo_distance.lon.lat, 10);
+  equal(dataset.queryState.attributes.filters[0].point.lat, 10);
 
   view.remove();
 });