use a deleted flag for deleted feeds to handle undo

2 files changed, 47 insertions, 2 deletions

diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index b453338d0..d3cc62449 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -133,6 +133,10 @@ class FeedController extends Controller {
 		$userId = $this->api->getUserId();
 
 		try {
+			// we need to purge deleted feeds if a feed is created to 
+			// prevent already exists exceptions
+			$this->feedBusinessLayer->purgeDeleted($userId);
+
 			$feed = $this->feedBusinessLayer->create($url, $parentFolderId, $userId);
 			$params = array(
 				'feeds' => array($feed)
@@ -160,7 +164,7 @@ class FeedController extends Controller {
 		$userId = $this->api->getUserId();
 
 		try {
-			$this->feedBusinessLayer->delete($feedId, $userId);
+			$this->feedBusinessLayer->markDeleted($feedId, $userId);
 			return $this->renderJSON();
 		} catch(BusinessLayerException $ex) {
 			return $this->renderJSON(array(), $ex->getMessage());
@@ -259,4 +263,22 @@ class FeedController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function restore(){
+		$feedId = (int) $this->params('feedId');
+		$userId = $this->api->getUserId();
+
+		try {
+			$this->feedBusinessLayer->unmarkDeleted($feedId, $userId);
+			return $this->renderJSON();
+		} catch(BusinessLayerException $ex) {
+			return $this->renderJSON(array(), $ex->getMessage());
+		}
+	}
+
+
 }
\ No newline at end of file
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index 7542a5260..4bae118c2 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -114,6 +114,10 @@ class FolderController extends Controller {
 		$folderName = $this->params('folderName');
 
 		try {
+			// we need to purge deleted folders if a folder is created to 
+			// prevent already exists exceptions
+			$this->folderBusinessLayer->purgeDeleted($userId);
+
 			$folder = $this->folderBusinessLayer->create($folderName, $userId);
 
 			$params = array(
@@ -138,7 +142,7 @@ class FolderController extends Controller {
 		$folderId = (int) $this->params('folderId');
 
 		try {
-			$this->folderBusinessLayer->delete($folderId, $userId);
+			$this->folderBusinessLayer->markDeleted($folderId, $userId);
 			return $this->renderJSON();
 		} catch (BusinessLayerException $ex){
 			return $this->renderJSON(array(), $ex->getMessage());
@@ -188,4 +192,23 @@ class FolderController extends Controller {
 	}
 
 
+	/**
+	 * @IsAdminExemption
+	 * @IsSubAdminExemption
+	 * @Ajax
+	 */
+	public function restore(){
+		$userId = $this->api->getUserId();
+		$folderId = (int) $this->params('folderId');
+
+		try {
+			$this->folderBusinessLayer->unmarkDeleted($folderId, $userId);
+			return $this->renderJSON();
+		} catch (BusinessLayerException $ex){
+			return $this->renderJSON(array(), $ex->getMessage());
+		}
+
+	}
+
+
 }
\ No newline at end of file