Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 15 additions & 1 deletion lib/models/work-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ function WorkItemModelFactory (Model, _, Promise, assert, Constants) {
paused:{
type: 'boolean',
defaultsTo: false
},
toJSON: function() {
var obj = this.toObject();
obj.config = _.omit(obj.config, function(value, key) {
return String.prototype.match.apply(key, Constants.Logging.Redactions);
});
return obj;
}
},

Expand Down Expand Up @@ -178,6 +185,14 @@ function WorkItemModelFactory (Model, _, Promise, assert, Constants) {
});
},

beforeValidate: function(obj, next) {
if (obj.type && _(Constants.WorkItems.Pollers).has(obj.type.toUpperCase())) {
obj.name = Constants.WorkItems.Pollers[obj.type.toUpperCase()];
delete obj.type;
}
next();
},

beforeCreate: serialize,

beforeUpdate: serialize,
Expand All @@ -200,7 +215,6 @@ function WorkItemModelFactory (Model, _, Promise, assert, Constants) {
});
},


deserialize: function(obj) {
return sanitize(obj, /_/ig, '.');
}
Expand Down
32 changes: 31 additions & 1 deletion spec/lib/models/work-item-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,38 @@ describe('Models.WorkItem', function () {
'_1_3_6_1_2_1_1_5'
]);
});
});

it('should change poller.type to poller.name on create', function() {
var workItem = snmpPoller;

workItem.type = 'snmp';
delete workItem.name;

return workitems.create(workItem)
.then(function(createdItem) {
expect(createdItem.name).to.equal('Pollers.SNMP');
expect(createdItem).not.to.have.property('type');
});
});

it('should change poller.type to poller.name on update', function() {
var workItem = snmpPoller;

return workitems.create(workItem)
.then(function(createdItem) {
createdItem.type = 'ipmi';
delete createdItem.name;
return createdItem.save();
})
.then(function() {
return workitems.find({name: 'Pollers.IPMI'});
})
.then(function(items) {
expect(items.length).to.equal(1);
expect(items[0].name).to.equal('Pollers.IPMI');
expect(items[0]).not.to.have.property('type');
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

});
});
});