Skip to content

Add ctx.isNewInstance for "save" hooks #515

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
bajtos merged 1 commit into from
Mar 20, 2015
Merged

Add ctx.isNewInstance for "save" hooks #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions lib/connectors/memory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,13 @@ Memory.prototype.updateOrCreate = function (model, data, callback) {
var self = this;
this.exists(model, self.getIdValue(model, data), function (err, exists) {
if (exists) {
self.save(model, data, callback);
self.save(model, data, function(err, data) {
callback(err, data, { isNewInstance: false });
});
} else {
self.create(model, data, function (err, id) {
self.setIdValue(model, data, id);
callback(err, data);
callback(err, data, { isNewInstance: true });
});
}
});
Expand All @@ -244,7 +246,9 @@ Memory.prototype.save = function save(model, data, callback) {
data = merge(modelData, data);
}
this.collection(model)[id] = serialize(data);
this.saveToFile(data, callback);
this.saveToFile(data, function(err) {
callback(err, data, { isNewInstance: !modelData });
});
};

Memory.prototype.exists = function exists(model, id, callback) {
Expand Down Expand Up @@ -462,12 +466,12 @@ function applyFilter(filter) {
if ('neq' in example) {
return compare(example.neq, value) !== 0;
}

if ('between' in example ) {
return ( testInEquality({gte:example.between[0]}, value) &&
return ( testInEquality({gte:example.between[0]}, value) &&
testInEquality({lte:example.between[1]}, value) );
}

if (example.like || example.nlike) {

var like = example.like || example.nlike;
Expand Down
53 changes: 44 additions & 9 deletions lib/dao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,12 @@ DataAccessObject.create = function (data, options, cb) {
Model = this.lookupModel(data); // data-specific
if (Model !== obj.constructor) obj = new Model(data);

var context = { Model: Model, instance: obj, hookState: hookState };
var context = {
Model: Model,
instance: obj,
isNewInstance: true,
hookState: hookState
};
Model.notifyObserversOf('before save', context, function(err) {
if (err) return cb(err);

Expand Down Expand Up @@ -270,7 +275,12 @@ DataAccessObject.create = function (data, options, cb) {
if (err) {
return cb(err, obj);
}
var context = { Model: Model, instance: obj, hookState: hookState };
var context = {
Model: Model,
instance: obj,
isNewInstance: true,
hookState: hookState
};
Model.notifyObserversOf('after save', context, function(err) {
cb(err, obj);
if(!err) Model.emit('changed', obj);
Expand Down Expand Up @@ -390,7 +400,7 @@ DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data
self.getDataSource().connector
.updateOrCreate(Model.modelName, update, done);

function done(err, data) {
function done(err, data, result) {
var obj;
if (data && !(data instanceof Model)) {
inst._initProperties(data, { persisted: true });
Expand All @@ -404,7 +414,12 @@ DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data
Model.emit('changed', inst);
}
} else {
var context = { Model: Model, instance: obj, hookState: hookState };
var context = {
Model: Model,
instance: obj,
isNewInstance: result ? result.isNewInstance : undefined,
hookState: hookState
};
Model.notifyObserversOf('after save', context, function(err) {
cb(err, obj);
if(!err) {
Expand Down Expand Up @@ -505,7 +520,12 @@ DataAccessObject.findOrCreate = function findOrCreate(query, data, options, cb)
}

if (created) {
var context = { Model: Model, instance: obj, hookState: hookState };
var context = {
Model: Model,
instance: obj,
isNewInstance: true,
hookState: hookState
};
Model.notifyObserversOf('after save', context, function(err) {
if (cb.promise) {
cb(err, [obj, created]);
Expand Down Expand Up @@ -551,7 +571,12 @@ DataAccessObject.findOrCreate = function findOrCreate(query, data, options, cb)
Model.applyProperties(enforced, obj);
obj.setAttributes(enforced);

var context = { Model: Model, instance: obj, hookState: hookState };
var context = {
Model: Model,
instance: obj,
isNewInstance: true,
hookState: hookState
};
Model.notifyObserversOf('before save', context, function(err, ctx) {
if (err) return cb(err);

Expand Down Expand Up @@ -1562,12 +1587,17 @@ DataAccessObject.prototype.save = function (options, cb) {
inst.trigger('save', function (saveDone) {
inst.trigger('update', function (updateDone) {
data = removeUndefined(data);
inst._adapter().save(modelName, inst.constructor._forDB(data), function (err) {
inst._adapter().save(modelName, inst.constructor._forDB(data), function (err, data, result) {
if (err) {
return cb(err, inst);
}
inst._initProperties(data, { persisted: true });
var context = { Model: Model, instance: inst, hookState: hookState };
var context = {
Model: Model,
instance: inst,
isNewInstance: result && result.isNewInstance,
hookState: hookState
};
Model.notifyObserversOf('after save', context, function(err) {
if (err) return cb(err, inst);
updateDone.call(inst, function () {
Expand Down Expand Up @@ -1959,7 +1989,12 @@ DataAccessObject.prototype.updateAttributes = function updateAttributes(data, op
done.call(inst, function () {
saveDone.call(inst, function () {
if (err) return cb(err, inst);
var context = { Model: Model, instance: inst, hookState: hookState };
var context = {
Model: Model,
instance: inst,
isNewInstance: false,
hookState: hookState
};
Model.notifyObserversOf('after save', context, function(err) {
if(!err) Model.emit('changed', inst);
cb(err, inst);
Expand Down
Loading