ibexa · adamwojs · Aug 11, 2025 · Aug 5, 2025 · Aug 5, 2025 · Aug 5, 2025
diff --git a/src/contracts/Persistence/Notification/Handler.php b/src/contracts/Persistence/Notification/Handler.php
@@ -33,6 +33,18 @@ public function createNotification(CreateStruct $createStruct): Notification;
      */
     public function updateNotification(APINotification $notification, UpdateStruct $updateStruct): Notification;
 
+    /**
+     * @param int[] $notificationIds
+     *
+     * @return int[]
+     */
+    public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array;
+
     /**
      * Count users unread Notifications.
      *

diff --git a/src/contracts/Repository/Decorator/NotificationServiceDecorator.php b/src/contracts/Repository/Decorator/NotificationServiceDecorator.php
@@ -16,8 +16,7 @@
 
 abstract class NotificationServiceDecorator implements NotificationService
 {
-    /** @var \Ibexa\Contracts\Core\Repository\NotificationService */
-    protected $innerService;
+    protected NotificationService $innerService;
 
     public function __construct(NotificationService $innerService)
     {
@@ -41,6 +40,11 @@ public function getNotification(int $notificationId): Notification
         return $this->innerService->getNotification($notificationId);
     }
 
+    public function markUserNotificationsAsRead(array $notificationIds = []): void
+    {
+        $this->innerService->markUserNotificationsAsRead($notificationIds);
+    }
+
     public function markNotificationAsRead(Notification $notification): void
     {
         $this->innerService->markNotificationAsRead($notification);

diff --git a/src/contracts/Repository/NotificationService.php b/src/contracts/Repository/NotificationService.php
@@ -34,6 +34,11 @@ public function findNotifications(?NotificationQuery $query = null): Notificatio
      */
     public function getNotification(int $notificationId): Notification;
 
+    /**
+     * @param int[] $notificationIds
+     */
+    public function markUserNotificationsAsRead(array $notificationIds = []): void;
+
     /**
      * Mark notification as read so it no longer bother the user.
      *

diff --git a/src/lib/Persistence/Cache/NotificationHandler.php b/src/lib/Persistence/Cache/NotificationHandler.php
@@ -38,6 +38,37 @@ public function createNotification(CreateStruct $createStruct): Notification
         return $this->persistenceHandler->notificationHandler()->createNotification($createStruct);
     }
 
+    public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array {
+        $this->logger->logCall(__METHOD__, [
+            'userId' => $ownerId,
+            'notificationIds' => $notificationIds,
+        ]);
+
+        $updatedNotificationIds = $this->persistenceHandler
+            ->notificationHandler()
+            ->bulkUpdateUserNotifications($ownerId, $updateStruct, $pendingOnly, $notificationIds);
+
+        $cacheKeys = array_map(
+            fn (int $id): string => $this->cacheIdentifierGenerator->generateKey(self::NOTIFICATION_IDENTIFIER, [$id], true),
+            $updatedNotificationIds
+        );
+
+        $cacheKeys[] = $this->cacheIdentifierGenerator->generateKey(
+            self::NOTIFICATION_PENDING_COUNT_IDENTIFIER,
+            [$ownerId],
+            true
+        );
+
+        $this->cache->deleteItems($cacheKeys);
+
+        return $updatedNotificationIds;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/lib/Persistence/Legacy/Notification/Gateway.php b/src/lib/Persistence/Legacy/Notification/Gateway.php
@@ -10,6 +10,7 @@
 
 use Ibexa\Contracts\Core\Persistence\Notification\CreateStruct;
 use Ibexa\Contracts\Core\Persistence\Notification\Notification;
+use Ibexa\Contracts\Core\Persistence\Notification\UpdateStruct;
 use Ibexa\Contracts\Core\Repository\Values\Notification\Query\NotificationQuery;
 
 abstract class Gateway
@@ -42,6 +43,18 @@ abstract public function getNotificationById(int $notificationId): array;
      */
     abstract public function updateNotification(Notification $notification): void;
 
+    /**
+     * @param int[] $notificationIds
+     *
+     * @return int[]
+     */
+    abstract public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array;
+
     abstract public function countUserNotifications(int $userId, ?NotificationQuery $query = null): int;
 
     /**

diff --git a/src/lib/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php
@@ -13,6 +13,7 @@
 use Doctrine\DBAL\Query\QueryBuilder;
 use Ibexa\Contracts\Core\Persistence\Notification\CreateStruct;
 use Ibexa\Contracts\Core\Persistence\Notification\Notification;
+use Ibexa\Contracts\Core\Persistence\Notification\UpdateStruct;
 use Ibexa\Contracts\Core\Repository\Values\Notification\Query\CriterionInterface;
 use Ibexa\Contracts\Core\Repository\Values\Notification\Query\NotificationQuery;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
@@ -82,6 +83,78 @@ public function getNotificationById(int $notificationId): array
         return $query->execute()->fetchAllAssociative();
     }
 
+    /**
+     * @param int[] $notificationIds
+     *
+     * @return int[]
+     */
+    public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array {
+        $queryBuilder = $this->connection->createQueryBuilder();
+        $this->applyNotificationFilters($queryBuilder, $ownerId, $pendingOnly, $notificationIds);
+
+        $idsToUpdate = $queryBuilder->execute()->fetchFirstColumn();
+        if (empty($idsToUpdate)) {
+            return [];
+        }
+
+        if ($updateStruct->isPending !== null) {
+            $this->updateNotificationsPendingStatus($idsToUpdate, $updateStruct->isPending);
+        }
+
+        return array_map('intval', $idsToUpdate);
+    }
+
+    /**
+     * @param int[] $notificationIds
+     */
+    private function applyNotificationFilters(
+        QueryBuilder $queryBuilder,
+        int $ownerId,
+        bool $pendingOnly,
+        array $notificationIds
+    ): void {
+        $queryBuilder
+            ->select(self::COLUMN_ID)
+            ->from(self::TABLE_NOTIFICATION)
+            ->andWhere($queryBuilder->expr()->eq(self::COLUMN_OWNER_ID, ':ownerId'))
+            ->setParameter(':ownerId', $ownerId, ParameterType::INTEGER);
+
+        if ($pendingOnly) {
+            $queryBuilder->andWhere($queryBuilder->expr()->eq(self::COLUMN_IS_PENDING, ':isPendingFlag'))
+                ->setParameter(':isPendingFlag', true, ParameterType::BOOLEAN);
+        }
+
+        if (!empty($notificationIds)) {
+            $queryBuilder->andWhere(
+                $queryBuilder->expr()->in(self::COLUMN_ID, ':notificationIds')
+            );
+            $queryBuilder->setParameter(':notificationIds', $notificationIds, Connection::PARAM_INT_ARRAY);
+        }
+    }
+
+    /**
+     * @param int[] $idsToUpdate
+     */
+    private function updateNotificationsPendingStatus(array $idsToUpdate, bool $isPending): void
+    {
+        $updateQuery = $this->connection->createQueryBuilder();
+        $updateQuery
+            ->update(self::TABLE_NOTIFICATION)
+            ->set(self::COLUMN_IS_PENDING, ':is_pending')
+            ->andWhere(
+                $updateQuery->expr()->in(self::COLUMN_ID, ':ids')
+            )
+            ->setParameter(':is_pending', $isPending, ParameterType::BOOLEAN)
+            ->setParameter(':ids', $idsToUpdate, Connection::PARAM_INT_ARRAY);
+
+        $updateQuery->execute();
+    }
+
     public function updateNotification(Notification $notification): void
     {
         if (!isset($notification->id) || !is_numeric($notification->id)) {
@@ -113,7 +186,7 @@ public function countUserNotifications(int $userId, ?NotificationQuery $query =
             $this->applyFilters($queryBuilder, $query->getCriteria());
         }
 
-        return (int)$queryBuilder->execute()->fetchColumn();
+        return (int)$queryBuilder->execute()->fetchOne();
     }
 
     public function countUserPendingNotifications(int $userId): int

diff --git a/src/lib/Persistence/Legacy/Notification/Gateway/ExceptionConversion.php b/src/lib/Persistence/Legacy/Notification/Gateway/ExceptionConversion.php
@@ -11,6 +11,7 @@
 use Doctrine\DBAL\DBALException;
 use Ibexa\Contracts\Core\Persistence\Notification\CreateStruct;
 use Ibexa\Contracts\Core\Persistence\Notification\Notification;
+use Ibexa\Contracts\Core\Persistence\Notification\UpdateStruct;
 use Ibexa\Contracts\Core\Repository\Values\Notification\Query\NotificationQuery;
 use Ibexa\Core\Base\Exceptions\DatabaseException;
 use Ibexa\Core\Persistence\Legacy\Notification\Gateway;
@@ -44,6 +45,19 @@ public function getNotificationById(int $notificationId): array
         }
     }
 
+    public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array {
+        try {
+            return $this->innerGateway->bulkUpdateUserNotifications($ownerId, $updateStruct, $pendingOnly, $notificationIds);
+        } catch (DBALException | PDOException $e) {
+            throw DatabaseException::wrap($e);
+        }
+    }
+
     public function updateNotification(Notification $notification): void
     {
         try {

diff --git a/src/lib/Persistence/Legacy/Notification/Handler.php b/src/lib/Persistence/Legacy/Notification/Handler.php
@@ -72,6 +72,15 @@ public function getNotificationById(int $notificationId): Notification
         return reset($notification);
     }
 
+    public function bulkUpdateUserNotifications(
+        int $ownerId,
+        UpdateStruct $updateStruct,
+        bool $pendingOnly = false,
+        array $notificationIds = []
+    ): array {
+        return $this->gateway->bulkUpdateUserNotifications($ownerId, $updateStruct, $pendingOnly, $notificationIds);
+    }
+
     /**
      * {@inheritdoc}
      *

diff --git a/src/lib/Repository/NotificationService.php b/src/lib/Repository/NotificationService.php
@@ -109,6 +109,18 @@ public function getNotification(int $notificationId): APINotification
         return $this->buildDomainObject($notification);
     }
 
+    /**
+     * @param int[] $notificationIds
+     */
+    public function markUserNotificationsAsRead(array $notificationIds = []): void
+    {
+        $currentUserId = $this->getCurrentUserId();
+        $updateStruct = new UpdateStruct();
+        $updateStruct->isPending = false;
+
+        $this->persistenceHandler->bulkUpdateUserNotifications($currentUserId, $updateStruct, true, $notificationIds);
+    }
+
     public function markNotificationAsRead(APINotification $notification): void
     {
         $currentUserId = $this->getCurrentUserId();

diff --git a/src/lib/Repository/SiteAccessAware/NotificationService.php b/src/lib/Repository/SiteAccessAware/NotificationService.php
@@ -50,6 +50,14 @@ public function getNotification(int $notificationId): Notification
         return $this->service->getNotification($notificationId);
     }
 
+    /**
+     * @param int[] $notificationIds
+     */
+    public function markUserNotificationsAsRead(array $notificationIds = []): void
+    {
+        $this->service->markUserNotificationsAsRead($notificationIds);
+    }
+
     /**
      * Mark notification as read so it no longer bother the user.
      *