Skip to content

Update feathers-query-filters to version 2.0.0 🚀 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daffl merged 2 commits into from
Jul 10, 2016
Merged

Update feathers-query-filters to version 2.0.0 🚀 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1451cc4
chore(package): update feathers-query-filters to version 2.0.0
greenkeeperio-bot Jul 9, 2016
14d5b1f
Update feathers-query-filters usage
daffl Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@
"lib": "lib"
},
"dependencies": {
"babel-polyfill": "^6.3.14",
"feathers-errors": "^2.0.1",
"feathers-query-filters": "^1.5.1",
"feathers-query-filters": "^2.0.0",
"is-plain-object": "^2.0.1",
"uberproto": "^1.2.0"
},
Expand Down
20 changes: 9 additions & 11 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
if(!global._babelPolyfill) { require('babel-polyfill'); }

import Proto from 'uberproto';
import filter from 'feathers-query-filters';
import isPlainObject from 'is-plain-object';
Expand Down Expand Up @@ -79,36 +77,36 @@ class Service {
}

_find(params, count, getFilter = filter) {
let query = this.db().select(['*']);
let filters = getFilter(params.query || {});
let q = this.db().select(['*']);
let { filters, query } = getFilter(params.query || {});

// $select uses a specific find syntax, so it has to come first.
if (filters.$select) {
let fields = filters.$select;
query = this.db().select(... fields);
q = this.db().select(... fields);
}

// build up the knex query out of the query params
this.knexify(query, params.query);
this.knexify(q, query);

// Handle $sort
if (filters.$sort) {
Object.keys(filters.$sort).forEach(key =>
query = query.orderBy(key, parseInt(filters.$sort[key], 10) === 1 ? 'asc' : 'desc'));
q = q.orderBy(key, parseInt(filters.$sort[key], 10) === 1 ? 'asc' : 'desc'));
}

// Handle $limit
if (filters.$limit) {
query.limit(filters.$limit);
q.limit(filters.$limit);
}

// Handle $skip
if (filters.$skip) {
query.offset(filters.$skip);
q.offset(filters.$skip);
}

const executeQuery = total => {
return query.then(data => {
return q.then(data => {
return {
total,
limit: filters.$limit,
Expand All @@ -121,7 +119,7 @@ class Service {
if(count) {
let countQuery = this.db().count(`${this.id} as total`);

this.knexify(countQuery, params.query);
this.knexify(countQuery, query);

return countQuery.then(count => count[0].total).then(executeQuery);
}
Expand Down