diff --git a/test/api/v3/unit/libs/email.test.js b/test/api/v3/unit/libs/email.test.js index 70854279f6..a24ac46a83 100644 --- a/test/api/v3/unit/libs/email.test.js +++ b/test/api/v3/unit/libs/email.test.js @@ -61,7 +61,7 @@ describe('emails', () => { sandbox.stub(logger, 'error'); let attachEmail = require(pathToEmailLib); - let promise = attachEmail.send(); + attachEmail.send(); expect(sendMailSpy).to.be.calledOnce; deferred.reject(); diff --git a/test/api/v3/unit/models/group.test.js b/test/api/v3/unit/models/group.test.js index ef76e7b984..e1323baa07 100644 --- a/test/api/v3/unit/models/group.test.js +++ b/test/api/v3/unit/models/group.test.js @@ -141,7 +141,7 @@ describe('Group Model', () => { expect(participatingMember.party.quest.key).to.eql('whale'); expect(participatingMember.party.quest.progress.down).to.eql(0); - expect(participatingMember.party.quest.collect).to.eql({}); + expect(participatingMember.party.quest.progress.collect).to.eql({}); expect(participatingMember.party.quest.completed).to.eql(null); }); @@ -250,7 +250,7 @@ describe('Group Model', () => { $set: { 'party.quest.key': 'whale', 'party.quest.progress.down': 0, - 'party.quest.collect': {}, + 'party.quest.progress.collect': {}, 'party.quest.completed': null, }, } @@ -279,7 +279,7 @@ describe('Group Model', () => { expect(userQuest.key).to.eql('whale'); expect(userQuest.progress.down).to.eql(0); - expect(userQuest.collect).to.eql({}); + expect(userQuest.progress.collect).to.eql({}); expect(userQuest.completed).to.eql(null); }); diff --git a/website/src/middlewares/api-v3/cron.js b/website/src/middlewares/api-v3/cron.js index fb071dc2dc..567582d0bc 100644 --- a/website/src/middlewares/api-v3/cron.js +++ b/website/src/middlewares/api-v3/cron.js @@ -233,7 +233,10 @@ function cron (options = {}) { // After all is said and done, progress up user's effect on quest, return those values & reset the user's let progress = user.party.quest.progress; let _progress = _.cloneDeep(progress); - _.merge(progress, {down: 0, up: 0}); + + progress.down = 0; + progress.up = 0; + progress.collect = _.transform(progress.collect, (m, v, k) => m[k] = 0); // Clean PMs - keep 200 for subscribers and 50 for free users diff --git a/website/src/models/group.js b/website/src/models/group.js index 94cce00a20..d28e14b542 100644 --- a/website/src/models/group.js +++ b/website/src/models/group.js @@ -327,7 +327,7 @@ schema.methods.startQuest = async function startQuest (user) { if (userIsParticipating) { user.party.quest.key = this.quest.key; user.party.quest.progress.down = 0; - user.party.quest.collect = collected; + user.party.quest.progress.collect = collected; user.party.quest.completed = null; user.markModified('party.quest'); } @@ -351,7 +351,7 @@ schema.methods.startQuest = async function startQuest (user) { $set: { 'party.quest.key': this.quest.key, 'party.quest.progress.down': 0, - 'party.quest.collect': collected, + 'party.quest.progress.collect': collected, 'party.quest.completed': null, }, }, { multi: true }).exec();