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

Re-format code according to the coding style.

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Steven R. Baker
2018-02-12 11:55:02 +01:00
committed by Julius Härtl
parent 40f34eb3bc
commit 8ec97032b1
3 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
appinfo/routes.php
View File

@@ -76,18 +76,18 @@ return [
['name' => 'label#update', 'url' => '/labels/{labelId}', 'verb' => 'PUT'], ['name' => 'label#update', 'url' => '/labels/{labelId}', 'verb' => 'PUT'],
['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'], ['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'],
// api // api
['name' => 'board_api#index', 'url' => '/api/v1.0/boards', 'verb' => 'GET'], ['name' => 'board_api#index', 'url' => '/api/v1.0/boards', 'verb' => 'GET'],
['name' => 'board_api#get', 'url' => '/api/v1.0/board/{id}', 'verb' => 'GET'], ['name' => 'board_api#get', 'url' => '/api/v1.0/board/{id}', 'verb' => 'GET'],
['name' => 'board_api#create', 'url' => '/api/v1.0/board', 'verb' => 'POST'], ['name' => 'board_api#create', 'url' => '/api/v1.0/board', 'verb' => 'POST'],
['name' => 'board_api#delete', 'url' => '/api/v1.0/board/{id}', 'verb' => 'DELETE'], ['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' => 'board_api#undo_delete', 'url' => '/api/v1.0/board/{id}/undo_delete', 'verb' => 'POST'],
['name' => 'stack_api#index', 'url' => '/api/v1.0/board/{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#create', 'url' => '/api/v1.0/board/{boardId}/stack', 'verb' => 'POST'],
['name' => 'stack_api#delete', 'url' => '/api/v1.0/board/{boardId}/stack/{id}', 'verb' => 'DELETE'], ['name' => 'stack_api#delete', 'url' => '/api/v1.0/board/{boardId}/stack/{id}', 'verb' => 'DELETE'],
['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}', ['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}',
'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']],
] ]
]; ];

178
lib/Controller/BoardApiController.php
View File

@@ -38,109 +38,109 @@ use OCA\Deck\Service\BoardService;
*/ */
class BoardApiController extends ApiController { class BoardApiController extends ApiController {
private $service; private $service;
private $userInfo; private $userInfo;
/** /**
* @param string $appName * @param string $appName
* @param IRequest $request * @param IRequest $request
* @param IUserManager $userManager * @param IUserManager $userManager
* @param IGroupManager $groupManager * @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, IUserManager $userManager, IGroupManager $groupManager, 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->userManager = $userManager;
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @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.
*/ */
public function index() { public function index() {
$boards = $this->service->findAll($this->getUserInfo()); $boards = $this->service->findAll($this->getUserInfo());
return new DataResponse($boards); return new DataResponse($boards);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $id * @params $id
* *
* Return the board specified by $id. * Return the board specified by $id.
*/ */
public function get($id) { public function get($id) {
$board = $this->service->find($id); $board = $this->service->find($id);
// FIXME: this should probably 404 if the board has been deleted // FIXME: this should probably 404 if the board has been deleted
return new DataResponse($board); return new DataResponse($board);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $title * @params $title
* @params $color * @params $color
* *
* Create a board with the specified title and color. * Create a board with the specified title and color.
*/ */
public function create($title, $color) { public function create($title, $color) {
$board = $this->service->create($title, $this->userId, $color); $board = $this->service->create($title, $this->userId, $color);
return new DataResponse($board); return new DataResponse($board);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $id * @params $id
* *
* Delete the board specified by $id. Return the board that was deleted. * Delete the board specified by $id. Return the board that was deleted.
*/ */
public function delete($id) { public function delete($id) {
$board = $this->service->delete($id); $board = $this->service->delete($id);
return new DataResponse($board); return new DataResponse($board);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $id * @params $id
* *
* Undo the deletion of the board specified by $id. * Undo the deletion of the board specified by $id.
*/ */
public function undoDelete($id) { public function undoDelete($id) {
$board = $this->service->find($id); $board = $this->service->find($id);
$this->service->deleteUndo($id); $this->service->deleteUndo($id);
return new DataResponse($board); return new DataResponse($board);
} }
// this is taken from BoardController, but it's not ideal // this is taken from BoardController, but it's not ideal
private function getUserInfo() { private function getUserInfo() {
$groups = $this->groupManager->getUserGroupIds( $groups = $this->groupManager->getUserGroupIds(
$this->userManager->get($this->userId) $this->userManager->get($this->userId)
); );
return ['user' => $this->userId, return ['user' => $this->userId,
'groups' => $groups]; 'groups' => $groups];
} }
} }

100
lib/Controller/StackApiController.php
View File

@@ -36,62 +36,62 @@ use OCA\Deck\Service\StackService;
*/ */
class StackApiController extends ApiController { class StackApiController extends ApiController {
private $service; private $service;
private $userInfo; private $userInfo;
/** /**
* @param string $appName * @param string $appName
* @param IRequest $request * @param IRequest $request
* @param StackService $service * @param StackService $service
*/ */
public function __construct($appName, IRequest $request, StackService $service) { public function __construct($appName, IRequest $request, StackService $service) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->service = $service; $this->service = $service;
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* Return all of the stacks in the specified board. * Return all of the stacks in the specified board.
*/ */
public function index($boardId) { public function index($boardId) {
$stacks = $this->service->findAll($boardId); $stacks = $this->service->findAll($boardId);
return new DataResponse($stacks); return new DataResponse($stacks);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $title * @params $title
* @params $order * @params $order
* *
* Create a stack with the specified title and order. * Create a stack with the specified title and order.
*/ */
public function create($boardId, $title, $order) { public function create($boardId, $title, $order) {
// this throws a StatusException that needs to be caught and handled // this throws a StatusException that needs to be caught and handled
$stack = $this->service->create($title, $boardId, $order); $stack = $this->service->create($title, $boardId, $order);
return new DataResponse($stack); return new DataResponse($stack);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @CORS * @CORS
* @NoCSRFRequired * @NoCSRFRequired
* *
* @params $id * @params $id
* *
* Delete the stack specified by $id. Return the board that was deleted. * Delete the stack specified by $id. Return the board that was deleted.
*/ */
public function delete($boardId, $id) { public function delete($boardId, $id) {
$stack = $this->service->delete($id); $stack = $this->service->delete($id);
return new DataResponse($stack); return new DataResponse($stack);
} }
} }