Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-13 19:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull out code

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-02-17 15:14:10 +01:00
parent e7d7e590c9
commit e953e0cebe
1 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Controller.php
View File

@ -511,14 +511,9 @@ class Controller extends ModuleAbstract implements WebInterface
return; return;
} }
$group = GroupMapper::get((int) $request->getData('id')); $group = $this->updateGroupFromRequest($request);
$group->setName((string) ($request->getData('name') ?? $group->getName()));
$group->setStatus((int) ($request->getData('status') ?? $group->getStatus()));
$group->setDescription(Markdown::parse((string) ($request->getData('description') ?? $group->getDescriptionRaw())));
$group->setDescriptionRaw((string) ($request->getData('description') ?? $group->getDescriptionRaw()));
GroupMapper::update($group); GroupMapper::update($group);
$response->set($request->__toString(), [ $response->set($request->__toString(), [
'status' => 'ok', 'status' => 'ok',
'title' => 'Group', 'title' => 'Group',
@ -527,10 +522,30 @@ class Controller extends ModuleAbstract implements WebInterface
]); ]);
} }
/**
* Method to update group from request.
*
* @param RequestAbstract $request Request
*
* @return Group
*
* @since 1.0.0
*/
private function updateGroupFromRequest(RequestAbstract $request) : Group
{
$group = GroupMapper::get((int) $request->getData('id'));
$group->setName((string) ($request->getData('name') ?? $group->getName()));
$group->setStatus((int) ($request->getData('status') ?? $group->getStatus()));
$group->setDescription(Markdown::parse((string) ($request->getData('description') ?? $group->getDescriptionRaw())));
$group->setDescriptionRaw((string) ($request->getData('description') ?? $group->getDescriptionRaw()));
return $group;
}
/** /**
* Validate group create request * Validate group create request
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
* @return array * @return array
* *
@ -592,7 +607,7 @@ class Controller extends ModuleAbstract implements WebInterface
/** /**
* Method to create group from request. * Method to create group from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
* @return Group * @return Group
* *
@ -700,7 +715,7 @@ class Controller extends ModuleAbstract implements WebInterface
/** /**
* Method to validate account creation from request * Method to validate account creation from request
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
* @return array * @return array
* *
@ -762,7 +777,7 @@ class Controller extends ModuleAbstract implements WebInterface
/** /**
* Method to create an account from a request * Method to create an account from a request
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
* @return Account * @return Account
* *
@ -836,6 +851,28 @@ class Controller extends ModuleAbstract implements WebInterface
return; return;
} }
$account = $this->updateAccountFromRequest($request);
$status = AccountMapper::update($account);
$response->set($request->__toString(), [
'status' => 'ok',
'title' => 'Account',
'message' => 'Account successfully updated.',
'response' => $account->jsonSerialize()
]);
}
/**
* Method to update an account from a request
*
* @param RequestAbstract $request Request
*
* @return Account
*
* @since 1.0.0
*/
private function updateAccountFromRequest(RequestAbstract $request) : Account
{
$account = AccountMapper::get((int) ($request->getData('id'))); $account = AccountMapper::get((int) ($request->getData('id')));
$account->setName((string) ($request->getData('login') ?? $account->getName())); $account->setName((string) ($request->getData('login') ?? $account->getName()));
$account->setName1((string) ($request->getData('name1') ?? $account->getName1())); $account->setName1((string) ($request->getData('name1') ?? $account->getName1()));
@ -845,14 +882,7 @@ class Controller extends ModuleAbstract implements WebInterface
$account->setStatus((int) ($request->getData('status') ?? $account->getStatus())); $account->setStatus((int) ($request->getData('status') ?? $account->getStatus()));
$account->setType((int) ($request->getData('type') ?? $account->getType())); $account->setType((int) ($request->getData('type') ?? $account->getType()));
$status = AccountMapper::update($account); return $account;
$response->set($request->__toString(), [
'status' => 'ok',
'title' => 'Account',
'message' => 'Account successfully updated.',
'response' => $account->jsonSerialize()
]);
} }
/** /**