From 9cf818f765d30d4ca95a53d71c8c6cb2e623f7f7 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 28 Mar 2020 17:16:51 +0100
Subject: [PATCH] fix dbmapper bugs

---
 Models/TaskMapper.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 19b0509..b06a882 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -173,7 +173,7 @@ final class TaskMapper extends DataMapperAbstract
         $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@@ -197,7 +197,7 @@ final class TaskMapper extends DataMapperAbstract
         $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@@ -220,7 +220,7 @@ final class TaskMapper extends DataMapperAbstract
         $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN)
@@ -259,9 +259,10 @@ final class TaskMapper extends DataMapperAbstract
      */
     public static function getTo(int $user) : array
     {
+        $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@@ -281,9 +282,10 @@ final class TaskMapper extends DataMapperAbstract
      */
     public static function getCC(int $user) : array
     {
+        $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@@ -303,13 +305,14 @@ final class TaskMapper extends DataMapperAbstract
      */
     public static function getAny(int $user) : array
     {
+        $depth = 3;
         $query = self::getQuery();
         $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())
                 ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
             ->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');
 
         return self::getAllByQuery($query);
@@ -338,8 +341,6 @@ final class TaskMapper extends DataMapperAbstract
                 ->where(self::$table . '.task_status', '=', TaskStatus::OPEN)
                 ->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user);
 
-            $t = $query->toSql();
-
             $sth = self::$db->con->prepare($query->toSql());
             $sth->execute();