From 78dce7ffe18665bf083ff69631db8ae128a2b99f Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 1 Mar 2021 21:10:46 +0100 Subject: DB: Updates should use set() Issue GH-1211 Signed-off-by: Sean Molenaar --- lib/Command/Debug/FeedRead.php | 85 +++++++++++++++++++++++++++++++++++++++ lib/Command/Debug/FolderRead.php | 84 ++++++++++++++++++++++++++++++++++++++ lib/Command/Debug/ItemRead.php | 87 ++++++++++++++++++++++++++++++++++++++++ lib/Db/FeedMapperV2.php | 32 +++++++++++---- lib/Db/FolderMapperV2.php | 43 ++++++++++++++------ lib/Db/ItemMapperV2.php | 36 ++++++++++++----- lib/Service/FeedServiceV2.php | 6 ++- lib/Service/FolderServiceV2.php | 6 ++- lib/Service/ItemServiceV2.php | 6 +-- 9 files changed, 348 insertions(+), 37 deletions(-) create mode 100644 lib/Command/Debug/FeedRead.php create mode 100644 lib/Command/Debug/FolderRead.php create mode 100644 lib/Command/Debug/ItemRead.php (limited to 'lib') diff --git a/lib/Command/Debug/FeedRead.php b/lib/Command/Debug/FeedRead.php new file mode 100644 index 000000000..eaf7f6b14 --- /dev/null +++ b/lib/Command/Debug/FeedRead.php @@ -0,0 +1,85 @@ +feedService = $feedService; + $this->itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:feed:read') + ->setDescription('Read feed') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to modify the feed for') + ->addArgument('id', InputArgument::REQUIRED, 'Feed ID'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + + $id = $input->getArgument('id'); + if (!is_numeric($id)) { + $output->writeln('Invalid id!'); + return 255; + } + + try { + $read = $this->feedService->read($user, intval($id)); + $output->writeln("Marked $read items as read", $output::VERBOSITY_VERBOSE); + } catch (ServiceConflictException | ServiceNotFoundException $e) { + $output->writeln('Failed: ' . $e->getMessage()); + return 0; + } + + return 0; + } +} diff --git a/lib/Command/Debug/FolderRead.php b/lib/Command/Debug/FolderRead.php new file mode 100644 index 000000000..a259aceb6 --- /dev/null +++ b/lib/Command/Debug/FolderRead.php @@ -0,0 +1,84 @@ +folderService = $folderService; + $this->itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:folder:read') + ->setDescription('Read folder') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to modify the folder for') + ->addArgument('id', InputArgument::REQUIRED, 'Folder ID'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + + $id = $input->getArgument('id'); + if (!is_numeric($id)) { + $output->writeln('Invalid id!'); + return 255; + } + + try { + $read = $this->folderService->read($user, intval($id)); + $output->writeln("Marked $read items as read", $output::VERBOSITY_VERBOSE); + } catch (ServiceConflictException | ServiceNotFoundException $e) { + $output->writeln('Failed: ' . $e->getMessage()); + return 0; + } + + return 0; + } +} diff --git a/lib/Command/Debug/ItemRead.php b/lib/Command/Debug/ItemRead.php new file mode 100644 index 000000000..a36efe3ec --- /dev/null +++ b/lib/Command/Debug/ItemRead.php @@ -0,0 +1,87 @@ +itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:item:read') + ->setDescription('Read item') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to modify the item for') + ->addOption('id', 'i', InputOption::VALUE_REQUIRED, 'Item ID') + ->addOption('read', 'r', InputOption::VALUE_NONE, 'Item read state'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + $read = $input->getOption('read'); + + $id = $input->getOption('id'); + if (!is_null($id) && !is_numeric($id)) { + $output->writeln('Invalid id!'); + return 255; + } + + + try { + if (is_null($id)) { + $readItems = $this->itemService->readAll($user, $this->itemService->newest($user)->getId()); + $output->writeln("Marked $readItems items as read", $output::VERBOSITY_VERBOSE); + } else { + $items = $this->itemService->read($user, intval($id), $read); + $output->writeln(json_encode($this->serialize($items), JSON_PRETTY_PRINT)); + } + } catch (ServiceConflictException | ServiceNotFoundException $e) { + $output->writeln('Failed: ' . $e->getMessage()); + return 1; + } + + return 0; + } +} 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()); } } diff --git a/lib/Db/FolderMapperV2.php b/lib/Db/FolderMapperV2.php index 12fa26887..d0d0cbec1 100644 --- a/lib/Db/FolderMapperV2.php +++ b/lib/Db/FolderMapperV2.php @@ -15,6 +15,8 @@ namespace OCA\News\Db; use OCA\News\Utility\Time; use OCP\AppFramework\Db\Entity; +use OCP\DB\Exception as DBException; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; /** @@ -101,24 +103,39 @@ class FolderMapperV2 extends NewsMapperV2 * @param int $id * @param int|null $maxItemID * - * @return void + * @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') - ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) - ->andWhere('feeds.user_id = :userId') - ->andWhere('feeds.folder_id = :folderId') - ->setParameter('userId', $userId) - ->setParameter('folderId', $id); + $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('feeds.folder_id = :folderId') + ->setParameter('userId', $userId) + ->setParameter('folderId', $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()); } } 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()); } /** diff --git a/lib/Service/FeedServiceV2.php b/lib/Service/FeedServiceV2.php index 9d577db97..d15dfceb7 100644 --- a/lib/Service/FeedServiceV2.php +++ b/lib/Service/FeedServiceV2.php @@ -347,13 +347,15 @@ class FeedServiceV2 extends Service * @param int $id Feed ID * @param int|null $maxItemID Highest item ID to mark as read * + * @return int + * * @throws ServiceConflictException * @throws ServiceNotFoundException */ - public function read(string $userId, int $id, ?int $maxItemID = null): void + public function read(string $userId, int $id, ?int $maxItemID = null): int { $feed = $this->find($userId, $id); - $this->mapper->read($userId, $feed->getId(), $maxItemID); + return $this->mapper->read($userId, $feed->getId(), $maxItemID); } } diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php index d13b4afc0..17d955876 100644 --- a/lib/Service/FolderServiceV2.php +++ b/lib/Service/FolderServiceV2.php @@ -186,13 +186,15 @@ class FolderServiceV2 extends Service * @param int $id Folder ID * @param int|null $maxItemID Highest item ID to mark as read * + * @return int + * * @throws ServiceConflictException * @throws ServiceNotFoundException */ - public function read(string $userId, int $id, ?int $maxItemID = null): void + public function read(string $userId, int $id, ?int $maxItemID = null): int { $folder = $this->find($userId, $id); - $this->mapper->read($userId, $folder->getId(), $maxItemID); + return $this->mapper->read($userId, $folder->getId(), $maxItemID); } } diff --git a/lib/Service/ItemServiceV2.php b/lib/Service/ItemServiceV2.php index fafd5e558..57804a8c3 100644 --- a/lib/Service/ItemServiceV2.php +++ b/lib/Service/ItemServiceV2.php @@ -217,11 +217,11 @@ class ItemServiceV2 extends Service * @param string $userId Item owner * @param int $maxItemId * - * @return void + * @return int */ - public function readAll(string $userId, int $maxItemId): void + public function readAll(string $userId, int $maxItemId): int { - $this->mapper->readAll($userId, $maxItemId); + return $this->mapper->readAll($userId, $maxItemId); } /** -- cgit v1.2.3