renamed bl to businesslayer, handle exception in update routine, fix #69

4 files changed, 67 insertions, 57 deletions

diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php
index 960748d3e..023a4d39d 100644
--- a/controller/exportcontroller.php
+++ b/controller/exportcontroller.php
@@ -30,21 +30,23 @@ use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
 use \OCA\AppFramework\Http\TextDownloadResponse;
 
-use \OCA\News\Bl\FeedBl;
-use \OCA\News\Bl\FolderBl;
+use \OCA\News\BusinessLayer\FeedBusinessLayer;
+use \OCA\News\BusinessLayer\FolderBusinessLayer;
 use \OCA\News\Utility\OPMLExporter;
 
 class ExportController extends Controller {
 
 	private $opmlExporter;
-	private $folderBl;
-	private $feedBl;
+	private $folderBusinessLayer;
+	private $feedBusinessLayer;
 
-	public function __construct(API $api, Request $request, FeedBl $feedBl,
-	                            FolderBl $folderBl, OPMLExporter $opmlExporter){
+	public function __construct(API $api, Request $request,
+	                            FeedBusinessLayer $feedBusinessLayer,
+	                            FolderBusinessLayer $folderBusinessLayer,
+	                            OPMLExporter $opmlExporter){
 		parent::__construct($api, $request);
-		$this->feedBl = $feedBl;
-		$this->folderBl = $folderBl;
+		$this->feedBusinessLayer = $feedBusinessLayer;
+		$this->folderBusinessLayer = $folderBusinessLayer;
 		$this->opmlExporter = $opmlExporter;
 	}
 
@@ -56,8 +58,8 @@ class ExportController extends Controller {
 	 */
 	public function opml(){
 		$user = $this->api->getUserId();
-		$feeds = $this->feedBl->findAll($user);
-		$folders = $this->folderBl->findAll($user);
+		$feeds = $this->feedBusinessLayer->findAll($user);
+		$folders = $this->folderBusinessLayer->findAll($user);
 		$opml = $this->opmlExporter->build($folders, $feeds)->saveXML();
 		return new TextDownloadResponse($opml, 'subscriptions.opml', 'text/xml');
 	}
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index 5e2a91f24..53257d73c 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -29,22 +29,23 @@ use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
 
-use \OCA\News\Bl\FeedBl;
-use \OCA\News\Bl\FolderBl;
-use \OCA\News\Bl\BLException;
+use \OCA\News\BusinessLayer\FeedBusinessLayer;
+use \OCA\News\BusinessLayer\FolderBusinessLayer;
+use \OCA\News\BusinessLayer\BusinessLayerException;
 use \OCA\News\Db\FeedType;
 
 
 class FeedController extends Controller {
 
-	private $feedBl;
-	private $folderBl;
+	private $feedBusinessLayer;
+	private $folderBusinessLayer;
 
-	public function __construct(API $api, Request $request, FeedBl $feedBl,
-		                        FolderBl $folderBl){
+	public function __construct(API $api, Request $request, 
+	                            FeedBusinessLayer $feedBusinessLayer,
+		                        FolderBusinessLayer $folderBusinessLayer){
 		parent::__construct($api, $request);
-		$this->feedBl = $feedBl;
-		$this->folderBl = $folderBl;
+		$this->feedBusinessLayer = $feedBusinessLayer;
+		$this->folderBusinessLayer = $folderBusinessLayer;
 	}
 
 
@@ -55,7 +56,7 @@ class FeedController extends Controller {
 	 */
 	public function feeds(){
 		$userId = $this->api->getUserId();
-		$result = $this->feedBl->findAll($userId);
+		$result = $this->feedBusinessLayer->findAll($userId);
 
 		$params = array(
 			'feeds' => $result
@@ -83,17 +84,17 @@ class FeedController extends Controller {
 		// check if feed or folder exists
 		try {
 			if($feedType === FeedType::FOLDER){
-				$this->folderBl->find($feedId, $userId);
+				$this->folderBusinessLayer->find($feedId, $userId);
 			
 			} elseif ($feedType === FeedType::FEED){
-				$this->feedBl->find($feedId, $userId);
+				$this->feedBusinessLayer->find($feedId, $userId);
 			
 			// if its the first launch, those values will be null
 			} elseif($feedType === null){
-				throw new BLException('');
+				throw new BusinessLayerException('');
 			}
 	
-		} catch (BLException $ex){
+		} catch (BusinessLayerException $ex){
 			$feedId = 0;
 			$feedType = FeedType::SUBSCRIPTIONS;
 		}
@@ -120,13 +121,13 @@ class FeedController extends Controller {
 		$userId = $this->api->getUserId();
 
 		try {
-			$feed = $this->feedBl->create($url, $parentFolderId, $userId);
+			$feed = $this->feedBusinessLayer->create($url, $parentFolderId, $userId);
 			$params = array(
 				'feeds' => array($feed)
 			);
 
 			return $this->renderJSON($params);
-		} catch(BLException $ex) {
+		} catch(BusinessLayerException $ex) {
 
 			return $this->renderJSON(array(), $ex->getMessage());
 		}
@@ -142,7 +143,7 @@ class FeedController extends Controller {
 		$feedId = (int) $this->params('feedId');
 		$userId = $this->api->getUserId();
 
-		$this->feedBl->delete($feedId, $userId);
+		$this->feedBusinessLayer->delete($feedId, $userId);
 
 		return $this->renderJSON();
 	}
@@ -154,16 +155,21 @@ class FeedController extends Controller {
 	 * @Ajax
 	 */
 	public function update(){
-		$feedId = (int) $this->params('feedId');
-		$userId = $this->api->getUserId();
+		try {
+			$feedId = (int) $this->params('feedId');
+			$userId = $this->api->getUserId();
 
-		$feed = $this->feedBl->update($feedId, $userId);
+			$feed = $this->feedBusinessLayer->update($feedId, $userId);
 
-		$params = array(
-			'feeds' => array($feed)
-		);
+			$params = array(
+				'feeds' => array($feed)
+			);
 
-		return $this->renderJSON($params);
+			return $this->renderJSON($params);
+
+		} catch(BusinessLayerException $ex) {
+			return $this->renderJSON(array(), $ex->getMessage());
+		}
 	}
 
 
@@ -177,7 +183,7 @@ class FeedController extends Controller {
 		$parentFolderId = (int) $this->params('parentFolderId');
 		$userId = $this->api->getUserId();
 
-		$this->feedBl->move($feedId, $parentFolderId, $userId);
+		$this->feedBusinessLayer->move($feedId, $parentFolderId, $userId);
 
 		return $this->renderJSON();	
 	}
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index f905ddddf..f7934ae67 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -29,17 +29,18 @@ use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
 
-use \OCA\News\Bl\FolderBl;
-use \OCA\News\Bl\BLException;
+use \OCA\News\BusinessLayer\FolderBusinessLayer;
+use \OCA\News\BusinessLayer\BusinessLayerException;
 
 
 class FolderController extends Controller {
 
-	private $folderBl;
+	private $folderBusinessLayer;
 
-	public function __construct(API $api, Request $request, FolderBl $folderBl){
+	public function __construct(API $api, Request $request, 
+	                            FolderBusinessLayer $folderBusinessLayer){
 		parent::__construct($api, $request);
-		$this->folderBl = $folderBl;
+		$this->folderBusinessLayer = $folderBusinessLayer;
 	}
 
 
@@ -49,7 +50,7 @@ class FolderController extends Controller {
 	 * @Ajax
 	 */
 	public function folders(){
-		$folders = $this->folderBl->findAll($this->api->getUserId());
+		$folders = $this->folderBusinessLayer->findAll($this->api->getUserId());
 		$result = array(
 			'folders' => $folders
 		);
@@ -61,7 +62,7 @@ class FolderController extends Controller {
 		$userId = $this->api->getUserId();
 		$folderId = (int) $this->params('folderId');
 
-		$this->folderBl->open($folderId, $isOpened, $userId);
+		$this->folderBusinessLayer->open($folderId, $isOpened, $userId);
 	}
 
 	/**
@@ -96,14 +97,14 @@ class FolderController extends Controller {
 		$folderName = $this->params('folderName');
 
 		try {
-			$folder = $this->folderBl->create($folderName, $userId);
+			$folder = $this->folderBusinessLayer->create($folderName, $userId);
 
 			$params = array(
 				'folders' => array($folder)
 			);
 			return $this->renderJSON($params);
 
-		} catch (BLException $ex){
+		} catch (BusinessLayerException $ex){
 
 			return $this->renderJSON(array(), $ex->getMessage());
 		}
@@ -120,7 +121,7 @@ class FolderController extends Controller {
 		$userId = $this->api->getUserId();
 		$folderId = (int) $this->params('folderId');
 
-		$this->folderBl->delete($folderId, $userId);
+		$this->folderBusinessLayer->delete($folderId, $userId);
 
 		return $this->renderJSON();
 	}
@@ -137,14 +138,14 @@ class FolderController extends Controller {
 		$folderId = (int) $this->params('folderId');
 
 		try {
-			$folder = $this->folderBl->rename($folderId, $folderName, $userId);
+			$folder = $this->folderBusinessLayer->rename($folderId, $folderName, $userId);
 
 			$params = array(
 				'folders' => array($folder)
 			);
 			return $this->renderJSON($params);
 
-		} catch (BLException $ex){
+		} catch (BusinessLayerException $ex){
 
 			return $this->renderJSON(array(), $ex->getMessage());
 		}
diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php
index c911fa3c6..cfdfc4156 100644
--- a/controller/itemcontroller.php
+++ b/controller/itemcontroller.php
@@ -29,16 +29,17 @@ use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
 
-use \OCA\News\Bl\ItemBl;
+use \OCA\News\BusinessLayer\ItemBusinessLayer;
 
 
 class ItemController extends Controller {
 
-	private $itemBl;
+	private $itemBusinessLayer;
 
-	public function __construct(API $api, Request $request, ItemBl $itemBl){
+	public function __construct(API $api, Request $request, 
+		                        ItemBusinessLayer $itemBusinessLayer){
 		parent::__construct($api, $request);
-		$this->itemBl = $itemBl;
+		$this->itemBusinessLayer = $itemBusinessLayer;
 	}
 
 
@@ -60,11 +61,11 @@ class ItemController extends Controller {
 		
 		if($limit !== null){
 			$offset = (int) $this->params('offset', 0);
-			$items = $this->itemBl->findAll($id, $type, (int) $limit, $offset, 
+			$items = $this->itemBusinessLayer->findAll($id, $type, (int) $limit, $offset, 
 				                            $showAll, $userId);
 		} else {
 			$updatedSince = (int) $this->params('updatedSince');
-			$items = $this->itemBl->findAllNew($id, $type, $updatedSince, 
+			$items = $this->itemBusinessLayer->findAllNew($id, $type, $updatedSince, 
 				                               $showAll, $userId);
 		}
 
@@ -83,7 +84,7 @@ class ItemController extends Controller {
 	 */
 	public function starred(){
 		$userId = $this->api->getUserId();
-		$starredCount = $this->itemBl->starredCount($userId);
+		$starredCount = $this->itemBusinessLayer->starredCount($userId);
 
 		$params = array(
 			'starred' => (int) $starredCount
@@ -98,7 +99,7 @@ class ItemController extends Controller {
 		$feedId = (int) $this->params('feedId');
 		$guidHash = $this->params('guidHash');
 
-		$this->itemBl->star($feedId, $guidHash, $isStarred, $userId);
+		$this->itemBusinessLayer->star($feedId, $guidHash, $isStarred, $userId);
 	}
 
 
@@ -130,7 +131,7 @@ class ItemController extends Controller {
 		$userId = $this->api->getUserId();
 		$itemId = (int) $this->params('itemId');
 
-		$this->itemBl->read($itemId, $isRead, $userId);
+		$this->itemBusinessLayer->read($itemId, $isRead, $userId);
 	}
 
 	/**
@@ -167,7 +168,7 @@ class ItemController extends Controller {
 		$feedId = (int) $this->params('feedId');
 		$highestItemId = (int) $this->params('highestItemId');
 
-		$this->itemBl->readFeed($feedId, $highestItemId, $userId);
+		$this->itemBusinessLayer->readFeed($feedId, $highestItemId, $userId);
 		return $this->renderJSON();
 	}