opensource/json-server
1
0
Fork 0
mirror of https://github.com/typicode/json-server.git synced 2025-08-02 19:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: filtering with multiple conditions

Browse Source
This commit is contained in:
typicode
2024-08-19 15:02:36 +02:00
parent 6f32b96457
commit e6055e621d
2 changed files with 211 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

389
src/service.test.ts
View File

@ -95,202 +95,215 @@ await test('find', async (t) => {
const arr: {
data?: Data
name: string
params?: Parameters<Service["find"]>[1]
params?: Parameters<Service['find']>[1]
res: Item | Item[] | PaginatedItems | undefined
error?: Error
}[] = [
{
name: POSTS,
res: [post1, post2, post3],
{
name: POSTS,
res: [post1, post2, post3],
},
{
name: POSTS,
params: { id: post1.id },
res: [post1],
},
{
name: POSTS,
params: { id: UNKNOWN_ID },
res: [],
},
{
name: POSTS,
params: { views: post1.views.toString() },
res: [post1],
},
{
name: POSTS,
params: { 'author.name': post1.author.name },
res: [post1],
},
{
name: POSTS,
params: { 'tags[0]': 'foo' },
res: [post1, post3],
},
{
name: POSTS,
params: { id: UNKNOWN_ID, views: post1.views.toString() },
res: [],
},
{
name: POSTS,
params: { views_ne: post1.views.toString() },
res: [post2, post3],
},
{
name: POSTS,
params: { views_lt: (post1.views + 1).toString() },
res: [post1],
},
{
name: POSTS,
params: { views_lt: post1.views.toString() },
res: [],
},
{
name: POSTS,
params: { views_lte: post1.views.toString() },
res: [post1],
},
{
name: POSTS,
params: { views_gt: post1.views.toString() },
res: [post2, post3],
},
{
name: POSTS,
params: { views_gt: (post1.views - 1).toString() },
res: [post1, post2, post3],
},
{
name: POSTS,
params: { views_gte: post1.views.toString() },
res: [post1, post2, post3],
},
{
name: POSTS,
params: {
views_gt: post1.views.toString(),
views_lt: post3.views.toString(),
},
{
name: POSTS,
params: { id: post1.id },
res: [post1],
res: [post2],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: 'views' },
res: [post1, post2, post3],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: '-views' },
res: [post3, post2, post1],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: '-views,id' },
res: [post3, post2, post1],
},
{
name: POSTS,
params: { published: 'true' },
res: [post1],
},
{
name: POSTS,
params: { published: 'false' },
res: [post2, post3],
},
{
name: POSTS,
params: { views_lt: post3.views.toString(), published: 'false' },
res: [post2],
},
{
name: POSTS,
params: { _start: 0, _end: 2 },
res: [post1, post2],
},
{
name: POSTS,
params: { _start: 1, _end: 3 },
res: [post2, post3],
},
{
name: POSTS,
params: { _start: 0, _limit: 2 },
res: [post1, post2],
},
{
name: POSTS,
params: { _start: 1, _limit: 2 },
res: [post2, post3],
},
{
name: POSTS,
params: { _page: 1, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: null,
next: 2,
pages: 2,
items,
data: [post1, post2],
},
{
name: POSTS,
params: { id: UNKNOWN_ID },
res: [],
},
{
name: POSTS,
params: { _page: 2, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: 1,
next: null,
pages: 2,
items,
data: [post3],
},
{
name: POSTS,
params: { views: post1.views.toString() },
res: [post1],
},
{
name: POSTS,
params: { _page: 3, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: 1,
next: null,
pages: 2,
items,
data: [post3],
},
{
name: POSTS,
params: { 'author.name': post1.author.name },
res: [post1],
},
{
name: POSTS,
params: { _page: 2, _per_page: 1 },
res: {
first: 1,
last: 3,
prev: 1,
next: 3,
pages: 3,
items,
data: [post2],
},
{
name: POSTS,
params: { 'tags[0]': 'foo' },
res: [post1, post3],
},
{
name: POSTS,
params: { id: UNKNOWN_ID, views: post1.views.toString() },
res: [],
},
{
name: POSTS,
params: { views_ne: post1.views.toString() },
res: [post2, post3],
},
{
name: POSTS,
params: { views_lt: (post1.views + 1).toString() },
res: [post1],
},
{
name: POSTS,
params: { views_lt: post1.views.toString() },
res: [],
},
{
name: POSTS,
params: { views_lte: post1.views.toString() },
res: [post1],
},
{
name: POSTS,
params: { views_gt: post1.views.toString() },
res: [post2, post3],
},
{
name: POSTS,
params: { views_gt: (post1.views - 1).toString() },
res: [post1, post2, post3],
},
{
name: POSTS,
params: { views_gte: post1.views.toString() },
res: [post1, post2, post3],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: 'views' },
res: [post1, post2, post3],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: '-views' },
res: [post3, post2, post1],
},
{
data: { posts: [post3, post1, post2] },
name: POSTS,
params: { _sort: '-views,id' },
res: [post3, post2, post1],
},
{
name: POSTS,
params: { published: 'true' },
res: [post1],
},
{
name: POSTS,
params: { published: 'false' },
res: [post2, post3],
},
{
name: POSTS,
params: { _start: 0, _end: 2 },
res: [post1, post2],
},
{
name: POSTS,
params: { _start: 1, _end: 3 },
res: [post2, post3],
},
{
name: POSTS,
params: { _start: 0, _limit: 2 },
res: [post1, post2],
},
{
name: POSTS,
params: { _start: 1, _limit: 2 },
res: [post2, post3],
},
{
name: POSTS,
params: { _page: 1, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: null,
next: 2,
pages: 2,
items,
data: [post1, post2],
},
},
{
name: POSTS,
params: { _page: 2, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: 1,
next: null,
pages: 2,
items,
data: [post3],
},
},
{
name: POSTS,
params: { _page: 3, _per_page: 2 },
res: {
first: 1,
last: 2,
prev: 1,
next: null,
pages: 2,
items,
data: [post3],
},
},
{
name: POSTS,
params: { _page: 2, _per_page: 1 },
res: {
first: 1,
last: 3,
prev: 1,
next: 3,
pages: 3,
items,
data: [post2],
},
},
{
name: POSTS,
params: { _embed: ['comments'] },
res: [
{ ...post1, comments: [comment1] },
{ ...post2, comments: [] },
{ ...post3, comments: [] },
],
},
{
name: COMMENTS,
params: { _embed: ['post'] },
res: [{ ...comment1, post: post1 }],
},
{
name: UNKNOWN_RESOURCE,
res: undefined,
},
{
name: OBJECT,
res: obj,
},
]
},
{
name: POSTS,
params: { _embed: ['comments'] },
res: [
{ ...post1, comments: [comment1] },
{ ...post2, comments: [] },
{ ...post3, comments: [] },
],
},
{
name: COMMENTS,
params: { _embed: ['post'] },
res: [{ ...comment1, post: post1 }],
},
{
name: UNKNOWN_RESOURCE,
res: undefined,
},
{
name: OBJECT,
res: obj,
},
]
for (const tc of arr) {
await t.test(`${tc.name} ${JSON.stringify(tc.params)}`, () => {
if (tc.data) {

19
src/service.ts
View File

@ -199,7 +199,7 @@ export class Service {
}
// Convert query params to conditions
const conds: Record<string, [Condition, string | string[]]> = {}
const conds: [string, Condition, string | string[]][] = []
for (const [key, value] of Object.entries(query)) {
if (value === undefined || typeof value !== 'string') {
continue
@ -209,7 +209,7 @@ export class Service {
const op = reArr?.at(1)
if (op && isCondition(op)) {
const field = key.replace(re, '')
conds[field] = [op, value]
conds.push([field, op, value])
continue
}
if (
@ -225,12 +225,13 @@ export class Service {
) {
continue
}
conds[key] = [Condition.default, value]
conds.push([key, Condition.default, value])
}
// Loop through conditions and filter items
const res = items.filter((item: Item) => {
for (const [key, [op, paramValue]] of Object.entries(conds)) {
let filtered = items
for (const [key, op, paramValue] of conds) {
filtered = filtered.filter((item: Item) => {
if (paramValue && !Array.isArray(paramValue)) {
// https://github.com/sindresorhus/dot-prop/issues/95
const itemValue: unknown = getProperty(item, key)
@ -308,13 +309,13 @@ export class Service {
}
}
}
}
return true
})
return true
})
}
// Sort
const sort = query._sort || ''
const sorted = sortOn(res, sort.split(','))
const sorted = sortOn(filtered, sort.split(','))
// Slice
const start = query._start