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

Implement tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-12-16 11:25:35 +01:00
parent 196c606c34
commit 900e5c6242
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -308,7 +308,7 @@ final class ApiController extends Controller
private function updateTaskElementFromRequest(RequestAbstract $request) : TaskElement
{
$element = TaskElementMapper::get((int) ($request->getData('id')));
$element->setForwarded((int) ($request->getData('forward') ?? $element->getForwarded()));
$element->setForwarded((int) ($request->getData('forward') ?? !\is_int($forwarded = $element->getForwarded()) ? $forwarded->getId() : $forwarded));
$element->setDue(new \DateTime((string) ($request->getData('due') ?? $element->getDue()->format('Y-m-d H:i:s'))));
$element->setStatus((int) ($request->getData('status') ?? $element->getStatus()));
$element->setDescription(Markdown::parse((string) ($request->getData('description') ?? $element->getDescriptionRaw())));

32
Models/TaskMapper.php
View File

@ -143,33 +143,31 @@ final class TaskMapper extends DataMapperAbstract
return self::getAllByQuery($query);
}
/**
* Get tasks related to user
*
* @param int $user User
* @param int $limit Result limit
*
* @return array
*
* @since 1.0.0
*/
public static function getRelatedToAccount(int $user, int $limit = 25) : array
{
/*
select oms_task.*
from oms_task
where oms_task.task_id in (
select distinct oms_task_element.task_element_task
from oms_task_element
where oms_task_element.task_element_created_by = 1 or oms_task_element.task_element_forwarded = 1
) or oms_task.task_id in (
select distinct oms_task.task_id
from oms_task
where oms_task.task_created_by = 1
)
*/
$query = self::getQuery();
$whereClause1 = new Builder(self::$db);
$whereClause1->select(TaskElementMapper::getTable() . '.task_element_task')
$whereClause1->prefix(self::$db->getPrefix())
->select(TaskElementMapper::getTable() . '.task_element_task')
->distinct()
->from(TaskElementMapper::getTable())
->where(TaskElementMapper::getTable() . '.task_elment_created_by', '=', $user)
->where(TaskElementMapper::getTable() . '.task_element_created_by', '=', $user)
->orWhere(TaskElementMapper::getTable() . '.task_element_forwarded', '=', $user);
$whereClause2 = new Builder(self::$db);
$whereClause2->select(self::$table . '.' . self::$primaryField)
$whereClause2->prefix(self::$db->getPrefix())
->select(self::$table . '.' . self::$primaryField)
->from(self::$table)
->where(self::$table . '.task_created_by', '=', $user);