ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use proper trigger methods for activities

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-06 09:25:21 +02:00
parent f8f36dac09
commit e06a5ad44f
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Service/BoardService.php
View File

@@ -275,8 +275,7 @@ class BoardService {
'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE], 'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE],
'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE] 'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE]
]); ]);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE);
$this->activityManager->sendToUsers($event);
return $new_board; return $new_board;
} }
@@ -299,8 +298,7 @@ class BoardService {
$board = $this->find($id); $board = $this->find($id);
$board->setDeletedAt(time()); $board->setDeletedAt(time());
$board = $this->boardMapper->update($board); $board = $this->boardMapper->update($board);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_DELETE);
$this->activityManager->sendToUsers($event);
return $board; return $board;
} }
@@ -321,8 +319,7 @@ class BoardService {
$board = $this->find($id); $board = $this->find($id);
$board->setDeletedAt(0); $board->setDeletedAt(0);
$board = $this->boardMapper->update($board); $board = $this->boardMapper->update($board);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_RESTORE);
$this->activityManager->sendToUsers($event);
return $board; return $board;
} }
@@ -438,8 +435,7 @@ class BoardService {
$newAcl = $this->aclMapper->insert($acl); $newAcl = $this->aclMapper->insert($acl);
$this->boardMapper->mapAcl($newAcl); $this->boardMapper->mapAcl($newAcl);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
$this->activityManager->sendToUsers($event);
return $newAcl; return $newAcl;
} }

3
lib/Service/CardService.php
View File

@@ -363,8 +363,7 @@ class CardService {
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setArchived(true); $card->setArchived(true);
$newCard = $this->cardMapper->update($card); $newCard = $this->cardMapper->update($card);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE);
$this->activityManager->sendToUsers($event);
return $newCard; return $newCard;
} }

10
lib/Service/StackService.php
View File

@@ -74,7 +74,7 @@ class StackService {
} }
private function enrichStackWithCards($stack) { private function enrichStackWithCards($stack) {
$cards = $this->cardMapper->findAll($stack->id); $cards = $this->cardMapper->findAll($stack->getId());
if(is_null($cards)) { if(is_null($cards)) {
return; return;
@@ -201,8 +201,7 @@ class StackService {
$stack->setBoardId($boardId); $stack->setBoardId($boardId);
$stack->setOrder($order); $stack->setOrder($order);
$stack = $this->stackMapper->insert($stack); $stack = $this->stackMapper->insert($stack);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_CREATE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_CREATE);
$this->activityManager->sendToUsers($event);
return $stack; return $stack;
} }
@@ -226,8 +225,7 @@ class StackService {
$stack->setDeletedAt(time()); $stack->setDeletedAt(time());
$stack = $this->stackMapper->update($stack); $stack = $this->stackMapper->update($stack);
$event = $this->activityManager->createEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_DELETE); $this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $stack, ActivityManager::SUBJECT_STACK_DELETE);
$this->activityManager->sendToUsers($event);
$this->enrichStackWithCards($stack); $this->enrichStackWithCards($stack);
return $stack; return $stack;
@@ -276,7 +274,7 @@ class StackService {
$stack->setDeletedAt($deletedAt); $stack->setDeletedAt($deletedAt);
$changes->setAfter($stack); $changes->setAfter($stack);
$stack = $this->stackMapper->update($stack); $stack = $this->stackMapper->update($stack);
$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_BOARD, $changes->getAfter(), ActivityManager::SUBJECT_STACK_UPDATE, $changes->getBefore()); $this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_BOARD, $changes, ActivityManager::SUBJECT_STACK_UPDATE);
return $stack; return $stack;
} }