diff options
-rw-r--r-- | db/itemmapper.php | 20 | ||||
-rw-r--r-- | tests/db/ItemMapperTest.php | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/db/itemmapper.php b/db/itemmapper.php index 0bf9b4d87..693dbc07c 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -44,8 +44,18 @@ class ItemMapper extends NewsMapper { $params = array($feedId, $userId); return $this->findAllRows($sql, $params); - - + } + + public function findAllFromFolder($userId, $folderId, $status){ + $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . + 'JOIN `*dbprefix*news_feeds` ' . + 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . + 'WHERE `*dbprefix*news_feeds`.`user_id` = ? ' . + 'AND `*dbprefix*news_feeds`.`folder_id` = ? ' . + 'AND ((`*dbprefix*news_items`.`status` & ?) > 0)'; + + $params = array($userId, $folderId, $status); + return $this->findAllRows($sql, $params); } /* request: get all items of a folder of a user (unread and read) @@ -72,11 +82,7 @@ class ItemMapper extends NewsMapper { $item->fromRow($row); return $item; - } - - public function findAllFromFolder($status, $feedId, $userId){ - - } + } } diff --git a/tests/db/ItemMapperTest.php b/tests/db/ItemMapperTest.php index b3be320e7..369f7c26c 100644 --- a/tests/db/ItemMapperTest.php +++ b/tests/db/ItemMapperTest.php @@ -134,7 +134,7 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { 'AND ((`*dbprefix*news_items`.`status` & ?) > 0)'; $this->setMapperResult($sql, array($userId, $folderId, $status)); - $result = $this->findAllFromFolder($userId, $folderId, $status); + $result = $this->itemMapper->findAllFromFolder($userId, $folderId, $status); } }
\ No newline at end of file |