f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-13 06:32:39 +00:00
Code Wiki Activity

Fixing edge cases in the search tests

Browse Source
This commit is contained in:
Scott Tolksdorf
2017-01-27 19:47:45 -05:00
parent a826aaffd9
commit 26bcb3395a
8 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/brew.search.js
View File

@@ -21,29 +21,31 @@ module.exports = (Brew) => {
return cmds.search(query, opts, fullAccess);
},
search : (queryObj={}, opts={}, fullAccess = true) => {
const pagination = _.defaults(opts.pagination, {
search : (queryObj={}, options={}, fullAccess = true) => {
const opts = _.merge({
limit : 25,
page : 0
});
const sorting = _.defaults(opts.sorting, {
'views' : 1
});
page : 0,
sort : {}
}, options);
let filter = {
text : 0
};
if(!fullAccess){
filter.editId = 0;
queryObj.published = false;
queryObj.published = true;
}
const searchQuery = Brew
.find(queryObj)
.sort(sorting)
.sort(opts.sort)
.select(filter)
.limit(pagination.limit)
.skip(pagination.page * pagination.limit)
.limit(opts.limit)
.skip(opts.page * opts.limit)
.lean()
.exec();
const countQuery = Brew.count(queryObj).exec();
return Promise.all([searchQuery, countQuery])