From c5dde50a7166f6e24776b680ea8da1c0e78a7543 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 2 May 2013 13:45:34 +0200 Subject: implemented first feeds get all method --- appinfo/routes.php | 74 ++----------------- dependencyinjection/dicontainer.php | 12 ++++ external/feed.php | 55 --------------- external/feedapi.php | 77 ++++++++++++++++++++ tests/unit/external/FeedAPITest.php | 137 ++++++++++++++++++++++++++++++++++++ 5 files changed, 232 insertions(+), 123 deletions(-) delete mode 100644 external/feed.php create mode 100644 external/feedapi.php create mode 100644 tests/unit/external/FeedAPITest.php diff --git a/appinfo/routes.php b/appinfo/routes.php index fd7b6ad20..7d1c087e4 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -206,74 +206,12 @@ $this->create('news_usersettings_language', '/usersettings/language')->get()->ac /** * Feed API */ - -\OCP\API::register( - 'get', '/news/feeds', - function($urlParams) { - $container = new DIContainer(); - return $container['FeedApi']->getAll($urlParams); - }, - 'news', \OC_API::USER_AUTH -); -\OCP\API::register( - 'get', '/news/feeds/{feedid}', - function($urlParams) { - $container = new DIContainer(); - return $container['FeedApi']->getById($urlParams); - }, - 'news', \OC_API::USER_AUTH -); -\OCP\API::register( - 'post', '/news/feeds/create', - function($urlParams) { - $container = new DIContainer(); - return $container['FeedApi']->create($urlParams); - }, - 'news', \OC_API::USER_AUTH -); -\OCP\API::register( - 'post', '/news/feeds/{feedid}/delete', - function($urlParams) { - $container = new DIContainer(); - return $container['FeedApi']->delete($urlParams); - }, - 'news', \OC_API::USER_AUTH -); - -/** - * Folder API - */ - -\OCP\API::register( - 'get', '/news/folders', - function($urlParams) { - $container = new DIContainer(); - return $container['FolderApi']->getAll($urlParams); - }, - 'news', \OC_API::USER_AUTH -); -\OCP\API::register( - 'post', '/news/folders/create', - function($urlParams) { - $container = new DIContainer(); - return $container['FolderApi']->create($urlParams); - }, - 'news', \OC_API::USER_AUTH -); - -\OCP\API::register( - 'get', '/news/folders/{folderid}/delete', - function($urlParams) { - $container = new DIContainer(); - return $container['FolderApi']->delete($urlParams); - }, - 'news', \OC_API::USER_AUTH -); -\OCP\API::register( - 'post', '/news/folders/{folderid}/modify', +\OCP\API::register('get', '/apps/news/feeds', function($urlParams) { $container = new DIContainer(); - return $container['FolderApi']->modify($urlParams); - }, - 'news', \OC_API::USER_AUTH + $response = $container['FeedAPI']->getAll($urlParams); + return \OC_OCS_Result($response); + }, + 'news', + \OC_API::USER_AUTH ); diff --git a/dependencyinjection/dicontainer.php b/dependencyinjection/dicontainer.php index db647e852..42b5b4238 100644 --- a/dependencyinjection/dicontainer.php +++ b/dependencyinjection/dicontainer.php @@ -43,6 +43,8 @@ use \OCA\News\Db\FeedMapper; use \OCA\News\Db\ItemMapper; use \OCA\News\Db\StatusFlag; +use \OCA\News\External\FeedAPI; + use \OCA\News\Utility\Fetcher; use \OCA\News\Utility\FeedFetcher; use \OCA\News\Utility\TwitterFetcher; @@ -149,6 +151,16 @@ class DIContainer extends BaseContainer { }); + /** + * External API + */ + $this['FeedAPI'] = $this->share(function($c){ + return new FeedAPI($c['API'], + $c['FolderBusinessLayer'], + $c['FeedBusinessLayer'], + $c['ItemBusinessLayer']); + }); + /** * Utility */ diff --git a/external/feed.php b/external/feed.php deleted file mode 100644 index a56cd2253..000000000 --- a/external/feed.php +++ /dev/null @@ -1,55 +0,0 @@ -bl = $bl; - } - - public function getAll() { - $feeds = $this->bl->getAll(); - $serializedFeeds = array(); - foreach ($feeds as $feed) { - $serializedFeeds[] = $feed->jsonSerialize(); - } - return new \OC_OCS_Result($serializedFeeds); - } - - public function getById($params) { - $feed = $this->bl->getById($feedid); - $serializedFeed = array($feed->jsonSerialize()); - return new \OC_OCS_Result($serializedFeed); - } - - public function delete($params) { - //TODO: check parameters here - - $success = $this->bl->delete($params["feedid"]); - - if ($success) { - return new \OC_OCS_Result(); - } - else { - return new \OC_OCS_Result(null, 101); - } - } - - public function create() { - $url = $_POST['url']; - $folderId = $_POST['folderid']; - //TODO: check parameters here - - $success = $this->bl->create($url, $folderId); - - if ($success) { - return new \OC_OCS_Result(); - } - else { - return new \OC_OCS_Result(null, 101); - } - } -} diff --git a/external/feedapi.php b/external/feedapi.php new file mode 100644 index 000000000..219c8a893 --- /dev/null +++ b/external/feedapi.php @@ -0,0 +1,77 @@ +. +* +*/ + +namespace OCA\News\External; + +use \OCA\AppFramework\Core\API; + +use \OCA\News\BusinessLayer\FeedBusinessLayer; +use \OCA\News\BusinessLayer\FolderBusinessLayer; +use \OCA\News\BusinessLayer\ItemBusinessLayer; +use \OCA\News\BusinessLayer\BusinessLayerException; + + +class FeedAPI { + + private $itemBusinessLayer; + private $feedBusinessLayer; + private $folderBusinessLayer; + private $api; + + public function __construct(API $api, + FolderBusinessLayer $folderBusinessLayer, + FeedBusinessLayer $feedBusinessLayer, + ItemBusinessLayer $itemBusinessLayer){ + $this->api = $api; + $this->folderBusinessLayer = $folderBusinessLayer; + $this->feedBusinessLayer = $feedBusinessLayer; + $this->itemBusinessLayer = $itemBusinessLayer; + } + + + public function getAll(array $urlParams=array()) { + + $userId = $this->api->getUserId(); + + $result = array( + 'feeds' => array(), + 'starredCount' => $this->itemBusinessLayer->starredCount($userId) + ); + + foreach ($this->feedBusinessLayer->findAll($userId) as $feed) { + array_push($result['feeds'], $feed->toAPI()); + } + + // check case when there are no items + try { + $result['newestItemId'] = + $this->itemBusinessLayer->getNewestItemId($userId); + } catch(BusinessLayerException $ex) {} + + return $result; + } + + +} diff --git a/tests/unit/external/FeedAPITest.php b/tests/unit/external/FeedAPITest.php new file mode 100644 index 000000000..8ceafd016 --- /dev/null +++ b/tests/unit/external/FeedAPITest.php @@ -0,0 +1,137 @@ +. +* +*/ + +namespace OCA\News\External; + +use \OCA\News\BusinessLayer\BusinessLayerException; + +use \OCA\News\Db\Folder; +use \OCA\News\Db\Feed; +use \OCA\News\Db\Item; + +require_once(__DIR__ . "/../../classloader.php"); + + +class FeedAPITest extends \PHPUnit_Framework_TestCase { + + private $folderBusinessLayer; + private $feedBusinessLayer; + private $itemBusinessLayer; + private $feedAPI; + private $api; + private $user; + + protected function setUp() { + $this->api = $this->folderBusinessLayer = $this->getMockBuilder( + '\OCA\AppFramework\Core\API') + ->disableOriginalConstructor() + ->getMock(); + $this->folderBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\FolderBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->feedBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\FeedBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->itemBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\ItemBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->feedAPI = new FeedAPI( + $this->api, + $this->folderBusinessLayer, + $this->feedBusinessLayer, + $this->itemBusinessLayer + ); + $this->user = 'tom'; + } + + + public function testGetAll() { + $feeds = array( + new Feed() + ); + $starredCount = 3; + $newestItemId = 2; + + $this->api->expects($this->once()) + ->method('getUserId') + ->will($this->returnValue($this->user)); + $this->itemBusinessLayer->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($starredCount)); + $this->itemBusinessLayer->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($newestItemId)); + $this->feedBusinessLayer->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($feeds)); + + $response = $this->feedAPI->getAll(); + + $this->assertEquals(array( + 'feeds' => array($feeds[0]->toAPI()), + 'starredCount' => $starredCount, + 'newestItemId' => $newestItemId + ), $response); + } + + + public function testGetAllNoNewestItemId() { + $feeds = array( + new Feed() + ); + $starredCount = 3; + + $this->api->expects($this->once()) + ->method('getUserId') + ->will($this->returnValue($this->user)); + $this->itemBusinessLayer->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($starredCount)); + $this->itemBusinessLayer->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->throwException(new BusinessLayerException(''))); + $this->feedBusinessLayer->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($feeds)); + + $response = $this->feedAPI->getAll(); + + $this->assertEquals(array( + 'feeds' => array($feeds[0]->toAPI()), + 'starredCount' => $starredCount, + ), $response); + } + + +} \ No newline at end of file -- cgit v1.2.3