Remove user's group msg notification when they are kicked from the group

This commit is contained in:
TheHollidayInn
2015-07-10 22:39:17 -05:00
parent 3dd2493fed
commit acb82f99ce
2 changed files with 66 additions and 0 deletions

View File

@@ -98,3 +98,64 @@ describe "Chat", ->
body = res.body
expect(body.err).to.equal "Message not found!"
done()
it "removes a user's chat notifications when user is kicked", (done) ->
userToRemove = null
async.waterfall [
(cb) ->
registerManyUsers 1, cb
(_members, cb) ->
userToRemove = _members[0]
members = _members
inviteURL = baseURL + "/groups/" + group._id + "/invite"
request.post(inviteURL).send(
uuids: [userToRemove._id]
)
.end ->
cb()
(cb) ->
request.post(baseURL + "/groups/" + group._id + "/join")
.set("X-API-User", userToRemove._id)
.set("X-API-Key", userToRemove.apiToken)
.end (res) ->
cb()
(cb) ->
msg = "TestMsg"
request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).end (res) ->
expectCode res, 200
cb()
(cb) ->
request.get(baseURL + "/user")
.set("X-API-User", userToRemove._id)
.set("X-API-Key", userToRemove.apiToken)
.end (res) ->
expect(res.body.newMessages[group._id]).to.exist
cb()
(cb) ->
request.post(baseURL + "/groups/" + group._id + "/removeMember?uuid=" + userToRemove._id)
.send().end (res) ->
expectCode res, 204
cb()
(cb) ->
request.get(baseURL + "/groups/" + group._id)
.send()
.end (res) ->
g = res.body
userInGroup = _.find g.members, (member) -> return member._id == userToRemove._id
expect(userInGroup).to.not.exist
cb()
(cb) ->
request.get(baseURL + "/user")
.set("X-API-User", userToRemove._id)
.set("X-API-Key", userToRemove.apiToken)
.end (res) ->
expect(res.body.newMessages[group._id]).to.not.exist
cb()
], done

View File

@@ -754,6 +754,11 @@ api.removeMember = function(req, res, next){
sendMessage(removedUser);
//Mark removed users messages as seen
var update = {$unset:{}};
update['$unset']['newMessages.'+group._id] = '';
User.update({_id:removedUser._id, apiToken:removedUser.apiToken},update).exec();
// Sending an empty 204 because Group.update doesn't return the group
// see http://mongoosejs.com/docs/api.html#model_Model.update
group = uuid = null;