Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Fix patch method with complex query #151

Merged
dekelev merged 10 commits into from
May 25, 2021
Merged

Fix patch method with complex query #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fbe184
Fix schema use with graph
Thomas-git Oct 21, 2020
8ca5623
Add $startTransaction params
Thomas-git Oct 21, 2020
342206c
Merge branch 'master' into master
dekelev Oct 23, 2020
fe22dde
Fix $startTransaction (atomic)
Thomas-git Oct 24, 2020
e230e68
Fix confilts with upstream
Thomas-git Nov 2, 2020
0bbb791
Fix/Add comments
Thomas-git May 25, 2021
4f56c11
Fix patch query with complex query
Thomas-git May 25, 2021
bb94056
Merge remote branch 'upstream/master'
Thomas-git May 25, 2021
5f2142f
Merge remote branch 'upstream/master'
Thomas-git May 25, 2021
8fccef0
Fixed typo
dekelev May 25, 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
21 changes: 15 additions & 6 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ class Service extends AdapterService {
const updateId = this.getIdsQuery(id, undefined, false);
Object.keys(updateId).forEach(key => {
if (!Object.prototype.hasOwnProperty.call(newObject, key)) {
newObject[key] = updateId[key]; // id is missing in data, we had it
newObject[key] = updateId[key]; // id is missing in data, we add it
} else if (newObject[key] !== updateId[key]) {
throw new errors.BadRequest(`Id '${key}': values mismatch between data '${newObject[key]}' and request '${updateId[key]}'`);
}
Expand Down Expand Up @@ -602,7 +602,7 @@ class Service extends AdapterService {
_get (id, params = {}) {
// merge user query with the 'id' to get
const findQuery = Object.assign({}, { $and: [] }, params.query);
findQuery.$and.push(this.getIdsQuery(id));
findQuery.$and.push(this.getIdsQuery(id)); // BUG will fail with composite primary key because table name will be missing

return this._find(Object.assign({}, params, { query: findQuery }))
.then(page => {
Expand Down Expand Up @@ -848,11 +848,20 @@ class Service extends AdapterService {
const selectParam = filters.$select ? { $select: filters.$select } : undefined;
const findParams = Object.assign({}, params, { query: Object.assign({}, params.query, this.getIdsQuery(id, idList), selectParam) });

for (const key of Object.keys(dataCopy)) {
if (key in findParams.query) {
findParams.query[key] = dataCopy[key];
// Update find query if needed with patched values
const updateKeys = (obj) => {
for (const key of Object.keys(obj)) {
if (key in dataCopy) {
obj[key] = dataCopy[key];
} else {
if (Array.isArray(obj[key])) {
obj[key].forEach(obj => updateKeys(obj));
}
}
}
}
};
updateKeys(findParams.query);

return q.patch(dataCopy).then(() => {
return params.query && params.query.$noSelect
? dataCopy
Expand Down
7 changes: 7 additions & 0 deletions test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,13 @@ describe('Feathers Objection Service', () => {
});
});

it('allows patch multiple records with patched keys in complex query', () => {
return peopleRooms.patch(null, { admin: false }, { query: { $and: [{ admin: true }] } }).then(data => {
expect(data).to.be.instanceof(Array);
expect(data.length).to.equal(3);
});
});

it('patch with partial id throws an error', () => {
return peopleRooms.patch([2], { admin: false }).then(() => {
throw new Error('Should never get here');
Expand Down