Fixed send message for parties and added party seen message test

This commit is contained in:
Keith Holliday
2016-01-23 19:56:11 -06:00
parent 9405d4b054
commit ff034cf61b
2 changed files with 63 additions and 21 deletions

View File

@@ -3,7 +3,8 @@ import {
} from '../../../../helpers/api-v3-integration.helper';
describe('POST /groups/:id/chat/seen', () => {
let groupWithChat, message, author, member;
context('Guild', () => {
let guild, guildLeader, guildMember, guildMessage;
before(async () => {
let { group, groupLeader, members } = await createAndPopulateGroup({
@@ -14,19 +15,53 @@ describe('POST /groups/:id/chat/seen', () => {
members: 1,
});
groupWithChat = group;
author = groupLeader;
member = members[0];
guild = group;
guildLeader = groupLeader;
guildMember = members[0];
message = await author.post(`/groups/${groupWithChat._id}/chat`, { message: 'Some message' });
message = message.message;
guildMessage = await guildLeader.post(`/groups/${guild._id}/chat`, { message: 'Some guild message' });
guildMessage = guildMessage.message;
});
it('clears new messages', async () => {
await member.post(`/groups/${groupWithChat._id}/chat/seen`);
it('clears new messages for a guild', async () => {
let user = await guildMember.get('/user');
let userThatHasSeenChat = await member.get('/user');
await guildMember.post(`/groups/${guild._id}/chat/seen`);
expect(userThatHasSeenChat.newMessages).to.be.empty;
let guildThatHasSeenChat = await guildMember.get('/user');
expect(guildThatHasSeenChat.newMessages).to.be.empty;
});
});
context('Party', () => {
let party, partyLeader, partyMember, partyMessage;
before(async () => {
let { group, groupLeader, members } = await createAndPopulateGroup({
groupDetails: {
type: 'party',
privacy: 'private',
},
members: 1,
});
party = group;
partyLeader = groupLeader;
partyMember = members[0];
partyMessage = await partyLeader.post(`/groups/${party._id}/chat`, { message: 'Some party message' });
partyMessage = partyMessage.message;
});
it('clears new messages for a party', async () => {
let user = await partyMember.get('/user');
await partyMember.post(`/groups/${party._id}/chat/seen`);
let partyMemberThatHasSeenChat = await partyMember.get('/user');
expect(partyMemberThatHasSeenChat.newMessages).to.be.empty;
});
});
});

View File

@@ -204,10 +204,17 @@ schema.methods.sendChat = function sendChat (message, user) {
// var profileNames = [] // get usernames from regex of @xyz. how to handle space-delimited profile names?
// User.update({'profile.name':{$in:profileNames}},lastSeenUpdate,{multi:true}).exec();
} else {
User.update({
guilds: this._id,
_id: { $ne: user ? user._id : ''},
}, lastSeenUpdate, {multi: true}).exec();
let query = {};
if (this.type === 'party') {
query['party._id'] = this._id;
} else {
query.guilds = this._id;
}
query._id = { $ne: user ? user._id : ''};
User.update(query, lastSeenUpdate, {multi: true}).exec();
}
};