diff options
Diffstat (limited to 'lib/Db/FeedMapperV2.php')
-rw-r--r-- | lib/Db/FeedMapperV2.php | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php index 5e346732c..eaa9030cc 100644 --- a/lib/Db/FeedMapperV2.php +++ b/lib/Db/FeedMapperV2.php @@ -16,6 +16,7 @@ namespace OCA\News\Db; use OCA\News\Utility\Time; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\DB\Exception as DBException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\AppFramework\Db\Entity; @@ -158,23 +159,40 @@ class FeedMapperV2 extends NewsMapperV2 * @param string $userId * @param int $id * @param int|null $maxItemID + * + * @return int + * @throws DBException + * + * @TODO Update for NC 21 */ - public function read(string $userId, int $id, ?int $maxItemID = null): void + public function read(string $userId, int $id, ?int $maxItemID = null): int { - $builder = $this->db->getQueryBuilder(); - $builder->update(ItemMapperV2::TABLE_NAME, 'items') + $idBuilder = $this->db->getQueryBuilder(); + $idBuilder->select('items.id') + ->from(ItemMapperV2::TABLE_NAME, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.id = :feedId') ->setParameter('userId', $userId) ->setParameter('feedId', $id); if ($maxItemID !== null) { - $builder->andWhere('items.id =< :maxItemId') - ->setParameter('maxItemId', $maxItemID); + $idBuilder->andWhere('items.id <= :maxItemId') + ->setParameter('maxItemId', $maxItemID); } - $this->db->executeUpdate($builder->getSQL()); + $idList = array_map(function ($value): int { + return intval($value['id']); + }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()); + + $builder = $this->db->getQueryBuilder(); + $builder->update(ItemMapperV2::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()); } } |