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

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-10-03 01:25:38 +02:00
parent ae403e01cc
commit 6f72c56c6c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -84,6 +84,7 @@ final class ApiController extends Controller
return; return;
} }
/** @var Task $task */
$task = $this->createTaskFromRequest($request); $task = $this->createTaskFromRequest($request);
$this->createModel($request->header->account, $task, TaskMapper::class, 'task', $request->getOrigin()); $this->createModel($request->header->account, $task, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully created.', $task); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully created.', $task);
@ -179,6 +180,7 @@ final class ApiController extends Controller
*/ */
public function apiTaskGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
/** @var Task $task */
$task = TaskMapper::get((int) $request->getData('id')); $task = TaskMapper::get((int) $request->getData('id'));
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully returned.', $task); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully returned.', $task);
} }
@ -198,7 +200,10 @@ final class ApiController extends Controller
*/ */
public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
/** @var Task $old */
$old = clone TaskMapper::get((int) $request->getData('id')); $old = clone TaskMapper::get((int) $request->getData('id'));
/** @var Task $new */
$new = $this->updateTaskFromRequest($request); $new = $this->updateTaskFromRequest($request);
$this->updateModel($request->header->account, $old, $new, TaskMapper::class, 'task', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, TaskMapper::class, 'task', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully updated.', $new); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task', 'Task successfully updated.', $new);
@ -215,6 +220,7 @@ final class ApiController extends Controller
*/ */
private function updateTaskFromRequest(RequestAbstract $request) : Task private function updateTaskFromRequest(RequestAbstract $request) : Task
{ {
/** @var Task $task */
$task = TaskMapper::get((int) ($request->getData('id'))); $task = TaskMapper::get((int) ($request->getData('id')));
$task->title = (string) ($request->getData('title') ?? $task->title); $task->title = (string) ($request->getData('title') ?? $task->title);
$task->description = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw)); $task->description = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw));
@ -366,6 +372,7 @@ final class ApiController extends Controller
*/ */
public function apiTaskElementGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskElementGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
/** @var TaskElement $task */
$task = TaskElementMapper::get((int) $request->getData('id')); $task = TaskElementMapper::get((int) $request->getData('id'));
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task element', 'Task element successfully returned.', $task); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Task element', 'Task element successfully returned.', $task);
} }
@ -385,7 +392,7 @@ final class ApiController extends Controller
*/ */
public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
/** @var TaskElement $new */ /** @var TaskElement $old */
$old = clone TaskElementMapper::get((int) $request->getData('id')); $old = clone TaskElementMapper::get((int) $request->getData('id'));
/** @var TaskElement $new */ /** @var TaskElement $new */
@ -419,6 +426,7 @@ final class ApiController extends Controller
*/ */
private function updateTaskElementFromRequest(RequestAbstract $request) : TaskElement private function updateTaskElementFromRequest(RequestAbstract $request) : TaskElement
{ {
/** @var TaskElement $element */
$element = TaskElementMapper::get((int) ($request->getData('id'))); $element = TaskElementMapper::get((int) ($request->getData('id')));
$element->due = new \DateTime((string) ($request->getData('due') ?? $element->due->format('Y-m-d H:i:s'))); $element->due = new \DateTime((string) ($request->getData('due') ?? $element->due->format('Y-m-d H:i:s')));
$element->setStatus((int) ($request->getData('status') ?? $element->getStatus())); $element->setStatus((int) ($request->getData('status') ?? $element->getStatus()));

1
tests/phpunit_default.xml
View File

@ -20,6 +20,7 @@
<directory>../**/test*</directory> <directory>../**/test*</directory>
<directory>../**/Theme*</directory> <directory>../**/Theme*</directory>
<directory>../**/Admin/Routes*</directory> <directory>../**/Admin/Routes*</directory>
<directory>../**/Admin/Hooks*</directory>
<directory>../**/Admin/Install*</directory> <directory>../**/Admin/Install*</directory>
<directory>../Media/Files*</directory> <directory>../Media/Files*</directory>
</exclude> </exclude>