diff --git a/appinfo/routes.php b/appinfo/routes.php index c075405bd..209227f6e 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -83,7 +83,7 @@ return [ ['name' => 'board_api#delete', 'url' => '/api/v1.0/board/{id}', 'verb' => 'DELETE'], ['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/board/{id}/undo_delete', 'verb' => 'POST'], - ['name' => 'stack_api#index', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'GET'], + ['name' => 'stack_api#index', 'url' => '/api/v1.0/board/{boardId}/stacks', 'verb' => 'GET'], ['name' => 'stack_api#create', 'url' => '/api/v1.0/board/{boardId}/stack', 'verb' => 'POST'], ['name' => 'stack_api#delete', 'url' => '/api/v1.0/board/{boardId}/stack/{id}', 'verb' => 'DELETE'], diff --git a/lib/Controller/StackApiController.php b/lib/Controller/StackApiController.php index 6186694a4..159d571e2 100644 --- a/lib/Controller/StackApiController.php +++ b/lib/Controller/StackApiController.php @@ -26,8 +26,6 @@ namespace OCA\Deck\Controller; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCP\IUserManager; -use OCP\IGroupManager; use OCA\Deck\Service\StackService; @@ -45,12 +43,10 @@ class StackApiController extends ApiController { * @param string $appName * @param IRequest $request * @param StackService $service - * @param $boardId */ - public function __construct($appName, IRequest $request, StackService $service, $boardId) { + public function __construct($appName, IRequest $request, StackService $service) { parent::__construct($appName, $request); $this->service = $service; - $this->boardId = $boardId; } /** @@ -60,8 +56,8 @@ class StackApiController extends ApiController { * * Return all of the stacks in the specified board. */ - public function index() { - $stacks = $this->service->findAll($this->boardId); + public function index($boardId) { + $stacks = $this->service->findAll($boardId); return new DataResponse($stacks); } @@ -76,9 +72,9 @@ class StackApiController extends ApiController { * * Create a stack with the specified title and order. */ - public function create($title, $order) { + public function create($boardId, $title, $order) { // this throws a StatusException that needs to be caught and handled - $stack = $this->service->create($title, $this->boardId, $order); + $stack = $this->service->create($title, $boardId, $order); return new DataResponse($stack); } @@ -92,7 +88,7 @@ class StackApiController extends ApiController { * * Delete the stack specified by $id. Return the board that was deleted. */ - public function delete($id) { + public function delete($boardId, $id) { $stack = $this->service->delete($id); return new DataResponse($stack);