diff --git a/lib/Controller/CardApiController.php b/lib/Controller/CardApiController.php index 64d48ec71..b82030582 100644 --- a/lib/Controller/CardApiController.php +++ b/lib/Controller/CardApiController.php @@ -27,8 +27,7 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; - - use OCA\Deck\Controller\Helper\ApiHelper; + use OCA\Deck\Service\BoardService; use OCA\Deck\Service\StackService; use OCA\Deck\Service\CardService; @@ -39,15 +38,13 @@ * @package OCA\Deck\Controller */ class CardApiController extends ApiController { - private $cardService; - private $boardService; - private $stackService; + private $cardService; private $userId; /** * @param string $appName * @param IRequest $request - * @param CardService $service + * @param CardService $cardService * @param $userId */ public function __construct($appName, IRequest $request, CardService $cardService, $userId) { diff --git a/lib/Controller/Helper/ApiHelper.php b/lib/Controller/Helper/ApiHelper.php deleted file mode 100644 index c19baaaf8..000000000 --- a/lib/Controller/Helper/ApiHelper.php +++ /dev/null @@ -1,49 +0,0 @@ - - * - * @author Ryan Fletcher - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -namespace OCA\Deck\Controller\Helper; - -use OCP\AppFramework\Http; - -class ApiHelper { - - public static function entityHasError($entityId, $entityName, $service) { - if (is_numeric($entityId) === false) { - $error['message'] = $entityName . ' id must be a number'; - $error['status'] = HTTP::STATUS_BAD_REQUEST; - return $error; - } - - $entity = $service->find($entityId); - - if ($entity === false || $entity === null) { - $error['message'] = $entityName . ' not found'; - $error['status'] = HTTP::STATUS_NOT_FOUND; - return $error; - } - - return false; - } - -} \ No newline at end of file diff --git a/lib/Controller/LabelApiController.php b/lib/Controller/LabelApiController.php index 09694d17f..72643c963 100644 --- a/lib/Controller/LabelApiController.php +++ b/lib/Controller/LabelApiController.php @@ -44,7 +44,7 @@ class LabelApiController extends ApiController { /** * @param string $appName * @param IRequest $request - * @param LabelService $service + * @param LabelService $labelService * @param $userId */ public function __construct($appName, IRequest $request, LabelService $labelService, $userId) {