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

Finished Error handling across the API

Browse Source 
Signed-off-by: Ryan Fletcher <ryan.fletcher@codepassion.ca>
This commit is contained in:
Ryan Fletcher
2018-07-13 19:07:08 -04:00
committed by Julius Härtl
parent 2668f6b80c
commit dd1d4246fe
5 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Controller/LabelApiController.php
View File

@@ -27,8 +27,9 @@ use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;
use OCA\Deck\Service\LabelService;
use OCA\Deck\Service\BoardService;
use OCA\Deck\Controller\Helper\ApiHelper;
/**
* Class BoardApiController
@@ -46,10 +47,12 @@ class LabelApiController extends ApiController {
* @param LabelService $service
* @param $userId
*/
public function __construct($appName, IRequest $request, LabelService $labelService, $userId) {
public function __construct($appName, IRequest $request, LabelService $labelService, BoardService $boardService, $userId) {
parent::__construct($appName, $request);
$this->labelService = $labelService;
$this->boardService = $boardService;
$this->userId = $userId;
$this->apiHelper = new ApiHelper();
}
/**
@@ -61,9 +64,10 @@ class LabelApiController extends ApiController {
*/
public function get() {
if (is_numeric($this->request->params['boardId']) === false) {
return new DataResponse('board id must be a number', HTTP::STATUS_BAD_REQUEST);
}
$boardError = $this->apiHelper->entityHasError($this->request->params['boardId'], 'board', $this->boardService);
if ($boardError) {
return new DataResponse($boardError['message'], $boardError['status']);
}
if (is_numeric($this->request->params['labelId']) === false) {
return new DataResponse('label id must be a number', HTTP::STATUS_BAD_REQUEST);
@@ -89,8 +93,9 @@ class LabelApiController extends ApiController {
*/
public function create($title, $color) {
if (is_numeric($this->request->params['boardId']) === false) {
return new DataResponse('board id must be a number', HTTP::STATUS_BAD_REQUEST);
$boardError = $this->apiHelper->entityHasError($this->request->params['boardId'], 'board', $this->boardService);
if ($boardError) {
return new DataResponse($boardError['message'], $boardError['status']);
}
if ($title === false || $title === null) {
@@ -121,8 +126,9 @@ class LabelApiController extends ApiController {
*/
public function update($title, $color) {
if (is_numeric($this->request->params['boardId']) === false) {
return new DataResponse('board id must be a number', HTTP::STATUS_BAD_REQUEST);
$boardError = $this->apiHelper->entityHasError($this->request->params['boardId'], 'board', $this->boardService);
if ($boardError) {
return new DataResponse($boardError['message'], $boardError['status']);
}
if (is_numeric($this->request->params['labelId']) === false) {
@@ -155,8 +161,9 @@ class LabelApiController extends ApiController {
*/
public function delete() {
if (is_numeric($this->request->params['boardId']) === false) {
return new DataResponse('board id must be a number', HTTP::STATUS_BAD_REQUEST);
$boardError = $this->apiHelper->entityHasError($this->request->params['boardId'], 'board', $this->boardService);
if ($boardError) {
return new DataResponse($boardError['message'], $boardError['status']);
}
if (is_numeric($this->request->params['labelId']) === false) {