krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix removeMember route and tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-01-26 00:20:56 +01:00
parent b28e0629b1
commit f12c9d2353
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/groups/POST-groups_id_removeMember.test.js
View File

@@ -64,7 +64,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
await leader.post(`/groups/${guild._id}/removeMember/${member._id}`);
let memberRemoved = await member.get('/user');
expect(_.findIndex(memberRemoved.guilds, {id: guild._id})).eql(-1);
expect(memberRemoved.guilds.indexOf(guild._id)).eql(-1);
});
it('updates memberCount', async () => {

17
website/src/controllers/api-v3/groups.js
View File

@@ -394,18 +394,23 @@ api.removeGroupMember = {
group.memberCount -= 1;
if (group.quest && group.quest.leader === member._id) {
group.quest.key = null;
group.quest.leader = null; // TODO markmodified?
group.quest.key = undefined;
group.quest.leader = undefined;
} else if (group.quest && group.quest.members) {
// remove member from quest
group.quest.members[member._id] = undefined;
group.quest.members[member._id] = undefined; // TODO remmeber to check these are mark modified everywhere
group.markModified('quest.members');
}
if (isInGroup === 'guild') _.pull(member.guilds, group._id);
if (isInGroup === 'guild') {
let i = member.guilds.indexOf(group._id);
if (i !== -1) member.guilds.splice(i, 1);
}
if (isInGroup === 'party') member.party._id = undefined; // TODO remove quest information too?
if (member.newMessages.group) {
member.newMessages.group._id = undefined;
if (member.newMessages[group._id]) {
member.newMessages[group._id] = undefined;
member.markModified('newMessages');
}
if (group.quest && group.quest.active && group.quest.leader === member._id) {