diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-19 13:20:54 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-19 13:21:11 +0200 |
commit | 517e4ca5435106ab5304849248cbea4e9dffd4b0 (patch) | |
tree | 0f00076f012791b39c710994f695abf723546062 /businesslayer | |
parent | bd35b98d2c130f058b182f726636ee971625823b (diff) |
split up api class for easier testing and clearer code
Diffstat (limited to 'businesslayer')
-rw-r--r-- | businesslayer/feedbusinesslayer.php | 30 | ||||
-rw-r--r-- | businesslayer/folderbusinesslayer.php | 9 |
2 files changed, 21 insertions, 18 deletions
diff --git a/businesslayer/feedbusinesslayer.php b/businesslayer/feedbusinesslayer.php index 1322bc73f..caa81e0d3 100644 --- a/businesslayer/feedbusinesslayer.php +++ b/businesslayer/feedbusinesslayer.php @@ -24,8 +24,7 @@ */ namespace OCA\News\BusinessLayer; - -use \OCA\News\Core\API; +use \OCA\News\Core\Logger; use \OCA\News\Db\DoesNotExistException; use \OCA\News\Db\Feed; use \OCA\News\Db\Item; @@ -41,14 +40,18 @@ class FeedBusinessLayer extends BusinessLayer { private $feedFetcher; private $itemMapper; - private $api; + private $logger; + private $l10n; private $timeFactory; private $autoPurgeMinimumInterval; private $enhancer; private $purifier; - public function __construct(FeedMapper $feedMapper, Fetcher $feedFetcher, - ItemMapper $itemMapper, API $api, + public function __construct(FeedMapper $feedMapper, + Fetcher $feedFetcher, + ItemMapper $itemMapper, + Logger $logger, + $l10n, $timeFactory, Config $config, Enhancer $enhancer, @@ -56,7 +59,8 @@ class FeedBusinessLayer extends BusinessLayer { parent::__construct($feedMapper); $this->feedFetcher = $feedFetcher; $this->itemMapper = $itemMapper; - $this->api = $api; + $this->logger = $logger; + $this->l10n = $l10n; $this->timeFactory = $timeFactory; $this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval(); $this->enhancer = $enhancer; @@ -100,7 +104,7 @@ class FeedBusinessLayer extends BusinessLayer { try { $this->mapper->findByUrlHash($feed->getUrlHash(), $userId); throw new BusinessLayerConflictException( - $this->api->getTrans()->t('Can not add feed: Exists already')); + $this->l10n->t('Can not add feed: Exists already')); } catch(DoesNotExistException $ex){} // insert feed @@ -135,9 +139,9 @@ class FeedBusinessLayer extends BusinessLayer { return $feed; } catch(FetcherException $ex){ - $this->api->log($ex->getMessage(), 'debug'); + $this->logger->log($ex->getMessage(), 'debug'); throw new BusinessLayerException( - $this->api->getTrans()->t( + $this->l10n->t( 'Can not add feed: URL does not exist or has invalid xml')); } } @@ -153,7 +157,7 @@ class FeedBusinessLayer extends BusinessLayer { try { $this->update($feed->getId(), $feed->getUserId()); } catch(BusinessLayerException $ex){ - $this->api->log('Could not update feed ' . $ex->getMessage(), + $this->logger->log('Could not update feed ' . $ex->getMessage(), 'debug'); } } @@ -203,9 +207,9 @@ class FeedBusinessLayer extends BusinessLayer { } catch(FetcherException $ex){ // failed updating is not really a problem, so only log it - $this->api->log('Can not update feed with url ' . $existingFeed->getUrl() . + $this->logger->log('Can not update feed with url ' . $existingFeed->getUrl() . ': Not found or bad source', 'debug'); - $this->api->log($ex->getMessage(), 'debug'); + $this->logger->log($ex->getMessage(), 'debug'); } return $this->mapper->find($feedId, $userId); @@ -282,7 +286,7 @@ class FeedBusinessLayer extends BusinessLayer { $feed->setUserId($userId); $feed->setLink($url); $feed->setUrl($url); - $feed->setTitle($this->api->getTrans()->t('Articles without feed')); + $feed->setTitle($this->l10n->t('Articles without feed')); $feed->setAdded($this->timeFactory->getTime()); $feed->setFolderId(0); $feed->setPreventUpdate(true); diff --git a/businesslayer/folderbusinesslayer.php b/businesslayer/folderbusinesslayer.php index 80634abc8..5c5914c7a 100644 --- a/businesslayer/folderbusinesslayer.php +++ b/businesslayer/folderbusinesslayer.php @@ -25,7 +25,6 @@ namespace OCA\News\BusinessLayer; -use \OCA\News\Core\API; use \OCA\News\Db\Folder; use \OCA\News\Db\FolderMapper; use \OCA\News\Utility\Config; @@ -33,16 +32,16 @@ use \OCA\News\Utility\Config; class FolderBusinessLayer extends BusinessLayer { - private $api; + private $l10n; private $timeFactory; private $autoPurgeMinimumInterval; public function __construct(FolderMapper $folderMapper, - API $api, + $l10n, $timeFactory, Config $config){ parent::__construct($folderMapper); - $this->api = $api; + $this->l10n = $l10n; $this->timeFactory = $timeFactory; $this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval(); } @@ -62,7 +61,7 @@ class FolderBusinessLayer extends BusinessLayer { if(count($existingFolders) > 0){ throw new BusinessLayerConflictException( - $this->api->getTrans()->t('Can not add folder: Exists already')); + $this->l10n->t('Can not add folder: Exists already')); } if(mb_strlen($folderName) === 0) { |