use a deleted flag for deleted feeds to handle undo

2 files changed, 76 insertions, 4 deletions

diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
index 1f8d08ef8..8f7d139e1 100644
--- a/tests/unit/db/FeedMapperTest.php
+++ b/tests/unit/db/FeedMapperTest.php
@@ -146,6 +146,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . 
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`user_id` = ? ' .
+			'AND `feeds`.`deleted_at` = 0 ' .
 			'GROUP BY `feeds`.`id`';
 		
 		$this->setMapperResult($sql, 
@@ -260,6 +261,37 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 	}
 
 
+	public function testGetPurgeDeleted(){
+		$rows = array(
+			array('id' => $this->feeds[0]->getId()),
+			array('id' => $this->feeds[1]->getId())
+		);
+		$deleteOlderThan = 110;
+		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ?';
+		$this->setMapperResult($sql, array($deleteOlderThan), $rows);
+		$result = $this->mapper->getToDelete($deleteOlderThan);
+
+		$this->assertEquals($this->feeds, $result);
+	}
 	
 
+	public function testGetPurgeDeletedFromUser(){
+		$rows = array(
+			array('id' => $this->feeds[0]->getId()),
+			array('id' => $this->feeds[1]->getId())
+		);
+		$deleteOlderThan = 110;
+		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ? ' .
+			'AND `user_id` = ?';
+		$this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows);
+		$result = $this->mapper->getToDelete($deleteOlderThan, $this->user);
+
+		$this->assertEquals($this->feeds, $result);
+	}
+
+	
 }
\ No newline at end of file
diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php
index 57eff63a4..87726b893 100644
--- a/tests/unit/db/FolderMapperTest.php
+++ b/tests/unit/db/FolderMapperTest.php
@@ -32,6 +32,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 
 	private $folderMapper;
 	private $folders;
+	private $user;
 	
 	protected function setUp(){
 		$this->beforeEach();
@@ -46,6 +47,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 			$folder1,
 			$folder2
 		);
+		$this->user = 'hh';
 	}
 
 
@@ -107,7 +109,8 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 			array('id' => $this->folders[1]->getId())
 		);
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-			'WHERE `user_id` = ?';
+			'WHERE `user_id` = ? ' .
+			'AND `deleted_at` = 0';
 		
 		$this->setMapperResult($sql, array($userId), $rows);
 		
@@ -117,17 +120,19 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 
 
 	public function testFindByName(){
+		$folderName = 'heheh';
 		$userId = 'john';
 		$rows = array(
 			array('id' => $this->folders[0]->getId()),
 			array('id' => $this->folders[1]->getId())
 		);
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-			'WHERE `user_id` = ?';
+			'WHERE `name` = ? ' .
+			'AND `user_id` = ?';
 		
-		$this->setMapperResult($sql, array($userId), $rows);
+		$this->setMapperResult($sql, array($folderName, $userId), $rows);
 		
-		$result = $this->folderMapper->findAllFromUser($userId);
+		$result = $this->folderMapper->findByName($folderName, $userId);
 		$this->assertEquals($this->folders, $result);
 	}
 
@@ -173,4 +178,39 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 		$this->folderMapper->delete($folder);
 	}
 
+
+	public function testGetPurgeDeleted(){
+		$rows = array(
+			array('id' => $this->folders[0]->getId()),
+			array('id' => $this->folders[1]->getId())
+		);
+		$deleteOlderThan = 110;
+		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ?';
+		$this->setMapperResult($sql, array($deleteOlderThan), $rows);
+		$result = $this->folderMapper->getToDelete($deleteOlderThan);
+
+		$this->assertEquals($this->folders, $result);
+	}
+
+
+
+	public function testGetPurgeDeletedUser(){
+		$rows = array(
+			array('id' => $this->folders[0]->getId()),
+			array('id' => $this->folders[1]->getId())
+		);
+		$deleteOlderThan = 110;
+		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ? ' .
+			'AND `user_id` = ?';
+		$this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows);
+		$result = $this->folderMapper->getToDelete($deleteOlderThan, $this->user);
+
+		$this->assertEquals($this->folders, $result);
+	}
+
+
 }
\ No newline at end of file