Skip to content

Wrap notification generation in a transaction #6929

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
nickvergessen merged 1 commit into from
Feb 25, 2022
Merged

Wrap notification generation in a transaction #6929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 23 additions & 11 deletions lib/Notification/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@
use OCA\Talk\Service\ParticipantService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IDBConnection;
use OCP\Notification\IManager;
use OCP\IUser;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;

class Listener {

/** @var IDBConnection */
protected $connection;
/** @var IManager */
protected $notificationManager;
/** @var ParticipantService */
Expand All @@ -54,12 +57,14 @@ class Listener {
/** @var bool */
protected $shouldSendCallNotification = false;

public function __construct(IManager $notificationManager,
public function __construct(IDBConnection $connection,
IManager $notificationManager,
ParticipantService $participantsService,
IEventDispatcher $dispatcher,
IUserSession $userSession,
ITimeFactory $timeFactory,
LoggerInterface $logger) {
$this->connection = $connection;
$this->notificationManager = $notificationManager;
$this->participantsService = $participantsService;
$this->dispatcher = $dispatcher;
Expand Down Expand Up @@ -248,18 +253,25 @@ public function sendCallNotifications(Room $room): void {
}

$userIds = $this->participantsService->getParticipantUserIdsForCallNotifications($room);
foreach ($userIds as $userId) {
if ($actorId === $userId) {
continue;
}

try {
$notification->setUser($userId);
$this->notificationManager->notify($notification);
} catch (\InvalidArgumentException $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
$this->connection->beginTransaction();
try {
foreach ($userIds as $userId) {
if ($actorId === $userId) {
continue;
}

try {
$notification->setUser($userId);
$this->notificationManager->notify($notification);
} catch (\InvalidArgumentException $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
}
}
} catch (\Throwable $e) {
$this->connection->rollBack();
throw $e;
}
$this->connection->commit();

if ($shouldFlush) {
$this->notificationManager->flush();
Expand Down