show deleted cards in sidebar tab (styling still wip)

Signed-off-by: Manuel Arno Korfmann <manu@korfmann.info>

card undo delete done, styling still wip

Signed-off-by: Manuel Arno Korfmann <manu@korfmann.info>

fix Codacy findings

Signed-off-by: Manuel Arno Korfmann <manu@korfmann.info>

lib/Controller/CardController.php

@@ -89,10 +89,11 @@ class CardController extends Controller {
 	 * @param $order
 	 * @param $description
 	 * @param $duedate
+	 * @param $deletedAt
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function update($id, $title, $stackId, $type, $order, $description, $duedate) {
-			return $this->cardService->update($id, $title, $stackId, $type, $order, $description, $this->userId, $duedate);
+	public function update($id, $title, $stackId, $type, $order, $description, $duedate, $deletedAt) {
+			return $this->cardService->update($id, $title, $stackId, $type, $order, $description, $this->userId, $duedate, $deletedAt);
 	}
 
 	/**

lib/Db/CardMapper.php

@@ -120,15 +120,15 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
 
 	public function findAll($stackId, $limit = null, $offset = null) {
 		$sql = 'SELECT * FROM `*PREFIX*deck_cards` 
-          WHERE `stack_id` = ? AND NOT archived ORDER BY `order`';
+          WHERE `stack_id` = ? AND NOT archived AND deleted_at = 0 ORDER BY `order`';
 		return $this->findEntities($sql, [$stackId], $limit, $offset);
 	}
 
 	public function findDeleted($boardId, $limit = null, $offset = null) {
 		$sql = 'SELECT c.* FROM `*PREFIX*deck_cards` c
 	  INNER JOIN `*PREFIX*deck_stacks` s ON s.id = c.stack_id
-	  WHERE `s`.`board_id` = ? AND NOT c.archived AND NOT c.deleted_at = 0 AND c.deleted_at <= ? ORDER BY `c`.`order`';
-		return $this->findEntities($sql, [$boardId, time()], $limit, $offset);
+	  WHERE `s`.`board_id` = ? AND NOT c.archived AND NOT c.deleted_at = 0 ORDER BY `c`.`order`';
+		return $this->findEntities($sql, [$boardId], $limit, $offset);
 	}
 
 	public function findAllArchived($stackId, $limit = null, $offset = null) {

lib/Service/BoardService.php

@@ -256,4 +256,4 @@ class BoardService {
 		return $this->aclMapper->delete($acl);
 	}
 
-}
+}

lib/Service/CardService.php

@@ -30,6 +30,7 @@ use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\StackMapper;
 use OCA\Deck\Notification\NotificationHelper;
+use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\StatusException;
 
@@ -38,6 +39,7 @@ class CardService {
 
 	private $cardMapper;
 	private $stackMapper;
+	private $boardMapper;
 	private $permissionService;
 	private $boardService;
 	private $notificationHelper;
@@ -45,9 +47,17 @@ class CardService {
 	private $attachmentService;
 	private $currentUser;
 
-	public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService, BoardService $boardService, NotificationHelper $notificationHelper, AssignedUsersMapper $assignedUsersMapper, AttachmentService $attachmentService, $userId) {
+	public function __construct(
+		CardMapper $cardMapper,
+		StackMapper $stackMapper, 
+		BoardMapper $boardMapper, 
+		PermissionService $permissionService, 
+		BoardService $boardService, 
+		AssignedUsersMapper $assignedUsersMapper, 
+		AttachmentService $attachmentService) {
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
+		$this->boardMapper = $boardMapper;
 		$this->permissionService = $permissionService;
 		$this->boardService = $boardService;
 		$this->notificationHelper = $notificationHelper;
@@ -57,6 +67,7 @@ class CardService {
 	}
 
 	public function fetchDeleted($boardId) {
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		return $this->cardMapper->findDeleted($boardId);
 	}
 
@@ -99,7 +110,7 @@ class CardService {
 		return $card;
 	}
 
-	public function update($id, $title, $stackId, $type, $order, $description, $owner, $duedate) {
+	public function update($id, $title, $stackId, $type, $order, $description, $owner, $duedate, $deletedAt) {
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
 			throw new StatusException('Operation not allowed. This board is archived.');
@@ -115,6 +126,7 @@ class CardService {
 		$card->setOwner($owner);
 		$card->setDescription($description);
 		$card->setDuedate($duedate);
+		$card->setDeletedAt($deletedAt);
 		return $this->cardMapper->update($card);
 	}
 

lib/Service/StackService.php

@@ -154,4 +154,4 @@ class StackService {
 
 		return $result;
 	}
-}
+}