Jingga/oms-Draw
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Draw.git synced 2026-02-15 22:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix default respone generation

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-07-26 09:18:05 +00:00
parent c54ba2b3dc
commit 6d2e394415
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -21,10 +21,8 @@ use Modules\Draw\Models\DrawImageMapper;
use Modules\Media\Controller\ApiController as MediaController; use Modules\Media\Controller\ApiController as MediaController;
use Modules\Media\Models\UploadStatus; use Modules\Media\Models\UploadStatus;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\File; use phpOMS\System\File\Local\File;
use phpOMS\Utils\ImageUtils; use phpOMS\Utils\ImageUtils;
@ -75,8 +73,8 @@ final class ApiController extends Controller
public function apiDrawCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiDrawCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateDrawCreate($request))) { if (!empty($val = $this->validateDrawCreate($request))) {
$response->data['draw_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
@ -99,7 +97,7 @@ final class ApiController extends Controller
// protection against infinite loop // protection against infinite loop
if ($i >= 10000) { if ($i >= 10000) {
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Draw', 'Draw failed.', null); $this->createInvalidCreateResponse($request, $response, null);
return; return;
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
} }
@ -121,7 +119,7 @@ final class ApiController extends Controller
$draw = DrawImage::fromMedia($media); $draw = DrawImage::fromMedia($media);
$this->createModel($request->header->account, $draw, DrawImageMapper::class, 'draw', $request->getOrigin()); $this->createModel($request->header->account, $draw, DrawImageMapper::class, 'draw', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Draw', 'Draw successfully created.', $draw); $this->createStandardCreateResponse($request, $response, $draw);
} }
/** /**