Jingga/oms-HumanResourceTimeRecording
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git synced 2026-02-13 19:28:41 +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 e5fbdef9ad
commit 5be92623b1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Controller/ApiController.php
View File

@ -24,10 +24,8 @@ use Modules\HumanResourceTimeRecording\Models\SessionElementMapper;
use Modules\HumanResourceTimeRecording\Models\SessionMapper; use Modules\HumanResourceTimeRecording\Models\SessionMapper;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
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;
/** /**
* HumanResourceTimeRecording controller class. * HumanResourceTimeRecording controller class.
@ -65,14 +63,14 @@ final class ApiController extends Controller
$session = $this->createSessionFromRequest($request); $session = $this->createSessionFromRequest($request);
if ($session === null) { if ($session === null) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Session', 'Session couldn\'t be created.', $session);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
$this->createInvalidCreateResponse($request, $response, $session);
return; return;
} }
$this->createModel($request->header->account, $session, SessionMapper::class, 'session', $request->getOrigin()); $this->createModel($request->header->account, $session, SessionMapper::class, 'session', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Session', 'Session successfully created', $session); $this->createStandardCreateResponse($request, $response, $session);
} }
/** /**
@ -142,8 +140,8 @@ final class ApiController extends Controller
} }
if (!empty($val = $this->validateSessionElementCreate($request))) { if (!empty($val = $this->validateSessionElementCreate($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; return;
} }
@ -162,8 +160,8 @@ final class ApiController extends Controller
$element = $this->createSessionElementFromRequest($request); $element = $this->createSessionElementFromRequest($request);
if ($element === null) { if ($element === null) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Session Element', 'You cannot create a session element for another person!', $element);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
$this->createInvalidCreateResponse($request, $response, $element);
return; return;
} }
@ -177,8 +175,7 @@ final class ApiController extends Controller
} }
$this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin()); $this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $element);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Session Element', 'Session Element successfully created', $element);
} }
/** /**