Mark notifications as processed when the board does no longer exist
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
@@ -28,6 +28,7 @@ use OCA\Deck\Db\CardMapper;
|
|||||||
use OCP\IURLGenerator;
|
use OCP\IURLGenerator;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
use OCP\L10N\IFactory;
|
use OCP\L10N\IFactory;
|
||||||
|
use OCP\Notification\AlreadyProcessedException;
|
||||||
use OCP\Notification\INotification;
|
use OCP\Notification\INotification;
|
||||||
use OCP\Notification\INotifier;
|
use OCP\Notification\INotifier;
|
||||||
|
|
||||||
@@ -96,6 +97,9 @@ class Notifier implements INotifier {
|
|||||||
case 'card-assigned':
|
case 'card-assigned':
|
||||||
$cardId = $notification->getObjectId();
|
$cardId = $notification->getObjectId();
|
||||||
$boardId = $this->cardMapper->findBoardId($cardId);
|
$boardId = $this->cardMapper->findBoardId($cardId);
|
||||||
|
if (!$boardId) {
|
||||||
|
throw new AlreadyProcessedException();
|
||||||
|
}
|
||||||
$initiator = $this->userManager->get($params[2]);
|
$initiator = $this->userManager->get($params[2]);
|
||||||
if ($initiator !== null) {
|
if ($initiator !== null) {
|
||||||
$dn = $initiator->getDisplayName();
|
$dn = $initiator->getDisplayName();
|
||||||
@@ -120,6 +124,9 @@ class Notifier implements INotifier {
|
|||||||
case 'card-overdue':
|
case 'card-overdue':
|
||||||
$cardId = $notification->getObjectId();
|
$cardId = $notification->getObjectId();
|
||||||
$boardId = $this->cardMapper->findBoardId($cardId);
|
$boardId = $this->cardMapper->findBoardId($cardId);
|
||||||
|
if (!$boardId) {
|
||||||
|
throw new AlreadyProcessedException();
|
||||||
|
}
|
||||||
$notification->setParsedSubject(
|
$notification->setParsedSubject(
|
||||||
(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
|
(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
|
||||||
);
|
);
|
||||||
@@ -128,6 +135,9 @@ class Notifier implements INotifier {
|
|||||||
case 'card-comment-mentioned':
|
case 'card-comment-mentioned':
|
||||||
$cardId = $notification->getObjectId();
|
$cardId = $notification->getObjectId();
|
||||||
$boardId = $this->cardMapper->findBoardId($cardId);
|
$boardId = $this->cardMapper->findBoardId($cardId);
|
||||||
|
if (!$boardId) {
|
||||||
|
throw new AlreadyProcessedException();
|
||||||
|
}
|
||||||
$initiator = $this->userManager->get($params[2]);
|
$initiator = $this->userManager->get($params[2]);
|
||||||
if ($initiator !== null) {
|
if ($initiator !== null) {
|
||||||
$dn = $initiator->getDisplayName();
|
$dn = $initiator->getDisplayName();
|
||||||
@@ -154,6 +164,9 @@ class Notifier implements INotifier {
|
|||||||
break;
|
break;
|
||||||
case 'board-shared':
|
case 'board-shared':
|
||||||
$boardId = $notification->getObjectId();
|
$boardId = $notification->getObjectId();
|
||||||
|
if (!$boardId) {
|
||||||
|
throw new AlreadyProcessedException();
|
||||||
|
}
|
||||||
$initiator = $this->userManager->get($params[1]);
|
$initiator = $this->userManager->get($params[1]);
|
||||||
if ($initiator !== null) {
|
if ($initiator !== null) {
|
||||||
$dn = $initiator->getDisplayName();
|
$dn = $initiator->getDisplayName();
|
||||||
|
|||||||
@@ -177,6 +177,10 @@ class NotifierTest extends \Test\TestCase {
|
|||||||
|
|
||||||
/** @dataProvider dataPrepareCardAssigned */
|
/** @dataProvider dataPrepareCardAssigned */
|
||||||
public function testPrepareCardAssigned($withUserFound = true) {
|
public function testPrepareCardAssigned($withUserFound = true) {
|
||||||
|
$this->cardMapper->expects($this->once())
|
||||||
|
->method('findBoardId')
|
||||||
|
->willReturn(123);
|
||||||
|
|
||||||
/** @var INotification $notification */
|
/** @var INotification $notification */
|
||||||
$notification = $this->createMock(INotification::class);
|
$notification = $this->createMock(INotification::class);
|
||||||
$notification->expects($this->once())
|
$notification->expects($this->once())
|
||||||
|
|||||||
Reference in New Issue
Block a user