CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-18 18:54:55 +12:00
Code Issues Projects Releases Wiki Activity

fix(teams): incorrect membership count in teams

Browse source
This commit is contained in:
Christy Jacob 2021-05-29 02:25:22 +05:30
parent 3b98feef11
commit b0e74b6d7b
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/teams.php
View file

@ -790,7 +790,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
if ($membership->getAttribute('confirm')) { // Count only confirmed members if ($membership->getAttribute('confirm')) { // Count only confirmed members
$team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [
'sum' => $team->getAttribute('sum', 0) - 1, 'sum' => \max($team->getAttribute('sum', 0) - 1, 0),
])); ]));
} }

2
app/views/console/users/user.phtml
View file

@ -110,7 +110,7 @@
data-analytics-event="submit" data-analytics-event="submit"
data-analytics-category="console" data-analytics-category="console"
data-analytics-label="Delete User" data-analytics-label="Delete User"
data-service="users.deleteUser" data-service="users.delete"
data-event="submit" data-event="submit"
data-param-user-id="{{router.params.id}}" data-param-user-id="{{router.params.id}}"
data-success="alert,trigger,redirect" data-success="alert,trigger,redirect"

17
app/workers/deletes.php
View file

@ -128,24 +128,21 @@ class DeletesV1
} }
} }
var_dump("Hi there! Gonna delete memberships"); // Delete Memberships and decrement team membership counts
// Delete Memberships and update the team membership counts
$this->deleteByGroup([ $this->deleteByGroup([
'$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS, '$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
'userId='.$document->getId(), 'userId='.$document->getId(),
], $this->getProjectDB($projectId), function(Document $document) use ($projectId,){ ], $this->getProjectDB($projectId), function(Document $document) use ($projectId) {
var_dump("In call back ");
print_r($document);
if ($document->getAttribute('confirm')) { // Count only confirmed members if ($document->getAttribute('confirm')) { // Count only confirmed members
$teamId = $document->getAttribute('teamId'); $teamId = $document->getAttribute('teamId');
$team = $this->getProjectDB($projectId)->getDocument($teamId); $team = $this->getProjectDB($projectId)->getDocument($teamId);
print_r($team); if(!$team->isEmpty()) {
// $team = $this->getProjectDB($projectId)->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $this->getProjectDB($projectId)->updateDocument(\array_merge($team->getArrayCopy(), [
// 'sum' => $team->getAttribute('sum', 0) - 1, 'sum' => \max($team->getAttribute('sum', 0) - 1, 0),
// ])); ]));
}
} }
}); });
} }