update quest abort route

common/locales/en/api-v3.json

@@ -75,5 +75,6 @@
   "questLevelTooHigh": "You must be Level <%= level %> to begin this quest.",
   "questAlreadyUnderway": "Your party is already on a quest. Try again when the current quest has ended.",
   "questAlreadyAccepted": "You already accepted the quest invitation.",
-  "noActiveQuestToAbort": "There is no active quest to abort."
+  "noActiveQuestToAbort": "There is no active quest to abort.",
+  "onlyLeaderAbortQuest": "Only the group or quest leader can abort a quest."
 }

test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js

@@ -1,35 +1,37 @@
 import {
   createAndPopulateGroup,
   translate as t,
+  generateUser,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
-describe('POST /groups/:groupId/quests/abort', () => {
+describe('POST /groups/:groupId/quests/leave', () => {
-  let questingGroup, member, leader;
+  let questingGroup;
-  const PET_QUEST = 'whale';
+  let partyMembers;
-  let userQuestUpdate = {
+  let user;
-    items: {
+  let leader;
-      quests: {},
-    },
-    'party.quest.RSVPNeeded': true,
-    'party.quest.key': PET_QUEST,
-  };
 
-  before(async () => {
+  const PET_QUEST = 'whale';
+
+  beforeEach(async () => {
     let { group, groupLeader, members } = await createAndPopulateGroup({
       groupDetails: { type: 'party', privacy: 'private' },
-      members: 1,
+      members: 2,
     });
 
-    leader = groupLeader;
     questingGroup = group;
-    member = members[0];
+    leader = groupLeader;
+    partyMembers = members;
 
-    userQuestUpdate.items.quests[PET_QUEST] = 1;
+    await leader.update({
+      [`items.quests.${PET_QUEST}`]: 1,
+    });
+    user = await generateUser();
   });
 
+  context('failure conditions', () => {
     it('returns an error when group is not found', async () => {
-    await expect(leader.post(`/groups/${generateUUID()}/quests/abort`))
+      await expect(partyMembers[0].post(`/groups/${generateUUID()}/quests/abort`))
         .to.eventually.be.rejected.and.eql({
           code: 404,
           error: 'NotFound',
@@ -37,8 +39,30 @@ describe('POST /groups/:groupId/quests/abort', () => {
         });
     });
 
+    it('returns an error for a group in which user is not a member', async () => {
+      await expect(user.post(`/groups/${questingGroup._id}/quests/abort`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('groupNotFound'),
+      });
+    });
+
+    it('returns an error when group is a guild', async () => {
+      let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({
+        groupDetails: { type: 'guild', privacy: 'private' },
+      });
+
+      await expect(guildLeader.post(`/groups/${guild._id}/quests/abort`))
+      .to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('guildQuestsNotSupported'),
+      });
+    });
+
     it('returns an error when quest is not active', async () => {
-    await expect(leader.post(`/groups/${questingGroup._id}/quests/abort`))
+      await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/abort`))
         .to.eventually.be.rejected.and.eql({
           code: 404,
           error: 'NotFound',
@@ -46,33 +70,57 @@ describe('POST /groups/:groupId/quests/abort', () => {
         });
     });
 
-  xit('returns an error when non quest leader attempts to abort', async () => {
+    it('returns an error when non quest leader attempts to abort', async () => {
-    await questingGroup.update({quest: {key: PET_QUEST, active: true, leader: leader._id}});
+      await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
+      await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
+      await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`);
 
-    await expect(member.post(`/groups/${questingGroup._id}/quests/abort`))
+      await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/abort`))
         .to.eventually.be.rejected.and.eql({
           code: 401,
           error: 'NotAuthorized',
-        message: t('questLeaderCannotAbortQuest'),
+          message: t('onlyLeaderAbortQuest'),
+        });
     });
   });
 
   it('aborts a quest', async () => {
-    await member.update(userQuestUpdate);
+    await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
+    await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
+    await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`);
 
-    let questMembers = {};
+    let res = await leader.post(`/groups/${questingGroup._id}/quests/abort`);
-    questMembers[member._id] = true;
+    Promise.all([
-    await questingGroup.update({'quest.members': questMembers});
+      leader.sync(),
-    await questingGroup.update({quest: {key: PET_QUEST, active: true, leader: leader._id}});
+      questingGroup.sync(),
+      partyMembers[0].sync(),
+      partyMembers[1].sync(),
+    ]);
 
-    let abortResult = await leader.post(`/groups/${questingGroup._id}/quests/abort`);
+    let cleanUserQuestObj = {
-    let updatedMember = await member.get('/user');
+      key: null,
-    let updatedLeader = await leader.get('/user');
+      progress: {
-    let updatedGroup = await member.get(`/groups/${questingGroup._id}`);
+        up: 0,
+        down: 0,
+        collect: {},
+      },
+      completed: null,
+      RSVPNeeded: false,
+    };
 
-    expect(updatedMember.party.quest.key).to.be.null;
+    expect(leader.party.quest).to.eql(cleanUserQuestObj);
-    expect(updatedMember.party.quest.RSVPNeeded).to.be.false;
+    expect(partyMembers[0].party.quest).to.eql(cleanUserQuestObj);
-    expect(updatedLeader.items.quests[PET_QUEST]).to.equal(1);
+    expect(partyMembers[1].party.quest).to.eql(cleanUserQuestObj);
-    expect(updatedGroup.quest).to.deep.equal(abortResult);
+    expect(leader.items.quests[PET_QUEST]).to.equal(1);
+    expect(questingGroup.quest).to.deep.equal(abortResult);
+    expect(questingGroup.quest).to.eql({
+      key: null,
+      active: false,
+      leader: null,
+      progress: {
+       collect: {},
+      },
+      members: {},
+   });
   });
 });

website/src/controllers/api-v3/quests.js

@@ -7,9 +7,6 @@ import {
   model as Group,
 } from '../../models/group';
 import { model as User } from '../../models/user';
-import {
-  model as User,
-} from '../../models/user';
 import {
   NotFound,
   NotAuthorized,
@@ -20,7 +17,6 @@ import {
   sendTxn as sendTxnEmail,
 } from '../../libs/api-v3/email';
 import { quests as questScrolls } from '../../../../common/script/content';
-import Q from 'q';
 
 function canStartQuestAutomatically (group)  {
   // If all members are either true (accepted) or false (rejected) return true
@@ -185,14 +181,14 @@ api.acceptQuest = {
 };
 
 /**
- * @api {post} /groups/:groupId/quests/abort Abort a quest
+ * @api {post} /groups/:groupId/quests/abort Abort the current quest
  * @apiVersion 3.0.0
  * @apiName AbortQuest
  * @apiGroup Group
  *
  * @apiParam {string} groupId The group _id (or 'party')
  *
- * @apiSuccess {Object} Quest Object
+ * @apiSuccess {Object} quest Quest Object
  */
 api.abortQuest = {
   method: 'POST',
@@ -208,24 +204,28 @@ api.abortQuest = {
     let validationErrors = req.validationErrors();
     if (validationErrors) throw validationErrors;
 
-    let group = await Group.getGroup({user, groupId, fields: 'type quest'});
+    let group = await Group.getGroup({user, groupId, fields: 'type quest leader'});
     if (!group) throw new NotFound(res.t('groupNotFound'));
+    if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported'));
     if (!group.quest.active) throw new NotFound(res.t('noActiveQuestToAbort'));
+    if (user._id !== group.leader && user._id !== group.quest.leader) throw new NotAuthorized(res.t('onlyLeaderAbortQuest'));
 
-    let memberUpdates = User.update(
+    let memberUpdates = User.update({
-      {'party._id': groupId},
+      'party._id': groupId
-      {
+    }, {
         $set: {'party.quest': Group.cleanQuestProgress()},
-        $inc: {_v: 1},
+        $inc: {_v: 1}, // TODO update middleware
+    }, {multi: true}).exec();
+
+    let questLeaderUpdate = User.update({
+      _id: group.quest.leader
+    }, {
+      $inc: {
+        [`items.quests.${group.quest.key}`]: 1, // give back the quest to the quest leader
       },
-      {multi: true},
+    }).exec();
-    );
 
-    let update = {$inc: {}};
+    group.quest = Group.cleanGroupQuest();
-    update.$inc[`items.quests.${group.quest.key}`] = 1;
-    let questLeaderUpdate = User.update({_id: group.quest.leader}, update).exec();
-
-    group.quest = {key: null, progress: {collect: {}}, leader: null, members: {}, extra: {}, active: false};
     group.markModified('quest');
 
     let [groupSaved] = await Q.all([group.save(), memberUpdates, questLeaderUpdate]);