Skip to content

Fix information in activity emails #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Dec 4, 2018
Merged

Fix information in activity emails #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8499318
Fix comment activity entry
juliusknorr Dec 4, 2018
e5fe19c
Fix missing information in activity emails
juliusknorr Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions lib/Activity/ActivityManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,13 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
// case self::SUBJECT_BOARD_UPDATE_COLOR
break;
case self::SUBJECT_CARD_COMMENT_CREATE:
/** @var IComment $entity */
$subjectParams = [
'comment' => $entity->getMessage()
];
$message = '{comment}';
$subjectParams = $this->findDetailsForCard($entity->getId());
if (array_key_exists('comment', $additionalParams)) {
/** @var IComment $entity */
$comment = $additionalParams['comment'];
$subjectParams['comment'] = $comment->getId();
unset($additionalParams['comment']);
}
break;

case self::SUBJECT_STACK_CREATE:
Expand Down Expand Up @@ -375,6 +377,9 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
$subjectParams['stackBefore'] = $this->stackMapper->find($additionalParams['before']);
}

$subjectParams['author'] = $this->userId;


$event = $this->manager->generateEvent();
$event->setApp('deck')
->setType('deck')
Expand Down
12 changes: 10 additions & 2 deletions lib/Activity/CommentEventHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@

namespace OCA\Deck\Activity;

use OCA\Deck\Db\CardMapper;
use OCA\Deck\Notification\NotificationHelper;
use OCP\Comments\CommentsEvent;
use OCP\Comments\IComment;
use \OCP\Comments\ICommentsEventHandler;

class CommentEventHandler implements ICommentsEventHandler {
Expand All @@ -35,9 +37,13 @@ class CommentEventHandler implements ICommentsEventHandler {
/** @var NotificationHelper */
private $notificationHelper;

public function __construct(ActivityManager $activityManager, NotificationHelper $notificationHelper) {
/** @var CardMapper */
private $cardMapper;

public function __construct(ActivityManager $activityManager, NotificationHelper $notificationHelper, CardMapper $cardMapper) {
$this->notificationHelper = $notificationHelper;
$this->activityManager = $activityManager;
$this->cardMapper = $cardMapper;
}

/**
Expand Down Expand Up @@ -71,8 +77,10 @@ public function handle(CommentsEvent $event) {
* @param CommentsEvent $event
*/
private function activityHandler(CommentsEvent $event) {
/** @var IComment $comment */
$comment = $event->getComment();
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $comment, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment->getId()]);
$card = $this->cardMapper->find($comment->getObjectId());
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment]);

}

Expand Down
14 changes: 13 additions & 1 deletion lib/Activity/DeckProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
*/

$author = $event->getAuthor();
// get author if
if ($author === '' && array_key_exists('author', $subjectParams)) {
$author = $subjectParams['author'];
unset($subjectParams['author']);
}
$user = $this->userManager->get($author);
$params = [
'user' => [
Expand All @@ -90,6 +95,9 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
],
];
if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) {
if ($event->getObjectName() === '') {
$event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['board']['title']);
}
$board = [
'type' => 'highlight',
'id' => $event->getObjectId(),
Expand All @@ -100,6 +108,9 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
}

if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
if ($event->getObjectName() === '') {
$event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['card']['title']);
}
$card = [
'type' => 'highlight',
'id' => $event->getObjectId(),
Expand Down Expand Up @@ -149,6 +160,7 @@ protected function setSubjects(IEvent $event, $subject, array $parameters) {

$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
->setRichSubject($subject, $parameters);
$event->setSubject($subject, $parameters);
}

private function getIcon(IEvent $event) {
Expand Down Expand Up @@ -301,6 +313,6 @@ private function parseParamForChanges($subjectParams, $params, $event) {
}

public function deckUrl($endpoint) {
return $this->urlGenerator->linkToRoute('deck.page.index') . '#!' . $endpoint;
return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#!' . $endpoint;
}
}
13 changes: 11 additions & 2 deletions tests/unit/Activity/CommentEventHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,33 @@ class CommentEventHandlerTest extends TestCase {
private $activityManager;
/** @var NotificationHelper */
private $notificationHelper;
/** @var CardMapper */
private $cardMapper;

public function setUp() {
$this->activityManager = $this->createMock(ActivityManager::class);
$this->notificationHelper = $this->createMock(NotificationHelper::class);
$this->cardMapper = $this->createMock(CardMapper::class);
$this->commentEventHandler = new CommentEventHandler(
$this->activityManager,
$this->notificationHelper
$this->notificationHelper,
$this->cardMapper
);
}

public function testHandle() {
$comment = $this->createMock(IComment::class);
$comment->expects($this->any())->method('getId')->willReturn(1);
$comment->expects($this->any())->method('getObjectType')->willReturn('deckCard');
$comment->expects($this->any())->method('getMessage')->willReturn('Hello world');
$card = $this->createMock(Card::class);
$this->cardMapper->expects($this->once())
->method('find')
->willReturn($card);
$commentsEvent = new CommentsEvent(CommentsEvent::EVENT_ADD, $comment);
$this->activityManager->expects($this->once())
->method('triggerEvent')
->with(ActivityManager::DECK_OBJECT_CARD, $comment, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => 1]);
->with(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment]);
$this->notificationHelper->expects($this->once())
->method('sendMention')
->with($comment);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Activity/DeckProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function testEventIcons($subject, $app, $icon) {

public function testDeckUrl() {
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
->method('linkToRouteAbsolute')
->with('deck.page.index')
->willReturn('http://localhost/index.php/apps/deck/');
$this->assertEquals(
Expand Down