Merge branch 'develop' into Hus274-7793

test/api/v3/integration/groups/GET-groups_groupId_members.test.js

@@ -4,12 +4,21 @@ import {
   translate as t,
 } from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
+import common from '../../../../../common';
 
 describe('GET /groups/:groupId/members', () => {
   let user;
 
   beforeEach(async () => {
-    user = await generateUser();
+    user = await generateUser({
+      balance: 10,
+      contributor: {level: 1},
+      backer: {tier: 3},
+      preferences: {
+        costume: false,
+        background: 'volcano',
+      },
+    });
   });
 
   it('validates optional req.query.lastId to be an UUID', async () => {
@@ -57,6 +66,30 @@ describe('GET /groups/:groupId/members', () => {
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
+  it('req.query.includeAllPublicFields === true only works with parties', async () => {
+    let group = await generateGroup(user, {type: 'guild', name: generateUUID()});
+    let res = await user.get(`/groups/${group._id}/members?includeAllPublicFields=true`);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
+    expect(res[0].profile).to.have.all.keys(['name']);
+  });
+
+  it('populates all public fields if req.query.includeAllPublicFields === true and it is a party', async () => {
+    await generateGroup(user, {type: 'party', name: generateUUID()});
+    let [memberRes] = await user.get('/groups/party/members?includeAllPublicFields=true');
+
+    expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys
+      '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party',
+      'backer', 'contributor', 'auth', 'items',
+    ]);
+    expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
+    expect(Object.keys(memberRes.preferences).sort()).to.eql(['size', 'hair', 'skin', 'shirt',
+      'chair', 'costume', 'sleep', 'background'].sort());
+
+    expect(memberRes.stats.maxMP).to.exists;
+    expect(memberRes.stats.maxHealth).to.equal(common.maxHealth);
+    expect(memberRes.stats.toNextLevel).to.equal(common.tnl(memberRes.stats.lvl));
+  });
+
   it('returns only first 30 members', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
 

test/api/v3/integration/groups/POST-groups_id_removeMember.test.js

@@ -84,7 +84,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
 
   context('Party', () => {
     let party;
-    let partyleader;
+    let partyLeader;
     let partyInvitedUser;
     let partyMember;
 
@@ -100,13 +100,13 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
       });
 
       party = group;
-      partyleader = groupLeader;
+      partyLeader = groupLeader;
       partyInvitedUser = invitees[0];
       partyMember = members[0];
     });
 
     it('can remove other members', async () => {
-      await partyleader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
 
       let memberRemoved = await partyMember.get('/user');
 
@@ -115,18 +115,63 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
 
     it('updates memberCount', async () => {
       let oldMemberCount = party.memberCount;
-      await partyleader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
-      await expect(partyleader.get(`/groups/${party._id}`)).to.eventually.have.property('memberCount', oldMemberCount - 1);
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+      await expect(partyLeader.get(`/groups/${party._id}`)).to.eventually.have.property('memberCount', oldMemberCount - 1);
     });
 
     it('can remove other invites', async () => {
       expect(partyInvitedUser.invitations.party).to.not.be.empty;
 
-      await partyleader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
 
       let invitedUserWithoutInvite = await partyInvitedUser.get('/user');
 
       expect(invitedUserWithoutInvite.invitations.party).to.be.empty;
     });
+
+    it('removes user from quest when removing user from party after quest starts', async () => {
+      let petQuest = 'whale';
+      await partyLeader.update({
+        [`items.quests.${petQuest}`]: 1,
+      });
+
+      await partyLeader.post(`/groups/${party._id}/quests/invite/${petQuest}`);
+      await partyMember.post(`/groups/${party._id}/quests/accept`);
+
+      await party.sync();
+
+      expect(party.quest.members[partyLeader._id]).to.be.true;
+      expect(party.quest.members[partyMember._id]).to.be.true;
+
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+
+      await party.sync();
+
+      expect(party.quest.members[partyLeader._id]).to.be.true;
+      expect(party.quest.members[partyMember._id]).to.not.exist;
+    });
+
+    it('removes user from quest when removing user from party before quest starts', async () => {
+      let petQuest = 'whale';
+      await partyLeader.update({
+        [`items.quests.${petQuest}`]: 1,
+      });
+      await partyInvitedUser.post(`/groups/${party._id}/join`);
+      await partyLeader.post(`/groups/${party._id}/quests/invite/${petQuest}`);
+      await partyMember.post(`/groups/${party._id}/quests/accept`);
+
+      await party.sync();
+
+      expect(party.quest.active).to.be.false;
+      expect(party.quest.members[partyLeader._id]).to.be.true;
+      expect(party.quest.members[partyMember._id]).to.be.true;
+
+      await partyLeader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+
+      await party.sync();
+
+      expect(party.quest.members[partyLeader._id]).to.be.true;
+      expect(party.quest.members[partyMember._id]).to.not.exist;
+    });
   });
 });