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

fix dbmapper bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-28 17:16:51 +01:00
parent bc9eca06df
commit 9cf818f765
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Models/TaskMapper.php
View File

@ -173,7 +173,7 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@ -197,7 +197,7 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@ -220,7 +220,7 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@ -259,9 +259,10 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function getTo(int $user) : array public static function getTo(int $user) : array
{ {
$depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@ -281,9 +282,10 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function getCC(int $user) : array public static function getCC(int $user) : array
{ {
$depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@ -303,13 +305,14 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function getAny(int $user) : array public static function getAny(int $user) : array
{ {
$depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::getTable() . '.task_created_by', '=', $user) ->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user)
->orderBy(TaskElementMapper::getTable() . '.' . TaskElementMapper::getCreatedAt(), 'DESC'); ->orderBy(TaskElementMapper::getTable() . '.' . TaskElementMapper::getCreatedAt(), 'DESC');
return self::getAllByQuery($query); return self::getAllByQuery($query);
@ -338,8 +341,6 @@ final class TaskMapper extends DataMapperAbstract
->where(self::$table . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '.task_status', '=', TaskStatus::OPEN)
->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user); ->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user);
$t = $query->toSql();
$sth = self::$db->con->prepare($query->toSql()); $sth = self::$db->con->prepare($query->toSql());
$sth->execute(); $sth->execute();