mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
Merge branch 'api-v3-quests-abort' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-abort
This commit is contained in:
@@ -74,5 +74,6 @@
|
|||||||
"questNotOwned": "You don't own that quest scroll.",
|
"questNotOwned": "You don't own that quest scroll.",
|
||||||
"questLevelTooHigh": "You must be Level <%= level %> to begin this quest.",
|
"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.",
|
"questAlreadyUnderway": "Your party is already on a quest. Try again when the current quest has ended.",
|
||||||
"questAlreadyAccepted": "You already accepted the quest invitation."
|
"questAlreadyAccepted": "You already accepted the quest invitation.",
|
||||||
|
"noActiveQuestToAbort": "There is no active quest to abort."
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
import {
|
||||||
|
createAndPopulateGroup,
|
||||||
|
translate as t,
|
||||||
|
} from '../../../../helpers/api-v3-integration.helper';
|
||||||
|
import { v4 as generateUUID } from 'uuid';
|
||||||
|
|
||||||
|
describe('POST /groups/:groupId/quests/abort', () => {
|
||||||
|
let questingGroup, member, leader;
|
||||||
|
const PET_QUEST = 'whale';
|
||||||
|
let userQuestUpdate = {
|
||||||
|
items: {
|
||||||
|
quests: {},
|
||||||
|
},
|
||||||
|
'party.quest.RSVPNeeded': true,
|
||||||
|
'party.quest.key': PET_QUEST,
|
||||||
|
};
|
||||||
|
|
||||||
|
before(async () => {
|
||||||
|
let { group, groupLeader, members } = await createAndPopulateGroup({
|
||||||
|
groupDetails: { type: 'party', privacy: 'private' },
|
||||||
|
members: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
leader = groupLeader;
|
||||||
|
questingGroup = group;
|
||||||
|
member = members[0];
|
||||||
|
|
||||||
|
userQuestUpdate.items.quests[PET_QUEST] = 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns an error when group is not found', async () => {
|
||||||
|
await expect(leader.post(`/groups/${generateUUID()}/quests/abort`))
|
||||||
|
.to.eventually.be.rejected.and.eql({
|
||||||
|
code: 404,
|
||||||
|
error: 'NotFound',
|
||||||
|
message: t('groupNotFound'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns an error when quest is not active', async () => {
|
||||||
|
await expect(leader.post(`/groups/${questingGroup._id}/quests/abort`))
|
||||||
|
.to.eventually.be.rejected.and.eql({
|
||||||
|
code: 404,
|
||||||
|
error: 'NotFound',
|
||||||
|
message: t('noActiveQuestToAbort'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
xit('returns an error when non quest leader attempts to abort', async () => {
|
||||||
|
await questingGroup.update({quest: {key: PET_QUEST, active: true, leader: leader._id}});
|
||||||
|
|
||||||
|
await expect(member.post(`/groups/${questingGroup._id}/quests/abort`))
|
||||||
|
.to.eventually.be.rejected.and.eql({
|
||||||
|
code: 401,
|
||||||
|
error: 'NotAuthorized',
|
||||||
|
message: t('questLeaderCannotAbortQuest'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('aborts a quest', async () => {
|
||||||
|
await member.update(userQuestUpdate);
|
||||||
|
|
||||||
|
let questMembers = {};
|
||||||
|
questMembers[member._id] = true;
|
||||||
|
await questingGroup.update({'quest.members': questMembers});
|
||||||
|
await questingGroup.update({quest: {key: PET_QUEST, active: true, leader: leader._id}});
|
||||||
|
|
||||||
|
let abortResult = await leader.post(`/groups/${questingGroup._id}/quests/abort`);
|
||||||
|
let updatedMember = await member.get('/user');
|
||||||
|
let updatedLeader = await leader.get('/user');
|
||||||
|
let updatedGroup = await member.get(`/groups/${questingGroup._id}`);
|
||||||
|
|
||||||
|
expect(updatedMember.party.quest.key).to.be.null;
|
||||||
|
expect(updatedMember.party.quest.RSVPNeeded).to.be.false;
|
||||||
|
expect(updatedLeader.items.quests[PET_QUEST]).to.equal(1);
|
||||||
|
expect(updatedGroup.quest).to.deep.equal(abortResult);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -6,6 +6,7 @@ import analytics from '../../libs/api-v3/analyticsService';
|
|||||||
import {
|
import {
|
||||||
model as Group,
|
model as Group,
|
||||||
} from '../../models/group';
|
} from '../../models/group';
|
||||||
|
import { model as User } from '../../models/user';
|
||||||
import {
|
import {
|
||||||
model as User,
|
model as User,
|
||||||
} from '../../models/user';
|
} from '../../models/user';
|
||||||
@@ -19,6 +20,7 @@ import {
|
|||||||
sendTxn as sendTxnEmail,
|
sendTxn as sendTxnEmail,
|
||||||
} from '../../libs/api-v3/email';
|
} from '../../libs/api-v3/email';
|
||||||
import { quests as questScrolls } from '../../../../common/script/content';
|
import { quests as questScrolls } from '../../../../common/script/content';
|
||||||
|
import Q from 'q';
|
||||||
|
|
||||||
function canStartQuestAutomatically (group) {
|
function canStartQuestAutomatically (group) {
|
||||||
// If all members are either true (accepted) or false (rejected) return true
|
// If all members are either true (accepted) or false (rejected) return true
|
||||||
@@ -182,4 +184,54 @@ api.acceptQuest = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @api {post} /groups/:groupId/quests/abort Abort a quest
|
||||||
|
* @apiVersion 3.0.0
|
||||||
|
* @apiName AbortQuest
|
||||||
|
* @apiGroup Group
|
||||||
|
*
|
||||||
|
* @apiParam {string} groupId The group _id (or 'party')
|
||||||
|
*
|
||||||
|
* @apiSuccess {Object} Quest Object
|
||||||
|
*/
|
||||||
|
api.abortQuest = {
|
||||||
|
method: 'POST',
|
||||||
|
url: '/groups/:groupId/quests/abort',
|
||||||
|
middlewares: [authWithHeaders(), cron],
|
||||||
|
async handler (req, res) {
|
||||||
|
// Abort a quest AFTER it has begun (see questCancel for BEFORE)
|
||||||
|
let user = res.locals.user;
|
||||||
|
let groupId = req.params.groupId;
|
||||||
|
|
||||||
|
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
|
||||||
|
|
||||||
|
let validationErrors = req.validationErrors();
|
||||||
|
if (validationErrors) throw validationErrors;
|
||||||
|
|
||||||
|
let group = await Group.getGroup({user, groupId, fields: 'type quest'});
|
||||||
|
if (!group) throw new NotFound(res.t('groupNotFound'));
|
||||||
|
if (!group.quest.active) throw new NotFound(res.t('noActiveQuestToAbort'));
|
||||||
|
|
||||||
|
let memberUpdates = User.update(
|
||||||
|
{'party._id': groupId},
|
||||||
|
{
|
||||||
|
$set: {'party.quest': Group.cleanQuestProgress()},
|
||||||
|
$inc: {_v: 1},
|
||||||
|
},
|
||||||
|
{multi: true},
|
||||||
|
);
|
||||||
|
|
||||||
|
let update = {$inc: {}};
|
||||||
|
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]);
|
||||||
|
|
||||||
|
res.respond(200, groupSaved.quest);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export default api;
|
export default api;
|
||||||
|
|||||||
Reference in New Issue
Block a user