only make one request for mark all read and mark folder read, fix #171, fix a bug that prevented readding of feeds when its folder was deleted, fix a bug that would not allow mark read for feeds when the app was started for the first time

1 files changed, 27 insertions, 1 deletions

diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index a2e0d028b..7542a5260 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -30,17 +30,25 @@ use \OCA\AppFramework\Core\API;
 use \OCA\AppFramework\Http\Request;
 
 use \OCA\News\BusinessLayer\FolderBusinessLayer;
+use \OCA\News\BusinessLayer\FeedBusinessLayer;
+use \OCA\News\BusinessLayer\ItemBusinessLayer;
 use \OCA\News\BusinessLayer\BusinessLayerException;
 
 
 class FolderController extends Controller {
 
 	private $folderBusinessLayer;
+	private $feedBusinessLayer;
+	private $itemBusinessLayer;
 
 	public function __construct(API $api, Request $request, 
-	                            FolderBusinessLayer $folderBusinessLayer){
+	                            FolderBusinessLayer $folderBusinessLayer,
+	                            FeedBusinessLayer $feedBusinessLayer,
+	                            ItemBusinessLayer $itemBusinessLayer){
 		parent::__construct($api, $request);
 		$this->folderBusinessLayer = $folderBusinessLayer;
+		$this->feedBusinessLayer = $feedBusinessLayer;
+		$this->itemBusinessLayer = $itemBusinessLayer;
 	}
 
 
@@ -161,5 +169,23 @@ class FolderController extends Controller {
 		}
 	}
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function read(){
+		$userId = $this->api->getUserId();
+		$folderId = (int) $this->params('folderId');
+		$highestItemId = (int) $this->params('highestItemId');
+
+		$this->itemBusinessLayer->readFolder($folderId, $highestItemId, $userId);
+
+		$params = array(
+			'feeds' => $this->feedBusinessLayer->findAll($userId)
+		);
+		return $this->renderJSON($params);
+	}
+
 
 }
\ No newline at end of file