Auditor diff draft

This commit is contained in:
Dennis Eichhorn 2019-02-14 23:43:06 +01:00
parent 8d8a0a1319
commit 84504823a8

View File

@ -54,7 +54,7 @@ use phpOMS\Validation\Network\Email;
final class ApiController extends Controller final class ApiController extends Controller
{ {
/** /**
* Api method for getting settings * Api method to get settings
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -101,7 +101,7 @@ final class ApiController extends Controller
} }
/** /**
* Api method for getting a group * Api method to get a group
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -134,9 +134,10 @@ final class ApiController extends Controller
*/ */
public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$group = $this->updateGroupFromRequest($request); $old = clone GroupMapper::get((int) $request->getData('id'));
$this->updateModel($request, $group, $group, GroupMapper::class, 'group'); $new = $this->updateGroupFromRequest($request);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully updated', $group); $this->updateModel($request, $old, $new, GroupMapper::class, 'group');
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully updated', $new);
} }
/** /**
@ -438,9 +439,10 @@ final class ApiController extends Controller
*/ */
public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$account = $this->updateAccountFromRequest($request, true); $old = clone AccountMapper::get((int) $request->getData('id'));
$this->updateModel($request, $account, $account, AccountMapper::class, 'account'); $new = $this->updateAccountFromRequest($request);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Account', 'Account successfully updated', $account); $this->updateModel($request, $old, $new, AccountMapper::class, 'account');
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Account', 'Account successfully updated', $new);
} }
/** /**