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

Move DI of IUserManager, IGroupManager, userId to the BoardService

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-07-12 15:24:53 +02:00
parent e32adb17f2
commit 9fc01eb51f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Controller/BoardController.php
View File

@@ -35,15 +35,11 @@ use OCP\IGroupManager;
class BoardController extends ApiController { class BoardController extends ApiController {
private $userId; private $userId;
private $boardService; private $boardService;
private $userManager;
private $groupManager;
private $permissionService; private $permissionService;
public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $boardService, PermissionService $permissionService, $userId) { public function __construct($appName, IRequest $request, BoardService $boardService, PermissionService $permissionService, $userId) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->boardService = $boardService; $this->boardService = $boardService;
$this->permissionService = $permissionService; $this->permissionService = $permissionService;
} }

13
lib/Service/BoardService.php
View File

@@ -30,10 +30,12 @@ use OCA\Deck\Db\IPermissionMapper;
use OCA\Deck\Db\Label; use OCA\Deck\Db\Label;
use OCA\Deck\Notification\NotificationHelper; use OCA\Deck\Notification\NotificationHelper;
use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\DoesNotExistException;
use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\LabelMapper;
use OCP\IUserManager;
class BoardService { class BoardService {
@@ -45,6 +47,9 @@ class BoardService {
private $permissionService; private $permissionService;
private $notificationHelper; private $notificationHelper;
private $assignedUsersMapper; private $assignedUsersMapper;
private $userManager;
private $groupManager;
private $userId;
public function __construct( public function __construct(
BoardMapper $boardMapper, BoardMapper $boardMapper,
@@ -53,7 +58,10 @@ class BoardService {
AclMapper $aclMapper, AclMapper $aclMapper,
PermissionService $permissionService, PermissionService $permissionService,
NotificationHelper $notificationHelper, NotificationHelper $notificationHelper,
AssignedUsersMapper $assignedUsersMapper AssignedUsersMapper $assignedUsersMapper,
IUserManager $userManager,
IGroupManager $groupManager,
$userId
) { ) {
$this->boardMapper = $boardMapper; $this->boardMapper = $boardMapper;
$this->labelMapper = $labelMapper; $this->labelMapper = $labelMapper;
@@ -62,6 +70,9 @@ class BoardService {
$this->permissionService = $permissionService; $this->permissionService = $permissionService;
$this->notificationHelper = $notificationHelper; $this->notificationHelper = $notificationHelper;
$this->assignedUsersMapper = $assignedUsersMapper; $this->assignedUsersMapper = $assignedUsersMapper;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->userId = $userId;
} }
public function findAll() { public function findAll() {