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

Emit activity events in CardService

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-01 14:25:48 +02:00
parent c32ab5648c
commit df8c1984ca
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Service/CardService.php
View File

@@ -23,6 +23,8 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\AssignedUsers;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignedUsersMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
@@ -48,17 +50,19 @@ class CardService {
private $assignedUsersMapper; private $assignedUsersMapper;
private $attachmentService; private $attachmentService;
private $currentUser; private $currentUser;
private $activityManager;
public function __construct( public function __construct(
CardMapper $cardMapper, CardMapper $cardMapper,
StackMapper $stackMapper, StackMapper $stackMapper,
BoardMapper $boardMapper, BoardMapper $boardMapper,
LabelMapper $labelMapper, LabelMapper $labelMapper,
PermissionService $permissionService, PermissionService $permissionService,
BoardService $boardService, BoardService $boardService,
NotificationHelper $notificationHelper, NotificationHelper $notificationHelper,
AssignedUsersMapper $assignedUsersMapper, AssignedUsersMapper $assignedUsersMapper,
AttachmentService $attachmentService, AttachmentService $attachmentService,
ActivityManager $activityManager,
$userId $userId
) { ) {
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
@@ -70,6 +74,7 @@ class CardService {
$this->notificationHelper = $notificationHelper; $this->notificationHelper = $notificationHelper;
$this->assignedUsersMapper = $assignedUsersMapper; $this->assignedUsersMapper = $assignedUsersMapper;
$this->attachmentService = $attachmentService; $this->attachmentService = $attachmentService;
$this->activityManager = $activityManager;
$this->currentUser = $userId; $this->currentUser = $userId;
} }
@@ -157,7 +162,9 @@ class CardService {
$card->setType($type); $card->setType($type);
$card->setOrder($order); $card->setOrder($order);
$card->setOwner($owner); $card->setOwner($owner);
return $this->cardMapper->insert($card); $card = $this->cardMapper->insert($card);
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_CREATE);
return $card;
} }
/** /**
@@ -182,6 +189,7 @@ class CardService {
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setDeletedAt(time()); $card->setDeletedAt(time());
$this->cardMapper->update($card); $this->cardMapper->update($card);
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_DELETE);
return $card; return $card;
} }
@@ -204,7 +212,7 @@ class CardService {
public function update($id, $title, $stackId, $type, $order = 0, $description = '', $owner, $duedate = null, $deletedAt) { public function update($id, $title, $stackId, $type, $order = 0, $description = '', $owner, $duedate = null, $deletedAt) {
if (is_numeric($id) === false) { if (is_numeric($id) === false) {
throw new BadRequestException('card id must be a number'); throw new BadRequestException('card id must be a number');
} }
if ($title === false || $title === null) { if ($title === false || $title === null) {
@@ -231,6 +239,7 @@ class CardService {
if ($card->getArchived()) { if ($card->getArchived()) {
throw new StatusException('Operation not allowed. This card is archived.'); throw new StatusException('Operation not allowed. This card is archived.');
} }
$changes = new ChangeSet($card);
$card->setTitle($title); $card->setTitle($title);
$card->setStackId($stackId); $card->setStackId($stackId);
$card->setType($type); $card->setType($type);
@@ -239,7 +248,9 @@ class CardService {
$card->setDescription($description); $card->setDescription($description);
$card->setDuedate($duedate); $card->setDuedate($duedate);
$card->setDeletedAt($deletedAt); $card->setDeletedAt($deletedAt);
return $this->cardMapper->update($card); $changes->setAfter($card);
$this->cardMapper->update($card);
$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_CARD, $changes, ActivityManager::SUBJECT_CARD_UPDATE);
} }
/** /**
@@ -350,7 +361,10 @@ class CardService {
} }
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setArchived(true); $card->setArchived(true);
return $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->sendToUsers($event);
return $newCard;
} }
/** /**
@@ -374,7 +388,9 @@ class CardService {
} }
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setArchived(false); $card->setArchived(false);
return $this->cardMapper->update($card); $newCard = $this->cardMapper->update($card);
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_UNARCHIVE);
return $newCard;
} }
/** /**