Update task links, assignee and time tracking (#775), group links by label (#669)

Merge and modification of pull-request #785

1 files changed, 138 insertions, 11 deletions

diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php
index 62391371..7b696afc 100644
--- a/app/Model/TaskLink.php
+++ b/app/Model/TaskLink.php
@@ -35,13 +35,31 @@ class TaskLink extends Base
     }
 
     /**
+     * Get the opposite task link (use the unique index task_has_links_unique)
+     *
+     * @access public
+     * @param  array     $task_link
+     * @return array
+     */
+    public function getOppositeTaskLink(array $task_link)
+    {
+        $opposite_link_id = $this->link->getOppositeLinkId($task_link['link_id']);
+
+        return $this->db->table(self::TABLE)
+                    ->eq('opposite_task_id', $task_link['task_id'])
+                    ->eq('task_id', $task_link['opposite_task_id'])
+                    ->eq('link_id', $opposite_link_id)
+                    ->findOne();
+    }
+
+    /**
      * Get all links attached to a task
      *
      * @access public
      * @param  integer   $task_id   Task id
      * @return array
      */
-    public function getLinks($task_id)
+    public function getAll($task_id)
     {
         return $this->db
                     ->table(self::TABLE)
@@ -52,48 +70,123 @@ class TaskLink extends Base
                         Task::TABLE.'.title',
                         Task::TABLE.'.is_active',
                         Task::TABLE.'.project_id',
+                        Task::TABLE.'.time_spent AS task_time_spent',
+                        Task::TABLE.'.time_estimated AS task_time_estimated',
+                        Task::TABLE.'.owner_id AS task_assignee_id',
+                        User::TABLE.'.username AS task_assignee_username',
+                        User::TABLE.'.name AS task_assignee_name',
                         Board::TABLE.'.title AS column_title'
                     )
                     ->eq(self::TABLE.'.task_id', $task_id)
                     ->join(Link::TABLE, 'id', 'link_id')
                     ->join(Task::TABLE, 'id', 'opposite_task_id')
                     ->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
+                    ->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
                     ->orderBy(Link::TABLE.'.id ASC, '.Board::TABLE.'.position ASC, '.Task::TABLE.'.is_active DESC, '.Task::TABLE.'.id', Table::SORT_ASC)
                     ->findAll();
     }
 
     /**
+     * Get all links attached to a task grouped by label
+     *
+     * @access public
+     * @param  integer   $task_id   Task id
+     * @return array
+     */
+    public function getAllGroupedByLabel($task_id)
+    {
+        $links = $this->getAll($task_id);
+        $result = array();
+
+        foreach ($links as $link) {
+
+            if (! isset($result[$link['label']])) {
+                $result[$link['label']] = array();
+            }
+
+            $result[$link['label']][] = $link;
+        }
+
+        return $result;
+    }
+
+    /**
      * Create a new link
      *
      * @access public
      * @param  integer   $task_id            Task id
      * @param  integer   $opposite_task_id   Opposite task id
      * @param  integer   $link_id            Link id
-     * @return boolean
+     * @return integer                       Task link id
      */
     public function create($task_id, $opposite_task_id, $link_id)
     {
         $this->db->startTransaction();
 
-        // Create the original link
+        // Get opposite link
+        $opposite_link_id = $this->link->getOppositeLinkId($link_id);
+
+        // Create the original task link
         $this->db->table(self::TABLE)->insert(array(
             'task_id' => $task_id,
             'opposite_task_id' => $opposite_task_id,
             'link_id' => $link_id,
         ));
 
-        $link_id = $this->link->getOppositeLinkId($link_id);
+        $task_link_id = $this->db->getConnection()->getLastId();
 
-        // Create the opposite link
+        // Create the opposite task link
         $this->db->table(self::TABLE)->insert(array(
             'task_id' => $opposite_task_id,
             'opposite_task_id' => $task_id,
+            'link_id' => $opposite_link_id,
+        ));
+
+        $this->db->closeTransaction();
+
+        return $task_link_id;
+    }
+
+    /**
+     * Update a task link
+     *
+     * @access public
+     * @param  integer   $task_link_id          Task link id
+     * @param  integer   $task_id               Task id
+     * @param  integer   $opposite_task_id      Opposite task id
+     * @param  integer   $link_id               Link id
+     * @return boolean
+     */
+    public function update($task_link_id, $task_id, $opposite_task_id, $link_id)
+    {
+        $this->db->startTransaction();
+
+        // Get original task link
+        $task_link = $this->getById($task_link_id);
+
+        // Find opposite task link
+        $opposite_task_link = $this->getOppositeTaskLink($task_link);
+
+        // Get opposite link
+        $opposite_link_id = $this->link->getOppositeLinkId($link_id);
+
+        // Update the original task link
+        $rs1 = $this->db->table(self::TABLE)->eq('id', $task_link_id)->update(array(
+            'task_id' => $task_id,
+            'opposite_task_id' => $opposite_task_id,
             'link_id' => $link_id,
         ));
 
+        // Update the opposite link
+        $rs2 = $this->db->table(self::TABLE)->eq('id', $opposite_task_link['id'])->update(array(
+            'task_id' => $opposite_task_id,
+            'opposite_task_id' => $task_id,
+            'link_id' => $opposite_link_id,
+        ));
+
         $this->db->closeTransaction();
 
-        return true;
+        return $rs1 && $rs2;
     }
 
     /**
@@ -124,6 +217,23 @@ class TaskLink extends Base
     }
 
     /**
+     * Common validation rules
+     *
+     * @access private
+     * @return array
+     */
+    private function commonValidationRules()
+    {
+        return array(
+            new Validators\Required('task_id', t('Field required')),
+            new Validators\Required('opposite_task_id', t('Field required')),
+            new Validators\Required('link_id', t('Field required')),
+            new Validators\NotEquals('opposite_task_id', 'task_id', t('A task cannot be linked to itself')),
+            new Validators\Exists('opposite_task_id', t('This linked task id doesn\'t exists'), $this->db->getConnection(), Task::TABLE, 'id')
+        );
+    }
+
+    /**
      * Validate creation
      *
      * @access public
@@ -132,11 +242,28 @@ class TaskLink extends Base
      */
     public function validateCreation(array $values)
     {
-        $v = new Validator($values, array(
-            new Validators\Required('task_id', t('Field required')),
-            new Validators\Required('link_id', t('Field required')),
-            new Validators\Required('title', t('Field required')),
-        ));
+        $v = new Validator($values, $this->commonValidationRules());
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate modification
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('Field required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
 
         return array(
             $v->execute(),