Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-20 11:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 18:44:22 +01:00
parent f2968b0cf6
commit aea0fa4077
3 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Controller/ApiController.php
View File

@ -15,20 +15,20 @@ declare(strict_types=1);
namespace Modules\Tasks\Controller;
use Modules\Admin\Models\NullAccount;
use Modules\Tag\Models\NullTag;
use Modules\Tasks\Models\Task;
use Modules\Tasks\Models\TaskElement;
use Modules\Tasks\Models\TaskElementMapper;
use Modules\Tasks\Models\TaskMapper;
use Modules\Tasks\Models\TaskStatus;
use Modules\Tasks\Models\TaskType;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown;
use Modules\Tag\Models\NullTag;
use phpOMS\Message\Http\HttpResponse;
/**
* Api controller for the tasks module.
@ -116,9 +116,9 @@ final class ApiController extends Controller
*/
private function createTaskFromRequest(RequestAbstract $request) : Task
{
$task = new Task();
$task->title = (string) ($request->getData('title') ?? '');
$task->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$task = new Task();
$task->title = (string) ($request->getData('title') ?? '');
$task->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$task->descriptionRaw = (string) ($request->getData('plain') ?? '');
$task->setCreatedBy(new NullAccount($request->header->account));
$task->setStatus(TaskStatus::OPEN);
@ -149,7 +149,7 @@ final class ApiController extends Controller
$element = new TaskElement();
$element->addTo(new NullAccount((int) ($request->getData('forward') ?? $request->header->account)));
$element->createdBy = $task->getCreatedBy();
$element->due = $task->due;
$element->due = $task->due;
$element->setPriority($task->getPriority());
$element->setStatus(TaskStatus::OPEN);
@ -209,11 +209,11 @@ final class ApiController extends Controller
*/
private function updateTaskFromRequest(RequestAbstract $request) : Task
{
$task = TaskMapper::get((int) ($request->getData('id')));
$task->title = (string) ($request->getData('title') ?? $task->title);
$task->description = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw));
$task = TaskMapper::get((int) ($request->getData('id')));
$task->title = (string) ($request->getData('title') ?? $task->title);
$task->description = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw));
$task->descriptionRaw = (string) ($request->getData('plain') ?? $task->descriptionRaw);
$task->due = new \DateTime((string) ($request->getData('due') ?? $task->due->format('Y-m-d H:i:s')));
$task->due = new \DateTime((string) ($request->getData('due') ?? $task->due->format('Y-m-d H:i:s')));
$task->setStatus((int) ($request->getData('status') ?? $task->getStatus()));
$task->setType((int) ($request->getData('type') ?? $task->getType()));
$task->setPriority((int) ($request->getData('priority') ?? $task->getPriority()));
@ -294,13 +294,13 @@ final class ApiController extends Controller
*/
private function createTaskElementFromRequest(RequestAbstract $request, Task $task) : TaskElement
{
$element = new TaskElement();
$element = new TaskElement();
$element->createdBy = new NullAccount($request->header->account);
$element->due = !empty($request->getData('due')) ? new \DateTime((string) ($request->getData('due'))) : $task->due;
$element->due = !empty($request->getData('due')) ? new \DateTime((string) ($request->getData('due'))) : $task->due;
$element->setPriority((int) ($request->getData('priority') ?? $task->getPriority()));
$element->setStatus((int) ($request->getData('status')));
$element->task = $task->getId();
$element->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$element->task = $task->getId();
$element->description = Markdown::parse((string) ($request->getData('plain') ?? ''));
$element->descriptionRaw = (string) ($request->getData('plain') ?? '');
$tos = $request->getData('to') ?? $request->header->account;
@ -383,10 +383,10 @@ final class ApiController extends Controller
*/
private function updateTaskElementFromRequest(RequestAbstract $request) : TaskElement
{
$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->setStatus((int) ($request->getData('status') ?? $element->getStatus()));
$element->description = Markdown::parse((string) ($request->getData('plain') ?? $element->descriptionRaw));
$element->description = Markdown::parse((string) ($request->getData('plain') ?? $element->descriptionRaw));
$element->descriptionRaw = (string) ($request->getData('plain') ?? $element->descriptionRaw);
$tos = $request->getData('to') ?? $request->header->account;

2
Models/Task.php
View File

@ -376,7 +376,7 @@ class Task implements \JsonSerializable
*/
public function setCreatedBy(Account $account) : void
{
$this->createdBy = $account;
$this->createdBy = $account;
$this->schedule->createdBy = $account;
}

82
tests/Models/TaskMapperTest.php
View File

@ -49,34 +49,34 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->start = new \DateTime('2005-05-05');
$task->title = 'Task Test';
$task->start = new \DateTime('2005-05-05');
$task->title = 'Task Test';
$task->setStatus(TaskStatus::OPEN);
$task->isClosable = false;
$task->setPriority(TaskPriority::HIGH);
$task->description = 'Description';
$task->description = 'Description';
$task->descriptionRaw = 'DescriptionRaw';
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1 = new TaskElement();
$taskElement1->description = 'Desc1';
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($task->getStatus());
$task->addElement($taskElement1);
$media = new Media();
$media->createdBy = new NullAccount(1);
$media = new Media();
$media->createdBy = new NullAccount(1);
$media->description = 'desc';
$media->setPath('some/path');
$media->size = 11;
$media->size = 11;
$media->extension = 'png';
$media->name = 'Task Element Media';
$media->name = 'Task Element Media';
$taskElement1->addMedia($media);
$taskElement2 = new TaskElement();
$taskElement2 = new TaskElement();
$taskElement2->description = 'Desc2';
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($task->getStatus());
$taskElement2->addAccountTo(new NullAccount(1));
$taskElement2->addAccountCC(new NullAccount(1));
@ -84,13 +84,13 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$taskElement2->addGroupCC(new NullGroup(1));
$task->addElement($taskElement2);
$media = new Media();
$media->createdBy = new NullAccount(1);
$media = new Media();
$media->createdBy = new NullAccount(1);
$media->description = 'desc';
$media->setPath('some/path');
$media->size = 11;
$media->size = 11;
$media->extension = 'png';
$media->name = 'Task Media';
$media->name = 'Task Media';
$task->addMedia($media);
$id = TaskMapper::create($task);
@ -160,22 +160,22 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->start = new \DateTime('2005-05-05');
$task->title = $text->generateText(\mt_rand(1, 5));
$task->start = new \DateTime('2005-05-05');
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1 = new TaskElement();
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2 = new TaskElement();
$taskElement2->description = 'Desc2';
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);
@ -201,22 +201,22 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->title = $text->generateText(\mt_rand(1, 5));
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->isClosable = true;
$task->isClosable = true;
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1 = new TaskElement();
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2 = new TaskElement();
$taskElement2->description = $text->generateText(\mt_rand(3, 20));
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);
@ -240,22 +240,22 @@ class TaskMapperTest extends \PHPUnit\Framework\TestCase
$task->setCreatedBy(new NullAccount(1));
$task->getSchedule()->createdBy = new NullAccount(1);
$task->title = $text->generateText(\mt_rand(1, 5));
$task->title = $text->generateText(\mt_rand(1, 5));
$task->setStatus($status);
$task->isClosable = true;
$task->isClosable = true;
$task->description = $text->generateText(\mt_rand(10, 30));
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$task->done = new \DateTime('2000-05-06');
$task->due = new \DateTime('2000-05-05');
$taskElement1 = new TaskElement();
$taskElement1 = new TaskElement();
$taskElement1->description = $text->generateText(\mt_rand(3, 20));
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->createdBy = new NullAccount(1);
$taskElement1->setStatus($status);
$task->addElement($taskElement1);
$taskElement2 = new TaskElement();
$taskElement2 = new TaskElement();
$taskElement2->description = $text->generateText(\mt_rand(3, 20));
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->createdBy = new NullAccount(1);
$taskElement2->setStatus($status);
$task->addElement($taskElement2);