Skip to content

add transaction support to nested service calls #130

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
Dec 2, 2017
Merged

add transaction support to nested service calls #130

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
a1b4103
fix lint
paflopes Oct 28, 2017
741b108
add support to transactions on nested service calls
paflopes Oct 28, 2017
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 src/error-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ export default function errorHandler (error) {
if (typeof error.code === 'string' && error.severity && error.routine) {
// Omit query information
const messages = error.message.split('-');
error.message = messages[messages.length - 1]
error.message = messages[messages.length - 1];

switch (error.code.slice(0,2)) {
switch (error.code.slice(0, 2)) {
case '22':
case '23':
feathersError = new errors.BadRequest(error);
Expand Down
18 changes: 16 additions & 2 deletions src/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@ const start = (options) => {
return resolve(hook);
}

if (hook.params.transaction) {
hook.params.transaction.count += 1;
return resolve(hook);
}

hook.service.Model.transaction(trx => {
const id = Date.now();
hook.params.transaction = {
trx,
id
id,
count: 0
};
debug('started a new transaction %s', id);
return resolve(hook);
Expand All @@ -22,7 +28,15 @@ const start = (options) => {
const end = (options) => {
return (hook) => {
if (hook.params.transaction) {
const { trx, id } = hook.params.transaction;
const { trx, id, count } = hook.params.transaction;

if (count > 0) {
hook.params.transaction.count -= 1;
return Promise.resolve(hook);
}

hook.params.transaction = undefined;

return trx.commit()
.then(() => debug('finished transaction %s with success', id))
.then(hook);
Expand Down