diff options
Diffstat (limited to 'lib/Db/ItemMapperV2.php')
-rw-r--r-- | lib/Db/ItemMapperV2.php | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index a8b101719..c79ac035f 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -19,6 +19,7 @@ use OCA\News\Utility\Time; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\DB\Exception as DBException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; @@ -254,20 +255,35 @@ class ItemMapperV2 extends NewsMapperV2 * @param int $maxItemId * * @TODO: Update this for NC 21 + * + * @return int + * + * @throws DBException */ - public function readAll(string $userId, int $maxItemId): void + public function readAll(string $userId, int $maxItemId): int { - $builder = $this->db->getQueryBuilder(); + $idBuilder = $this->db->getQueryBuilder(); + $idBuilder->select('items.id') + ->from(ItemMapperV2::TABLE_NAME, 'items') + ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') + ->andWhere('feeds.user_id = :userId') + ->andWhere('items.id <= :maxItemId') + ->setParameter('userId', $userId) + ->setParameter('maxItemId', $maxItemId); - $builder->update($this->tableName, 'items') - ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) - ->andWhere('items.id =< :maxItemId') - ->andWhere('feeds.user_id = :userId') - ->setParameter('maxItemId', $maxItemId) - ->setParameter('userId', $userId); + $idList = array_map(function ($value): int { + return intval($value['id']); + }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()); - $this->db->executeUpdate($builder->getSQL()); + $builder = $this->db->getQueryBuilder(); + $builder->update(self::TABLE_NAME) + ->set('unread', $builder->createParameter('unread')) + ->andWhere('id IN (:idList)') + ->andWhere('unread != :unread') + ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL) + ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY); + + return $this->db->executeUpdate($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes()); } /** |