diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index f3a0c3489..e90aa61b0 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -357,7 +357,7 @@ class ActivityManager { case self::SUBJECT_LABEL_UNASSING: case self::SUBJECT_CARD_USER_ASSIGN: case self::SUBJECT_CARD_USER_UNASSIGN: - $subjectParams = $this->findDetailsForCard($entity->getId()); + $subjectParams = $this->findDetailsForCard($entity->getId(), $subject); $object = $entity; break; case self::SUBJECT_ATTACHMENT_CREATE: @@ -493,10 +493,17 @@ class ActivityManager { ]; } - private function findDetailsForCard($cardId) { + private function findDetailsForCard($cardId, $subject = null) { $card = $this->cardMapper->find($cardId); $stack = $this->stackMapper->find($card->getStackId()); $board = $this->boardMapper->find($stack->getBoardId()); + if ($subject !== self::SUBJECT_CARD_UPDATE_DESCRIPTION) { + $card = [ + 'id' => $card->getId(), + 'title' => $card->getTitle(), + 'archived' => $card->getArchived() + ]; + } return [ 'card' => $card, 'stack' => $stack, diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php index 8bcf3884e..7d6b515ea 100644 --- a/tests/unit/Activity/ActivityManagerTest.php +++ b/tests/unit/Activity/ActivityManagerTest.php @@ -295,7 +295,11 @@ class ActivityManagerTest extends TestCase { $this->assertEquals([ 'stack' => $stack, 'board' => $board, - 'card' => $card + 'card' => [ + 'id' => $card->getId(), + 'title' => $card->getTitle(), + 'archived' => $card->getArchived() + ] ], $this->invokePrivate($this->activityManager, 'findDetailsForCard', [555])); } @@ -329,7 +333,11 @@ class ActivityManagerTest extends TestCase { $this->assertEquals([ 'stack' => $stack, 'board' => $board, - 'card' => $card, + 'card' => [ + 'id' => $card->getId(), + 'title' => $card->getTitle(), + 'archived' => $card->getArchived() + ], 'attachment' => $attachment ], $this->invokePrivate($this->activityManager, 'findDetailsForAttachment', [777])); } diff --git a/tests/unit/Activity/FilterTest.php b/tests/unit/Activity/FilterTest.php index d3e6b82c5..d58ad34b9 100644 --- a/tests/unit/Activity/FilterTest.php +++ b/tests/unit/Activity/FilterTest.php @@ -71,7 +71,7 @@ class FilterTest extends TestCase { public function testFilterTypes() { $data = ['deck_board', 'deck_card']; - $this->assertEquals($data, $this->filter->filterTypes($data)); + $this->assertEquals(array_merge($data, ['deck_comment']), $this->filter->filterTypes($data)); } public function testAllowedApps() {