Jingga/oms-Profile
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Profile.git synced 2026-02-16 23:38: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 ad55e74bfd
commit 138f00b26b
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Controller/ApiController.php
View File

@ -28,7 +28,6 @@ use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; 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;
/** /**
* Profile class. * Profile class.
@ -65,13 +64,14 @@ final class ApiController extends Controller
$created[] = $profile; $created[] = $profile;
} }
$this->fillJsonResponse( if (!$status) {
$request, $response, $response->header->status = RequestStatusCode::R_400;
$status ? NotificationLevel::OK : NotificationLevel::WARNING, $this->createInvalidCreateResponse($request, $response, $created);
'Profil',
$status ? 'Profil successfully created.' : 'Profile already existing.', return;
$created }
);
$this->createStandardCreateResponse($request, $response, $created);
} }
/** /**
@ -113,7 +113,6 @@ final class ApiController extends Controller
$account->tempPassword = \password_hash(\random_bytes(64), \PASSWORD_BCRYPT); $account->tempPassword = \password_hash(\random_bytes(64), \PASSWORD_BCRYPT);
$this->updateModel($request->header->account, $account, $account, AccountMapper::class, 'profile', $request->getOrigin()); $this->updateModel($request->header->account, $account, $account, AccountMapper::class, 'profile', $request->getOrigin());
$this->fillJsonResponse( $this->fillJsonResponse(
$request, $response, $request, $response,
NotificationLevel::OK, NotificationLevel::OK,
@ -175,8 +174,8 @@ final class ApiController extends Controller
$uploadedFiles = $request->files; $uploadedFiles = $request->files;
if (empty($uploadedFiles)) { if (empty($uploadedFiles)) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Profile', 'Invalid profile image', $uploadedFiles);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
$this->createInvalidUpdateResponse($request, $response, $uploadedFiles);
return; return;
} }
@ -215,7 +214,7 @@ final class ApiController extends Controller
} }
$this->updateModel($request->header->account, $old, $profile, ProfileMapper::class, 'profile', $request->getOrigin()); $this->updateModel($request->header->account, $old, $profile, ProfileMapper::class, 'profile', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Profile', 'Profile successfully updated', $profile); $this->createStandardUpdateResponse($request, $response, $profile);
} }
/** /**
@ -234,8 +233,8 @@ final class ApiController extends Controller
public function apiContactElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiContactElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateContactElementCreate($request))) { if (!empty($val = $this->validateContactElementCreate($request))) {
$response->data['contact_element_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
@ -256,7 +255,7 @@ final class ApiController extends Controller
$this->createModel($request->header->account, $contactElement, ContactElementMapper::class, 'profile-contactElement', $request->getOrigin()); $this->createModel($request->header->account, $contactElement, ContactElementMapper::class, 'profile-contactElement', $request->getOrigin());
$this->createModelRelation($request->header->account, $profile, $contactElement->id, ProfileMapper::class, 'contactElements', '', $request->getOrigin()); $this->createModelRelation($request->header->account, $profile, $contactElement->id, ProfileMapper::class, 'contactElements', '', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Contact Element', 'Contact element successfully created', $contactElement); $this->createStandardCreateResponse($request, $response, $contactElement);
} }
/** /**
@ -319,8 +318,8 @@ final class ApiController extends Controller
public function apiAddressCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiAddressCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateAddressCreate($request))) { if (!empty($val = $this->validateAddressCreate($request))) {
$response->data['address_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
@ -341,7 +340,7 @@ final class ApiController extends Controller
$this->createModel($request->header->account, $address, AddressMapper::class, 'profile-address', $request->getOrigin()); $this->createModel($request->header->account, $address, AddressMapper::class, 'profile-address', $request->getOrigin());
$this->createModelRelation($request->header->account, $profile, $address->id, ProfileMapper::class, 'location', '', $request->getOrigin()); $this->createModelRelation($request->header->account, $profile, $address->id, ProfileMapper::class, 'location', '', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Address', 'Address successfully created', $address); $this->createStandardCreateResponse($request, $response, $address);
} }
/** /**