Skip to content

Mongo like sort #2488

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 3 commits into from
Nov 20, 2021
Merged

Mongo like sort #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a09556
Added mongoDB like search in embedded objects
mhillerstrom Jan 27, 2021
3b2e446
Fix sortLevel detection in sorter()
mhillerstrom Nov 14, 2021
110385b
Merge branch 'dove' into mongo-like-sort
mhillerstrom Nov 14, 2021
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
4 changes: 2 additions & 2 deletions packages/adapter-commons/src/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export function compare (a: any, b: any, compareStrings: any = exports.compareNS
// An in-memory sorting function according to the
// $sort special query parameter
export function sorter ($sort: any) {
let sortLevels = false; // True if $sort has tags with '.' i.e. '{a: 1, b: -1, "c.x.z": 1}'
let sortLevels = 0; // > 0 if $sort has tags with '.' i.e. '{a: 1, b: -1, "c.x.z": 1}'

const getVal = (a: any, sortKeys: any[]) => {
let keys = sortKeys.map(key => key);
Expand All @@ -85,7 +85,7 @@ export function sorter ($sort: any) {
const criteria = Object.keys($sort).map(key => {
const direction = $sort[key];
const keys = key.split('.');
sortLevels = keys.length > 1;
sortLevels += (keys.length > 1) ? 1 : 0;

return { keys, direction };
});
Expand Down
49 changes: 49 additions & 0 deletions packages/adapter-commons/test/sort.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,55 @@ describe('@feathersjs/adapter-commons', () => {
{ _id: 2, item: { category: "cookies", type: "chocolate chip" }, amount: 50 }
]);
});

it('embedded sort 3', () => {
const sort = sorter({
"item.category": 1,
"item.type": 1,
amount: -1
});

assert.deepStrictEqual(data.sort(sort), [
{ _id: 6, item: { category: "brownies", type: "blondie" }, amount: 10 },
{ _id: 5, item: { category: "cake", type: "carrot" }, amount: 20 },
{ _id: 1, item: { category: "cake", type: "chiffon" }, amount: 10 },
{ _id: 4, item: { category: "cake", type: "lemon" }, amount: 30 },
{ _id: 2, item: { category: "cookies", type: "chocolate chip" }, amount: 50 },
{ _id: 3, item: { category: "cookies", type: "chocolate chip" }, amount: 15 }
]);
});

it('embedded sort 4', () => {
const sort = sorter({
amount: -1,
"item.category": 1
});

assert.deepStrictEqual(data.sort(sort), [
{ _id: 2, item: { category: "cookies", type: "chocolate chip" }, amount: 50 },
{ _id: 4, item: { category: "cake", type: "lemon" }, amount: 30 },
{ _id: 5, item: { category: "cake", type: "carrot" }, amount: 20 },
{ _id: 3, item: { category: "cookies", type: "chocolate chip" }, amount: 15 },
{ _id: 6, item: { category: "brownies", type: "blondie" }, amount: 10 },
{ _id: 1, item: { category: "cake", type: "chiffon" }, amount: 10 }
]);
});

it('embedded sort 5', () => {
const sort = sorter({
"item.category": 1,
amount: 1
});

assert.deepStrictEqual(data.sort(sort), [
{ _id: 6, item: { category: "brownies", type: "blondie" }, amount: 10 },
{ _id: 1, item: { category: "cake", type: "chiffon" }, amount: 10 },
{ _id: 5, item: { category: "cake", type: "carrot" }, amount: 20 },
{ _id: 4, item: { category: "cake", type: "lemon" }, amount: 30 },
{ _id: 3, item: { category: "cookies", type: "chocolate chip" }, amount: 15 },
{ _id: 2, item: { category: "cookies", type: "chocolate chip" }, amount: 50 }
]);
});
});

});