ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Enrich board listing with stacks

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2019-03-14 22:32:06 +01:00
parent 7cd8bca9dc
commit 6e4f8ca8ea
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Controller/BoardApiController.php
View File

@@ -60,6 +60,7 @@ class BoardApiController extends ApiController {
* @NoCSRFRequired * @NoCSRFRequired
* *
* Return all of the boards that the current user has access to. * Return all of the boards that the current user has access to.
* @throws StatusException
*/ */
public function index() { public function index() {
$modified = $this->request->getHeader('If-Modified-Since'); $modified = $this->request->getHeader('If-Modified-Since');

2
lib/Db/Board.php
View File

@@ -34,6 +34,7 @@ class Board extends RelationalEntity {
protected $permissions = []; protected $permissions = [];
protected $users = []; protected $users = [];
protected $shared; protected $shared;
protected $stacks = [];
protected $deletedAt = 0; protected $deletedAt = 0;
protected $lastModified = 0; protected $lastModified = 0;
@@ -48,6 +49,7 @@ class Board extends RelationalEntity {
$this->addRelation('shared'); $this->addRelation('shared');
$this->addRelation('users'); $this->addRelation('users');
$this->addRelation('permissions'); $this->addRelation('permissions');
$this->addRelation('stacks');
$this->addResolvable('owner'); $this->addResolvable('owner');
$this->shared = -1; $this->shared = -1;
} }

17
lib/Service/BoardService.php
View File

@@ -31,6 +31,7 @@ use OCA\Deck\Db\AssignedUsersMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
use OCA\Deck\Db\IPermissionMapper; use OCA\Deck\Db\IPermissionMapper;
use OCA\Deck\Db\Label; use OCA\Deck\Db\Label;
use OCA\Deck\Db\StackMapper;
use OCA\Deck\NoPermissionException; use OCA\Deck\NoPermissionException;
use OCA\Deck\Notification\NotificationHelper; use OCA\Deck\Notification\NotificationHelper;
use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\DoesNotExistException;
@@ -46,6 +47,7 @@ use OCA\Deck\BadRequestException;
class BoardService { class BoardService {
private $boardMapper; private $boardMapper;
private $stackMapper;
private $labelMapper; private $labelMapper;
private $aclMapper; private $aclMapper;
private $l10n; private $l10n;
@@ -60,6 +62,7 @@ class BoardService {
public function __construct( public function __construct(
BoardMapper $boardMapper, BoardMapper $boardMapper,
StackMapper $stackMapper,
IL10N $l10n, IL10N $l10n,
LabelMapper $labelMapper, LabelMapper $labelMapper,
AclMapper $aclMapper, AclMapper $aclMapper,
@@ -73,6 +76,7 @@ class BoardService {
$userId $userId
) { ) {
$this->boardMapper = $boardMapper; $this->boardMapper = $boardMapper;
$this->stackMapper = $stackMapper;
$this->labelMapper = $labelMapper; $this->labelMapper = $labelMapper;
$this->aclMapper = $aclMapper; $this->aclMapper = $aclMapper;
$this->l10n = $l10n; $this->l10n = $l10n;
@@ -89,7 +93,7 @@ class BoardService {
/** /**
* @return array * @return array
*/ */
public function findAll($since = -1) { public function findAll($since = 0) {
$userInfo = $this->getBoardPrerequisites(); $userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since); $userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since);
@@ -104,6 +108,7 @@ class BoardService {
$this->boardMapper->mapAcl($acl); $this->boardMapper->mapAcl($acl);
} }
} }
$this->enrichWithStacks($item);
$permissions = $this->permissionService->matchPermissions($item); $permissions = $this->permissionService->matchPermissions($item);
$item->setPermissions([ $item->setPermissions([
'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ], 'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ],
@@ -527,4 +532,14 @@ class BoardService {
return $this->aclMapper->delete($acl); return $this->aclMapper->delete($acl);
} }
private function enrichWithStacks($board, $since = -1) {
$stacks = $this->stackMapper->findAll($board->getId(), null, null, $since);
if(\count($stacks) === 0) {
return;
}
$board->setStacks($stacks);
}
} }