opensource/json-server
1
0
Fork 0
mirror of https://github.com/typicode/json-server.git synced 2025-07-31 22:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for multiple _ne operators (#1013)

Browse Source 
When filtering with multiple _ne it should use logical AND instead of OR to verify that all checks succeed, close #929
This commit is contained in:
Filippo Conti
2019-09-02 18:30:35 +02:00
committed by typicode
parent 4f315b090f
commit ae1428375d
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
__tests__/server/plural.js
View File

@ -348,6 +348,13 @@ describe('Server', () => {
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(db.comments.slice(1)) .expect(db.comments.slice(1))
.expect(200)) .expect(200))
test('should accept multiple parameters', () =>
request(server)
.get('/comments?id_ne=1&id_ne=2')
.expect('Content-Type', /json/)
.expect(db.comments.slice(2))
.expect(200))
}) })
describe('GET /:resource?attr_like=', () => { describe('GET /:resource?attr_like=', () => {
@ -357,6 +364,12 @@ describe('Server', () => {
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect([db.tags[1], db.tags[2]]) .expect([db.tags[1], db.tags[2]])
.expect(200)) .expect(200))
test('should accept multiple parameters', () =>
request(server)
.get('/tags?body_like=photo&body_like=tech')
.expect('Content-Type', /json/)
.expect(db.tags)
.expect(200))
}) })
describe('GET /:parent/:parentId/:resource', () => { describe('GET /:parent/:parentId/:resource', () => {

11
src/server/router/plural.js
View File

@ -116,13 +116,14 @@ module.exports = (db, name, opts) => {
// Always use an array, in case req.query is an array // Always use an array, in case req.query is an array
const arr = [].concat(req.query[key]) const arr = [].concat(req.query[key])
const isDifferent = /_ne$/.test(key)
const isRange = /_lte$/.test(key) || /_gte$/.test(key)
const isLike = /_like$/.test(key)
const path = key.replace(/(_lte|_gte|_ne|_like)$/, '')
chain = chain.filter(element => { chain = chain.filter(element => {
return arr return arr
.map(function(value) { .map(function(value) {
const isDifferent = /_ne$/.test(key)
const isRange = /_lte$/.test(key) || /_gte$/.test(key)
const isLike = /_like$/.test(key)
const path = key.replace(/(_lte|_gte|_ne|_like)$/, '')
// get item value based on path // get item value based on path
// i.e post.title -> 'foo' // i.e post.title -> 'foo'
const elementValue = _.get(element, path) const elementValue = _.get(element, path)
@ -146,7 +147,7 @@ module.exports = (db, name, opts) => {
return value === elementValue.toString() return value === elementValue.toString()
} }
}) })
.reduce((a, b) => a || b) .reduce((a, b) => (isDifferent ? a && b : a || b))
}) })
} }
}) })