Merge pull request #8035 from nextcloud/backport/7894/stable33

[stable33] fix(comments): register event listener for typed comment events

Author: luka-nextcloud

lib/AppInfo/Application.php

@@ -58,7 +58,10 @@
 use OCP\Collaboration\Resources\IProviderManager;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 use OCP\Comments\CommentsEntityEvent;
-use OCP\Comments\CommentsEvent;
+use OCP\Comments\Events\BeforeCommentUpdatedEvent;
+use OCP\Comments\Events\CommentAddedEvent;
+use OCP\Comments\Events\CommentDeletedEvent;
+use OCP\Comments\Events\CommentUpdatedEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\IConfig;
@@ -146,7 +149,10 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(AclCreatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclUpdatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclDeletedEvent::class, FullTextSearchEventListener::class);
-		$context->registerEventListener(CommentsEvent::class, CommentEventListener::class);
+		$context->registerEventListener(CommentAddedEvent::class, CommentEventListener::class);
+		$context->registerEventListener(BeforeCommentUpdatedEvent::class, CommentEventListener::class);
+		$context->registerEventListener(CommentUpdatedEvent::class, CommentEventListener::class);
+		$context->registerEventListener(CommentDeletedEvent::class, CommentEventListener::class);
 
 		// Handling cache invalidation for collections
 		$context->registerEventListener(AclCreatedEvent::class, ResourceListener::class);

tests/unit/Listeners/CommentEventListenerTest.php

@@ -29,7 +29,8 @@
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Notification\NotificationHelper;
-use OCP\Comments\CommentsEvent;
+use OCP\Comments\Events\CommentAddedEvent;
+use OCP\Comments\Events\CommentUpdatedEvent;
 use OCP\Comments\IComment;
 use PHPUnit\Framework\TestCase;
 
@@ -68,7 +69,7 @@ public function testHandle() {
 		$this->cardMapper->expects($this->once())
 			->method('find')
 			->willReturn($card);
-		$commentsEvent = new CommentsEvent(CommentsEvent::EVENT_ADD, $comment);
+		$commentsEvent = new CommentAddedEvent($comment);
 		$this->activityManager->expects($this->once())
 			->method('triggerEvent')
 			->with(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment]);
@@ -82,7 +83,7 @@ public function testHandleUpdate() {
 		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())->method('getId')->willReturn(1);
 		$comment->expects($this->any())->method('getObjectType')->willReturn('deckCard');
-		$commentsEvent = new CommentsEvent(CommentsEvent::EVENT_UPDATE, $comment);
+		$commentsEvent = new CommentUpdatedEvent($comment);
 		$this->activityManager->expects($this->never())
 			->method('triggerEvent');
 		$this->notificationHelper->expects($this->once())
@@ -95,7 +96,7 @@ public function testHandleInvalid() {
 		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())->method('getId')->willReturn(1);
 		$comment->expects($this->any())->method('getObjectType')->willReturn('other');
-		$commentsEvent = new CommentsEvent(CommentsEvent::EVENT_ADD, $comment);
+		$commentsEvent = new CommentAddedEvent($comment);
 		$this->activityManager->expects($this->never())
 			->method('triggerEvent');
 		$this->commentEventHandler->handle($commentsEvent);