From 1dea6267d7eea12956d494b94599869c5639230e Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 18 Oct 2017 16:07:20 -0600 Subject: [PATCH] fixes to the toObject, added test --- bin/cli-setup | 2 +- models/setting.js | 8 +++++++ package.json | 2 +- test/server/services/settings.js | 10 +++++++++ yarn.lock | 38 ++++++++++++++------------------ 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/bin/cli-setup b/bin/cli-setup index 2e5c1e5b8..c7a44c453 100755 --- a/bin/cli-setup +++ b/bin/cli-setup @@ -195,7 +195,7 @@ const performSetup = async () => { password: user.password } }); - + console.log('Settings created.'); console.log(`User ${newUser.id} created.`); console.log('\nTalk is now installed!'); diff --git a/models/setting.js b/models/setting.js index 222541df6..d8cda8507 100644 --- a/models/setting.js +++ b/models/setting.js @@ -102,6 +102,14 @@ const SettingSchema = new Schema({ timestamps: { createdAt: 'created_at', updatedAt: 'updated_at' + }, + toObject: { + transform: (doc, ret) => { + delete ret._id; + delete ret.__v; + + return ret; + } } }); diff --git a/package.json b/package.json index f194e09c9..e406dcff8 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "metascraper": "1.0.7", "minimist": "^1.2.0", "moment": "^2.18.1", - "mongoose": "4.11.14", + "mongoose": "^4.12.3", "morgan": "1.9.0", "ms": "^2.0.0", "murmurhash-js": "^1.0.0", diff --git a/test/server/services/settings.js b/test/server/services/settings.js index 82d28ea41..9384d8a4f 100644 --- a/test/server/services/settings.js +++ b/test/server/services/settings.js @@ -31,6 +31,16 @@ describe('services.SettingsService', () => { expect(updatedSettings).to.have.property('infoBoxContent', 'yeah'); }); }); + + it('should be ok when receiving an object based off of a mongoose model', async () => { + const mockSettings = {moderation: 'POST', infoBoxEnable: true, infoBoxContent: 'yeah'}; + await SettingsService.update(mockSettings); + + const settings = await SettingsService.retrieve(); + settings.charCount = 500; + + await SettingsService.update(settings.toObject()); + }); }); describe('#get', () => { diff --git a/yarn.lock b/yarn.lock index afb170ec1..d91e34ccf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5784,35 +5784,35 @@ moment@^2.10.3: version "2.19.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167" -mongodb-core@2.1.15: - version "2.1.15" - resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.15.tgz#841f53b87ffff4c7458189c35c8ae827e1169764" +mongodb-core@2.1.17: + version "2.1.17" + resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8" dependencies: bson "~1.0.4" require_optional "~1.0.0" -mongodb@2.2.31: - version "2.2.31" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.31.tgz#1940445c661e19217bb3bf8245d9854aaef548db" +mongodb@2.2.33: + version "2.2.33" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.33.tgz#b537c471d34a6651b48f36fdbf29750340e08b50" dependencies: es6-promise "3.2.1" - mongodb-core "2.1.15" + mongodb-core "2.1.17" readable-stream "2.2.7" -mongoose@4.11.14: - version "4.11.14" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.11.14.tgz#b85402aaf28c5c3e45c8ef93fe69544eaa5d00f3" +mongoose@^4.12.3: + version "4.12.3" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.12.3.tgz#7099bf8ce4945150001f4c2462e56c9e958ddcb9" dependencies: async "2.1.4" bson "~1.0.4" hooks-fixed "2.0.0" kareem "1.5.0" - mongodb "2.2.31" + mongodb "2.2.33" mpath "0.3.0" mpromise "0.5.5" mquery "2.3.2" ms "2.0.0" - muri "1.2.2" + muri "1.3.0" regexp-clone "0.0.1" sliced "1.0.1" @@ -5855,9 +5855,9 @@ ms@2.0.0, ms@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -muri@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.2.tgz#63198132650db08a04cc79ccd00dd389afd2631c" +muri@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/muri/-/muri-1.3.0.tgz#aeccf3db64c56aa7c5b34e00f95b7878527a4721" murmurhash-js@^1.0.0: version "1.0.0" @@ -8524,13 +8524,7 @@ string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" - dependencies: - buffer-shims "~1.0.0" - -string_decoder@~1.0.3: +string_decoder@~1.0.0, string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: