Implement share provider for deck

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Dec 8, 2020 · 93993f8 · 93993f8
1 parent d3b763c
commit 93993f8
Show file tree

Hide file tree

Showing 8 changed files with 1,235 additions and 11 deletions.
diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php
@@ -26,6 +26,7 @@
 use Closure;
 use Exception;
 use OC\EventDispatcher\SymfonyAdapter;
+use OC\Share20\ProviderFactory;
 use OCA\Deck\Activity\CommentEventHandler;
 use OCA\Deck\Capabilities;
 use OCA\Deck\Collaboration\Resources\ResourceProvider;
@@ -43,6 +44,8 @@
 use OCA\Deck\Search\DeckProvider;
 use OCA\Deck\Service\FullTextSearchService;
 use OCA\Deck\Service\PermissionService;
+use OCA\Deck\Sharing\DeckShareProvider;
+use OCA\Deck\Sharing\Listener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -62,6 +65,8 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager as NotificationManager;
+use OCP\Share\IManager;
+use OCP\Share\IProviderFactory;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -92,6 +97,14 @@ public function boot(IBootContext $context): void {
 		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerFullTextSearch']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
+
+		$context->injectFn(function (IManager $shareManager) {
+			$shareManager->registerShareProvider(DeckShareProvider::class);
+		});
+
+		$context->injectFn(function (Listener $listener, IEventDispatcher $eventDispatcher) {
+			$listener->register($eventDispatcher);
+		});
 	}
 
 	public function register(IRegistrationContext $context): void {

diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
@@ -85,6 +85,16 @@ public function find($id, $withLabels = false, $withAcl = false) {
 		return $board;
 	}
 
+	public function findAllForUser(string $userId, int $since = -1, $includeArchived = true): array {
+		$groups = $this->groupManager->getUserGroupIds(
+			$this->userManager->get($userId)
+		);
+		$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived);
+		$groupBoards = $this->findAllByGroups($userId, $groups,null, null, $since, $includeArchived);
+		$circleBoards = $this->findAllByCircles($userId, null, null,  $since, $includeArchived);
+		return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
+	}
+
 	/**
 	 * Find all boards for a given user
 	 *

diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php
@@ -149,7 +149,8 @@ public function queryCardsByBoard(int $boardId): IQueryBuilder {
 
 	public function queryCardsByBoards(array $boardIds): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('c.*')
+		$qb->select('c.*', 's.board_id')
+			->selectAlias('s.title', 'stack_title')
 			->from('deck_cards', 'c')
 			->innerJoin('c', 'deck_stacks', 's', $qb->expr()->eq('s.id', 'c.stack_id'))
 			->andWhere($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY)));
@@ -276,6 +277,27 @@ public function search($boardIds, $term, $limit = null, $offset = null) {
 		return $this->findEntities($qb);
 	}
 
+	public function searchRaw($boardIds, $term, $limit = null, $offset = null) {
+		$qb = $this->queryCardsByBoards($boardIds);
+		$qb->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+		$qb->andWhere(
+			$qb->expr()->orX(
+				$qb->expr()->iLike('c.title', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($term) . '%')),
+				$qb->expr()->iLike('c.description', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($term) . '%'))
+			)
+		);
+		if ($limit !== null) {
+			$qb->setMaxResults($limit);
+		}
+		if ($offset !== null) {
+			$qb->setFirstResult($offset);
+		}
+		$result = $qb->execute();
+		$all = $result->fetchAll();
+		$result->closeCursor();
+		return $all;
+	}
+
 	public function delete(Entity $entity): Entity {
 		// delete assigned labels
 		$this->labelMapper->deleteLabelAssignmentsForCard($entity->getId());

diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
@@ -114,13 +114,13 @@ public function setUserId(string $userId): void {
 		$this->userId = $userId;
 	}
 
-	public function getUserBoards(int $since = -1, $includeArchived = true): array {
-		$userInfo = $this->getBoardPrerequisites();
-		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since, $includeArchived);
-		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since, $includeArchived);
-		$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null,  $since, $includeArchived);
-		return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
+	/**
+	 * Get all boards that are shared with a user, their groups or circles
+	 */
+	public function getUserBoards(int $since = -1, bool $includeArchived = true): array {
+		return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived);
 	}
+
 	/**
 	 * @return array
 	 */

diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
@@ -29,6 +29,7 @@
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Acl;
@@ -116,12 +117,23 @@ public function fetchDeleted($boardId) {
 		return $cards;
 	}
 
-	public function search($boardIds, $term) {
-		$cards = $this->cardMapper->search($boardIds, $term);
-		return $cards;
+	public function search(string $term, int $limit = null, int $offset = null): array {
+		$boards = $this->boardService->getUserBoards();
+		$boardIds = array_map(static function (Board $board) {
+			return $board->getId();
+		}, $boards);
+		return $this->cardMapper->search($boardIds, $term, $limit, $offset);
 	}
 
-	/**
+	public function searchRaw(string $term, int $limit = null, int $offset = null): array {
+		$boards = $this->boardService->getUserBoards();
+		$boardIds = array_map(static function (Board $board) {
+			return $board->getId();
+		}, $boards);
+		return $this->cardMapper->searchRaw($boardIds, $term, $limit, $offset);
+	}
+
+		/**
 	 * @param $cardId
 	 * @return \OCA\Deck\Db\RelationalEntity
 	 * @throws \OCA\Deck\NoPermissionException