From 143ba2c08202d14cb9ae3a6ed3040891fc383e07 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 26 Jul 2023 09:18:04 +0000 Subject: [PATCH] fix default respone generation --- Controller/ApiController.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f18104a..d7dd761 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -21,10 +21,8 @@ use Modules\Dashboard\Models\DashboardBoardStatus; use Modules\Dashboard\Models\DashboardComponent; use Modules\Dashboard\Models\DashboardComponentMapper; use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Model\Message\FormValidation; /** * Api controller for the dashboard module. @@ -71,15 +69,15 @@ final class ApiController extends Controller public function apiBoardCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBoardCreate($request))) { - $response->data[$request->uri->__toString()] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; + $this->createInvalidCreateResponse($request, $response, $val); return; } $board = $this->createBoardFromRequest($request); $this->createModel($request->header->account, $board, DashboardBoardMapper::class, 'board', $request->getOrigin()); - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Board', 'Board successfully created.', $board); + $this->createStandardCreateResponse($request, $response, $board); } /** @@ -138,15 +136,15 @@ final class ApiController extends Controller public function apiComponentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateComponentCreate($request))) { - $response->data[$request->uri->__toString()] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; + $this->createInvalidCreateResponse($request, $response, $val); return; } $component = $this->createComponentFromRequest($request); $this->createModel($request->header->account, $component, DashboardComponentMapper::class, 'component', $request->getOrigin()); - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Component', 'Component successfully created.', $component); + $this->createStandardCreateResponse($request, $response, $component); } /**