sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 23:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves

Browse source 
Groups delete when last member leaves
This commit is contained in:
Matteo Pagliazzi 2015-09-09 11:26:04 +02:00
commit c292d7b438
2 changed files with 96 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
test/api/groups.coffee
View file

@ -11,7 +11,7 @@ describe "Guilds", ->
registerNewUser ->
User.findByIdAndUpdate user._id,
$set:
"balance": 10
"balance": 40
, (err, _user) ->
done()
, true
@ -150,6 +150,73 @@ describe "Guilds", ->
expectCode res, 204
done()
it "deletes a group when the last member leaves", (done) ->
groupToDeleteAfterLeave = undefined
request.post(baseURL + "/groups").send(
name: "TestGroupToDeleteAfteLeave"
type: "guild"
privacy: "private"
).end (res) ->
groupToDeleteAfterLeave = res.body
async.waterfall [
(cb) ->
request.post(baseURL + "/groups/" + groupToDeleteAfterLeave._id + "/leave")
.end (res) ->
expectCode res, 204
cb()
(cb) ->
request.post(baseURL + "/groups/" + groupToDeleteAfterLeave._id)
.end (res) ->
expectCode res, 404
cb()
], done
it "deletes all invites to a group when the last member leaves", (done) ->
groupToDeleteAfterLeave = undefined
userToRemoveInvite = undefined
request.post(baseURL + "/groups").send(
name: "TestGroupToDeleteAfteLeave"
type: "guild"
privacy: "private"
).end (res) ->
groupToDeleteAfterLeave = res.body
async.waterfall [
(cb) ->
registerManyUsers 1, cb
(_members, cb) ->
userToRemoveInvite = _members[0]
inviteURL = baseURL + "/groups/" + groupToDeleteAfterLeave._id + "/invite"
request.post(inviteURL).send(
uuids: [userToRemoveInvite._id]
)
.end ->
cb()
(cb) ->
request.post(baseURL + "/groups/" + groupToDeleteAfterLeave._id + "/leave")
.end (res) ->
expectCode res, 204
cb()
(cb) ->
request.get(baseURL + '/user')
.set("X-API-User", userToRemoveInvite._id)
.set("X-API-Key", userToRemoveInvite.apiToken)
.end (err, res) ->
expectCode res, 200
groupInvitation = _.find(res.body.invitations.guilds, {id: groupToDeleteAfterLeave._id})
expect(groupInvitation).to.not.exist
cb()
(cb) ->
request.post(baseURL + "/groups/" + groupToDeleteAfterLeave._id)
.end (res) ->
expectCode res, 404
cb()
], done
context "removing users groups", ->
it "allows guild leaders to remove a member (but not themselves)", (done) ->
guildToRemoveMember = undefined

37
website/src/models/group.js
View file

@ -84,6 +84,31 @@ GroupSchema.pre('save', function(next){
next();
})
GroupSchema.pre('remove', function(next) {
var group = this;
async.waterfall([
function(cb) {
User.find({
'invitations.guilds.id': group._id
}, cb);
},
function(users, cb) {
if (users) {
users.forEach(function (user, index, array) {
var i = _.findIndex(user.invitations.guilds, {id: group._id});
user.invitations.guilds.splice(i, 1);
user.save();
});
}
cb();
}
], next);
});
GroupSchema.post('remove', function(group) {
firebase.deleteGroup(group._id);
});
GroupSchema.methods.toJSON = function(){
var doc = this.toObject();
removeDuplicates(doc);
@ -358,8 +383,7 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
if(typeof keep !== 'string') keep = 'keep-all'; // can be also 'remove-all'
var group = this;
var groupWasRemoved = false;
async.parallel([
// Remove user from group challenges
function(cb){
@ -404,11 +428,7 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
group.type === 'party' ||
(group.type === 'guild' && group.privacy === 'private')
)){
// TODO remove invitations to this group
groupWasRemoved = true;
Group.remove({
_id: group._id
}, cb);
group.remove(cb)
}else{ // otherwise just remove a member
var update = {$pull: {members: user._id}};
@ -435,7 +455,6 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
if(err) return mainCb(err);
firebase.removeUserFromGroup(group._id, user._id);
if(groupWasRemoved) firebase.deleteGroup(group._id);
return mainCb();
});
};
@ -468,4 +487,4 @@ Group.count({_id: 'habitrpg'}, function(err, ct){
type: 'guild',
privacy: 'public'
}).save();
});
});