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

Don't need to pass around the userInfo with it encapsulated in BoardService.

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Steven R. Baker
2018-02-12 16:28:37 +01:00
committed by Julius Härtl
parent 1ffa3211ba
commit e32adb17f2
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Controller/BoardApiController.php
View File

@@ -39,23 +39,17 @@ use OCA\Deck\Service\BoardService;
class BoardApiController extends ApiController { class BoardApiController extends ApiController {
private $service; private $service;
private $userInfo;
/** /**
* @param string $appName * @param string $appName
* @param IRequest $request * @param IRequest $request
* @param IUserManager $userManager
* @param IGroupManager $groupManager
* @param BoardService $service * @param BoardService $service
* @param $userId * @param $userId
*/ */
public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $service, $userId) { public function __construct($appName, IRequest $request, BoardService $service, $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->service = $service; $this->service = $service;
$this->userId = $userId; $this->userId = $userId;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->userInfo = $this->service->getBoardPrerequisites();
} }
/** /**
@@ -66,7 +60,7 @@ class BoardApiController extends ApiController {
* Return all of the boards that the current user has access to. * Return all of the boards that the current user has access to.
*/ */
public function index() { public function index() {
$boards = $this->service->findAll($this->userInfo); $boards = $this->service->findAll();
return new DataResponse($boards); return new DataResponse($boards);
} }

4
lib/Controller/BoardController.php
View File

@@ -38,7 +38,6 @@ class BoardController extends ApiController {
private $userManager; private $userManager;
private $groupManager; private $groupManager;
private $permissionService; private $permissionService;
private $userInfo;
public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $boardService, PermissionService $permissionService, $userId) { public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $boardService, PermissionService $permissionService, $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
@@ -47,14 +46,13 @@ class BoardController extends ApiController {
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
$this->boardService = $boardService; $this->boardService = $boardService;
$this->permissionService = $permissionService; $this->permissionService = $permissionService;
$this->userInfo = $this->boardSerivce->getBoardPrerequisites();
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
*/ */
public function index() { public function index() {
return $this->boardService->findAll($this->userInfo); return $this->boardService->findAll();
} }
/** /**

5
lib/Service/BoardService.php
View File

@@ -64,7 +64,8 @@ class BoardService {
$this->assignedUsersMapper = $assignedUsersMapper; $this->assignedUsersMapper = $assignedUsersMapper;
} }
public function findAll($userInfo) { public function findAll() {
$userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user']); $userBoards = $this->boardMapper->findAllByUser($userInfo['user']);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups']); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups']);
$complete = array_merge($userBoards, $groupBoards); $complete = array_merge($userBoards, $groupBoards);
@@ -112,7 +113,7 @@ class BoardService {
return $board; return $board;
} }
public function getBoardPrerequisites() { private function getBoardPrerequisites() {
$groups = $this->groupManager->getUserGroupIds( $groups = $this->groupManager->getUserGroupIds(
$this->userManager->get($this->userId) $this->userManager->get($this->userId)
); );