diff options
author | Sean Molenaar <sean@m2mobi.com> | 2018-11-29 20:59:46 +0100 |
---|---|---|
committer | Sean Molenaar <sean@m2mobi.com> | 2018-12-14 07:54:43 +0100 |
commit | becce6b7520912257c3d72697a3aefec9923a467 (patch) | |
tree | a2e0da34df11ade7c630e9b681fac6d3b2383918 /lib/Db/ItemMapper.php | |
parent | 0f2645145ac31ad77788954c513f391bc4fbb295 (diff) |
Define an official codestyle and adhere to it.
Diffstat (limited to 'lib/Db/ItemMapper.php')
-rw-r--r-- | lib/Db/ItemMapper.php | 85 |
1 files changed, 51 insertions, 34 deletions
diff --git a/lib/Db/ItemMapper.php b/lib/Db/ItemMapper.php index 57561928a..82a38d67d 100644 --- a/lib/Db/ItemMapper.php +++ b/lib/Db/ItemMapper.php @@ -18,16 +18,17 @@ use OCA\News\Utility\Time; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; - class ItemMapper extends NewsMapper { - public function __construct(IDBConnection $db, Time $time) + public function __construct(IDBConnection $db, Time $time) { parent::__construct($db, 'news_items', Item::class, $time); } - private function makeSelectQuery($prependTo = '', $oldestFirst = false, + private function makeSelectQuery( + $prependTo = '', + $oldestFirst = false, $distinctFingerprint = false ) { if ($oldestFirst) { @@ -56,7 +57,7 @@ class ItemMapper extends NewsMapper * @param int|null $type * @return string */ - private function buildStatusQueryPart($showAll, $type = null) + private function buildStatusQueryPart($showAll, $type = null) { $sql = ''; @@ -71,7 +72,7 @@ class ItemMapper extends NewsMapper return $sql; } - private function buildSearchQueryPart(array $search = []) + private function buildSearchQueryPart(array $search = []) { return str_repeat('AND `items`.`search_index` LIKE ? ', count($search)); } @@ -82,13 +83,14 @@ class ItemMapper extends NewsMapper * @param string[] $search an array of strings that should be searched * @return array with like parameters */ - private function buildLikeParameters($search = []) + private function buildLikeParameters($search = []) { return array_map( function ($param) { $param = addcslashes($param, '\\_%'); return '%' . mb_strtolower($param, 'UTF-8') . '%'; - }, $search + }, + $search ); } @@ -97,13 +99,13 @@ class ItemMapper extends NewsMapper * @param string $userId * @return \OCA\News\Db\Item */ - public function find($id, $userId) + public function find($id, $userId) { $sql = $this->makeSelectQuery('AND `items`.`id` = ? '); return $this->findEntity($sql, [$userId, $id]); } - public function starredCount($userId) + public function starredCount($userId) { $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_items` `items` ' . 'JOIN `*PREFIX*news_feeds` `feeds` ' . @@ -124,7 +126,7 @@ class ItemMapper extends NewsMapper } - public function readAll($highestItemId, $time, $userId) + public function readAll($highestItemId, $time, $userId) { $sql = 'UPDATE `*PREFIX*news_items` ' . 'SET unread = ? ' . @@ -139,7 +141,7 @@ class ItemMapper extends NewsMapper } - public function readFolder($folderId, $highestItemId, $time, $userId) + public function readFolder($folderId, $highestItemId, $time, $userId) { $sql = 'UPDATE `*PREFIX*news_items` ' . 'SET unread = ? ' . @@ -156,7 +158,7 @@ class ItemMapper extends NewsMapper } - public function readFeed($feedId, $highestItemId, $time, $userId) + public function readFeed($feedId, $highestItemId, $time, $userId) { $sql = 'UPDATE `*PREFIX*news_items` ' . 'SET unread = ? ' . @@ -174,7 +176,7 @@ class ItemMapper extends NewsMapper } - private function getOperator($oldestFirst) + private function getOperator($oldestFirst) { if ($oldestFirst) { return '>'; @@ -184,7 +186,7 @@ class ItemMapper extends NewsMapper } - public function findAllNew($updatedSince, $type, $showAll, $userId) + public function findAllNew($updatedSince, $type, $showAll, $userId) { $sql = $this->buildStatusQueryPart($showAll, $type); @@ -195,7 +197,7 @@ class ItemMapper extends NewsMapper } - public function findAllNewFolder($id, $updatedSince, $showAll, $userId) + public function findAllNewFolder($id, $updatedSince, $showAll, $userId) { $sql = $this->buildStatusQueryPart($showAll); @@ -207,7 +209,7 @@ class ItemMapper extends NewsMapper } - public function findAllNewFeed($id, $updatedSince, $showAll, $userId) + public function findAllNewFeed($id, $updatedSince, $showAll, $userId) { $sql = $this->buildStatusQueryPart($showAll); @@ -219,7 +221,7 @@ class ItemMapper extends NewsMapper } - private function findEntitiesIgnoringNegativeLimit($sql, $params, $limit) + private function findEntitiesIgnoringNegativeLimit($sql, $params, $limit) { // ignore limit if negative to offer a way to return all feeds if ($limit >= 0) { @@ -230,8 +232,14 @@ class ItemMapper extends NewsMapper } - public function findAllFeed($id, $limit, $offset, $showAll, $oldestFirst, - $userId, $search = [] + public function findAllFeed( + $id, + $limit, + $offset, + $showAll, + $oldestFirst, + $userId, + $search = [] ) { $params = [$userId]; $params = array_merge($params, $this->buildLikeParameters($search)); @@ -251,8 +259,14 @@ class ItemMapper extends NewsMapper } - public function findAllFolder($id, $limit, $offset, $showAll, $oldestFirst, - $userId, $search = [] + public function findAllFolder( + $id, + $limit, + $offset, + $showAll, + $oldestFirst, + $userId, + $search = [] ) { $params = [$userId]; $params = array_merge($params, $this->buildLikeParameters($search)); @@ -272,7 +286,13 @@ class ItemMapper extends NewsMapper } - public function findAll($limit, $offset, $type, $showAll, $oldestFirst, $userId, + public function findAll( + $limit, + $offset, + $type, + $showAll, + $oldestFirst, + $userId, $search = [] ) { $params = [$userId]; @@ -292,7 +312,7 @@ class ItemMapper extends NewsMapper } - public function findAllUnreadOrStarred($userId) + public function findAllUnreadOrStarred($userId) { $params = [$userId, true, true]; $sql = 'AND (`items`.`unread` = ? OR `items`.`starred` = ?) '; @@ -301,7 +321,7 @@ class ItemMapper extends NewsMapper } - public function findByGuidHash($guidHash, $feedId, $userId) + public function findByGuidHash($guidHash, $feedId, $userId) { $sql = $this->makeSelectQuery( 'AND `items`.`guid_hash` = ? ' . @@ -318,7 +338,7 @@ class ItemMapper extends NewsMapper * * @param int $threshold the number of items that should be deleted */ - public function deleteReadOlderThanThreshold($threshold) + public function deleteReadOlderThanThreshold($threshold) { $params = [false, false, $threshold]; @@ -335,7 +355,6 @@ class ItemMapper extends NewsMapper $result = $this->execute($sql, $params); while ($row = $result->fetch()) { - $size = (int)$row['size']; $limit = $size - $threshold; @@ -355,11 +374,10 @@ class ItemMapper extends NewsMapper $this->execute($sql, $params); } } - } - public function getNewestItemId($userId) + public function getNewestItemId($userId) { $sql = 'SELECT MAX(`items`.`id`) AS `max_id` ' . 'FROM `*PREFIX*news_items` `items` ' . @@ -379,7 +397,7 @@ class ItemMapper extends NewsMapper * * @param string $userId the name of the user */ - public function deleteUser($userId) + public function deleteUser($userId) { $sql = 'DELETE FROM `*PREFIX*news_items` ' . 'WHERE `feed_id` IN (' . @@ -394,7 +412,7 @@ class ItemMapper extends NewsMapper /** * Returns a list of ids and userid of all items */ - public function findAllIds($limit = null, $offset = null) + public function findAllIds($limit = null, $offset = null) { $sql = 'SELECT `id` FROM `*PREFIX*news_items`'; return $this->execute($sql, [], $limit, $offset)->fetchAll(); @@ -403,7 +421,7 @@ class ItemMapper extends NewsMapper /** * Update search indices of all items */ - public function updateSearchIndices() + public function updateSearchIndices() { // update indices in steps to prevent memory issues on larger systems $step = 1000; // update 1000 items at a time @@ -419,7 +437,7 @@ class ItemMapper extends NewsMapper } } - private function updateSearchIndex(array $items = []) + private function updateSearchIndex(array $items = []) { foreach ($items as $row) { $sql = 'SELECT * FROM `*PREFIX*news_items` WHERE `id` = ?'; @@ -430,7 +448,7 @@ class ItemMapper extends NewsMapper } } - public function readItem($itemId, $isRead, $lastModified, $userId) + public function readItem($itemId, $isRead, $lastModified, $userId) { $item = $this->find($itemId, $userId); @@ -454,5 +472,4 @@ class ItemMapper extends NewsMapper $this->update($item); } } - } |