From 9338090e878af32093ba77403c7b1624a535d50e Mon Sep 17 00:00:00 2001 From: Lyne Lin Date: Wed, 9 May 2018 04:49:49 -0400 Subject: [PATCH] Modify macAddress to lower case before writing to DB --- lib/models/lookup.js | 3 +++ spec/lib/models/lookup-spec.js | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/models/lookup.js b/lib/models/lookup.js index 97865d56..54149d32 100644 --- a/lib/models/lookup.js +++ b/lib/models/lookup.js @@ -95,6 +95,7 @@ function LookupModelFactory ( assert.string(node, 'node'); assert.string(macAddress, 'macAddress'); + macAddress = macAddress.toLowerCase(); var query = { macAddress: macAddress }; var options = { new: true, @@ -129,6 +130,7 @@ function LookupModelFactory ( var self = this; + macAddress = macAddress.toLowerCase(); return self.findOne({ macAddress: macAddress }).then(function (record) { if (record) { return self.update( @@ -145,6 +147,7 @@ function LookupModelFactory ( }); }, setIp: function(ipAddress, macAddress) { + macAddress = macAddress.toLowerCase(); switch(dbType) { case 'mongo': return this.setIpMongo(ipAddress, macAddress); diff --git a/spec/lib/models/lookup-spec.js b/spec/lib/models/lookup-spec.js index 2ef8dcc1..77654248 100755 --- a/spec/lib/models/lookup-spec.js +++ b/spec/lib/models/lookup-spec.js @@ -186,7 +186,7 @@ describe('Models.Lookup', function () { 'macAddress' ).then(function () { expect(waterline.lookups.findAndModifyMongo).to.have.been.calledOnce; - var query = { macAddress: 'macAddress' }; + var query = { macAddress: 'macaddress' }; var update = { $set: { node: waterline.lookups.mongo.objectId('node') }}; expect(waterline.lookups.findAndModifyMongo.firstCall.args[0]) .to.deep.equal(query); @@ -212,7 +212,7 @@ describe('Models.Lookup', function () { 'proxy', 'macAddress' ).then(function () { - expect(findOne).to.have.been.calledWith({ macAddress: 'macAddress' }); + expect(findOne).to.have.been.calledWith({ macAddress: 'macaddress' }); expect(update).to.have.been.calledWith({ id: 'id' }, { proxy: 'proxy' }); }); }); @@ -224,7 +224,7 @@ describe('Models.Lookup', function () { 'proxy', 'macAddress' )).to.be.rejectedWith(Errors.NotFoundError).then(function () { - expect(findOne).to.have.been.calledWith({ macAddress: 'macAddress' }); + expect(findOne).to.have.been.calledWith({ macAddress: 'macaddress' }); }); }); });