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

Remove unneeded data from card details

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2019-06-30 13:20:38 +02:00
parent 691988c885
commit 5b019b1c04
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Activity/ActivityManager.php
View File

@@ -357,7 +357,7 @@ class ActivityManager {
case self::SUBJECT_LABEL_UNASSING: case self::SUBJECT_LABEL_UNASSING:
case self::SUBJECT_CARD_USER_ASSIGN: case self::SUBJECT_CARD_USER_ASSIGN:
case self::SUBJECT_CARD_USER_UNASSIGN: case self::SUBJECT_CARD_USER_UNASSIGN:
$subjectParams = $this->findDetailsForCard($entity->getId()); $subjectParams = $this->findDetailsForCard($entity->getId(), $subject);
$object = $entity; $object = $entity;
break; break;
case self::SUBJECT_ATTACHMENT_CREATE: 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); $card = $this->cardMapper->find($cardId);
$stack = $this->stackMapper->find($card->getStackId()); $stack = $this->stackMapper->find($card->getStackId());
$board = $this->boardMapper->find($stack->getBoardId()); $board = $this->boardMapper->find($stack->getBoardId());
if ($subject !== self::SUBJECT_CARD_UPDATE_DESCRIPTION) {
$card = [
'id' => $card->getId(),
'title' => $card->getTitle(),
'archived' => $card->getArchived()
];
}
return [ return [
'card' => $card, 'card' => $card,
'stack' => $stack, 'stack' => $stack,

12
tests/unit/Activity/ActivityManagerTest.php
View File

@@ -295,7 +295,11 @@ class ActivityManagerTest extends TestCase {
$this->assertEquals([ $this->assertEquals([
'stack' => $stack, 'stack' => $stack,
'board' => $board, 'board' => $board,
'card' => $card 'card' => [
'id' => $card->getId(),
'title' => $card->getTitle(),
'archived' => $card->getArchived()
]
], $this->invokePrivate($this->activityManager, 'findDetailsForCard', [555])); ], $this->invokePrivate($this->activityManager, 'findDetailsForCard', [555]));
} }
@@ -329,7 +333,11 @@ class ActivityManagerTest extends TestCase {
$this->assertEquals([ $this->assertEquals([
'stack' => $stack, 'stack' => $stack,
'board' => $board, 'board' => $board,
'card' => $card, 'card' => [
'id' => $card->getId(),
'title' => $card->getTitle(),
'archived' => $card->getArchived()
],
'attachment' => $attachment 'attachment' => $attachment
], $this->invokePrivate($this->activityManager, 'findDetailsForAttachment', [777])); ], $this->invokePrivate($this->activityManager, 'findDetailsForAttachment', [777]));
} }

2
tests/unit/Activity/FilterTest.php
View File

@@ -71,7 +71,7 @@ class FilterTest extends TestCase {
public function testFilterTypes() { public function testFilterTypes() {
$data = ['deck_board', 'deck_card']; $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() { public function testAllowedApps() {