Merge pull request #179 from agco/feature/allow-searching-null-values

Feature/allow searching null values
agco · Oct 14, 2016 · 0bd9aca · 0bd9aca
2 parents 36b9714 + 71c2f44
commit 0bd9aca
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/lib/events-reader.js b/lib/events-reader.js
@@ -179,7 +179,7 @@ module.exports = function (harvesterApp) {
         var processWithHandlerT = throttle(processWithHandler, {
             // call a maximum of 100 times per 1s window
             window: 1,
-            limit: 100
+            limit: parseInt(_.get(harvesterApp, 'options.eventsReaderThrottleLimit'), 10) || 100
         });
 
 

diff --git a/lib/route.js b/lib/route.js
@@ -501,9 +501,13 @@ function route(harvester, name, model, schema, routeOptions) {
 
         //TODO: links.->"" is a mongodb storage issue, and should be in the mongodb adapter rather than here.
         //allow multiple ids or other query params at the same time.
-        _.each(query, function (val, key, list) {
+        _.each(query, function (val, key) {
             if (_.isString(val) && val.indexOf(',') != -1) {
-                query[key] = {$in: val.split(',')};
+                query[key] = {
+                    $in: val.split(',').map(function (item) {
+                        return item.length === 0 ? null : item;
+                    })
+                };
             }
         });
 

diff --git a/test/app.js b/test/app.js
@@ -11,6 +11,7 @@ var config = require('./config.js');
 function configureApp(harvesterApp) {
     harvesterApp.resource('person', {
         name: Joi.string().required().description('name'),
+        nickname: Joi.string().description('nickname'),
         appearances: Joi.number().required().description('appearances'),
         links: {
             pets: ['pet'],

diff --git a/test/filters.spec.js b/test/filters.spec.js
@@ -1,3 +1,4 @@
+var _ = require('lodash');
 var should = require('should');
 var request = require('supertest');
 var Promise = require('bluebird');
@@ -22,6 +23,26 @@ describe("filters", function () {
             done();
         });
     });
+    it("should allow top-level resource filtering based on empty property", function (done) {
+        request(config.baseUrl).get('/people?nickname=,').expect('Content-Type', /json/).expect(200).end(function (error, response) {
+            should.not.exist(error);
+            var body = JSON.parse(response.text);
+            body.people.length.should.equal(2);
+            body.people.forEach(function (person) {
+                person.should.not.have.property('nickname');
+            });
+            done();
+        });
+    });
+    it("should allow top-level resource filtering based on empty property", function (done) {
+        request(config.baseUrl).get('/people?nickname=Pocahontas,').expect('Content-Type', /json/).expect(200).end(function (error, response) {
+            should.not.exist(error);
+            var body = JSON.parse(response.text);
+            body.people.length.should.equal(3);
+            _.map(body.people, 'nickname').sort().should.eql(['Pocahontas', undefined, undefined]);
+            done();
+        });
+    });
 
     it("should allow top-level resource filtering based on a numeric value", function (done) {
         request(config.baseUrl).get('/people?appearances=1934').expect('Content-Type', /json/).expect(200).end(function (error, response) {

diff --git a/test/fixtures/people.js b/test/fixtures/people.js
@@ -13,6 +13,7 @@ module.exports = (function () {
         {
             "id": "600274a7-3862-45d7-8fca-e558cea1cf6d",
             "name": "Catbert",
+            "nickname": "Pocahontas",
             "appearances": 205
         }
     ];