From d560f84b374fa1b3345dc582eddd6bb7b9138674 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 23 Jun 2016 20:26:19 -0400
Subject: Added models for tags

---
 app/Model/TaskTagModel.php | 125 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 app/Model/TaskTagModel.php

(limited to 'app/Model/TaskTagModel.php')

diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
new file mode 100644
index 00000000..74d82539
--- /dev/null
+++ b/app/Model/TaskTagModel.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\Base;
+
+/**
+ * Class TaskTagModel
+ *
+ * @package Kanboard\Model
+ * @author  Frederic Guillot
+ */
+class TaskTagModel extends Base
+{
+    /**
+     * SQL table name
+     *
+     * @var string
+     */
+    const TABLE = 'task_has_tags';
+
+    /**
+     * Get all tags associated to a task
+     *
+     * @access public
+     * @param  integer $task_id
+     * @return array
+     */
+    public function getAll($task_id)
+    {
+        return $this->db->table(TagModel::TABLE)
+            ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name')
+            ->eq(self::TABLE.'.task_id', $task_id)
+            ->join(self::TABLE, 'tag_id', 'id')
+            ->findAll();
+    }
+
+    /**
+     * Get dictionary of tags
+     *
+     * @access public
+     * @param  integer $task_id
+     * @return array
+     */
+    public function getList($task_id)
+    {
+        $tags = $this->getAll($task_id);
+        return array_column($tags, 'name', 'id');
+    }
+
+    /**
+     * Add or update a list of tags to a task
+     *
+     * @access public
+     * @param integer  $project_id
+     * @param integer  $task_id
+     * @param string[] $tags
+     * @return boolean
+     */
+    public function save($project_id, $task_id, array $tags)
+    {
+        $task_tags = $this->getList($task_id);
+
+        return $this->addTags($project_id, $task_id, $task_tags, $tags) &&
+            $this->removeTags($task_id, $task_tags, $tags);
+    }
+
+    /**
+     * Associate a tag to a task
+     *
+     * @access public
+     * @param  integer  $task_id
+     * @param  integer  $tag_id
+     * @return boolean
+     */
+    public function associate($task_id, $tag_id)
+    {
+        return $this->db->table(self::TABLE)->insert(array(
+            'task_id' => $task_id,
+            'tag_id' => $tag_id,
+        ));
+    }
+
+    /**
+     * Dissociate a tag from a task
+     *
+     * @access public
+     * @param  integer  $task_id
+     * @param  integer  $tag_id
+     * @return boolean
+     */
+    public function dissociate($task_id, $tag_id)
+    {
+        return $this->db->table(self::TABLE)
+            ->eq('task_id', $task_id)
+            ->eq('tag_id', $tag_id)
+            ->remove();
+    }
+
+    private function addTags($project_id, $task_id, $task_tags, $tags)
+    {
+        foreach ($tags as $tag) {
+            $tag_id = $this->tagModel->findOrCreateTag($project_id, $tag);
+
+            if (! isset($task_tags[$tag_id]) && ! $this->associate($task_id, $tag_id)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function removeTags($task_id, $task_tags, $tags)
+    {
+        foreach ($task_tags as $tag_id => $tag) {
+            if (! in_array($tag, $tags)) {
+                if (! $this->dissociate($task_id, $tag_id)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
-- 
cgit v1.2.3


From 700b4e8f0265e4eabd7a7c0eb6a06088d50554fe Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 10:05:45 -0400
Subject: Associate tags to tasks in BoardFormatter

---
 app/Formatter/BoardColumnFormatter.php       |  15 ++++
 app/Formatter/BoardFormatter.php             |   5 +-
 app/Formatter/BoardSwimlaneFormatter.php     |  15 ++++
 app/Formatter/BoardTaskFormatter.php         |  22 +++++-
 app/Model/TaskTagModel.php                   |  61 +++++++++++++---
 app/functions.php                            |  52 +++++++++++++-
 tests/units/Formatter/BoardFormatterTest.php |  81 +++++++++++++++++++++
 tests/units/FunctionTest.php                 | 102 +++++++++++++++++++++++++++
 tests/units/Model/TaskTagModelTest.php       |  50 ++++++++++++-
 9 files changed, 386 insertions(+), 17 deletions(-)

(limited to 'app/Model/TaskTagModel.php')

diff --git a/app/Formatter/BoardColumnFormatter.php b/app/Formatter/BoardColumnFormatter.php
index 3d8f6e67..d49a577a 100644
--- a/app/Formatter/BoardColumnFormatter.php
+++ b/app/Formatter/BoardColumnFormatter.php
@@ -15,6 +15,7 @@ class BoardColumnFormatter extends BaseFormatter implements FormatterInterface
     protected $swimlaneId = 0;
     protected $columns = array();
     protected $tasks = array();
+    protected $tags = array();
 
     /**
      * Set swimlaneId
@@ -55,6 +56,19 @@ class BoardColumnFormatter extends BaseFormatter implements FormatterInterface
         return $this;
     }
 
+    /**
+     * Set tags
+     *
+     * @access public
+     * @param  array $tags
+     * @return $this
+     */
+    public function withTags(array $tags)
+    {
+        $this->tags = $tags;
+        return $this;
+    }
+
     /**
      * Apply formatter
      *
@@ -66,6 +80,7 @@ class BoardColumnFormatter extends BaseFormatter implements FormatterInterface
         foreach ($this->columns as &$column) {
             $column['tasks'] = BoardTaskFormatter::getInstance($this->container)
                 ->withTasks($this->tasks)
+                ->withTags($this->tags)
                 ->withSwimlaneId($this->swimlaneId)
                 ->withColumnId($column['id'])
                 ->format();
diff --git a/app/Formatter/BoardFormatter.php b/app/Formatter/BoardFormatter.php
index 562a97bc..350dde6c 100644
--- a/app/Formatter/BoardFormatter.php
+++ b/app/Formatter/BoardFormatter.php
@@ -44,12 +44,14 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface
     {
         $swimlanes = $this->swimlaneModel->getSwimlanes($this->projectId);
         $columns = $this->columnModel->getAll($this->projectId);
-
         $tasks = $this->query
             ->eq(TaskModel::TABLE.'.project_id', $this->projectId)
             ->asc(TaskModel::TABLE.'.position')
             ->findAll();
 
+        $task_ids = array_column($tasks, 'id');
+        $tags = $this->taskTagModel->getTagsByTasks($task_ids);
+
         if (empty($swimlanes) || empty($columns)) {
             return array();
         }
@@ -58,6 +60,7 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface
             ->withSwimlanes($swimlanes)
             ->withColumns($columns)
             ->withTasks($tasks)
+            ->withTags($tags)
             ->format();
     }
 }
diff --git a/app/Formatter/BoardSwimlaneFormatter.php b/app/Formatter/BoardSwimlaneFormatter.php
index 91b4bfd7..c2abb444 100644
--- a/app/Formatter/BoardSwimlaneFormatter.php
+++ b/app/Formatter/BoardSwimlaneFormatter.php
@@ -15,6 +15,7 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
     protected $swimlanes = array();
     protected $columns = array();
     protected $tasks = array();
+    protected $tags = array();
 
     /**
      * Set swimlanes
@@ -55,6 +56,19 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
         return $this;
     }
 
+    /**
+     * Set tags
+     *
+     * @access public
+     * @param  array $tags
+     * @return $this
+     */
+    public function withTags(array $tags)
+    {
+        $this->tags = $tags;
+        return $this;
+    }
+
     /**
      * Apply formatter
      *
@@ -71,6 +85,7 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
                 ->withSwimlaneId($swimlane['id'])
                 ->withColumns($this->columns)
                 ->withTasks($this->tasks)
+                ->withTags($this->tags)
                 ->format();
 
             $swimlane['nb_swimlanes'] = $nb_swimlanes;
diff --git a/app/Formatter/BoardTaskFormatter.php b/app/Formatter/BoardTaskFormatter.php
index d9500710..3bf171b1 100644
--- a/app/Formatter/BoardTaskFormatter.php
+++ b/app/Formatter/BoardTaskFormatter.php
@@ -13,9 +13,23 @@ use Kanboard\Core\Filter\FormatterInterface;
 class BoardTaskFormatter extends BaseFormatter implements FormatterInterface
 {
     protected $tasks = array();
+    protected $tags = array();
     protected $columnId = 0;
     protected $swimlaneId = 0;
 
+    /**
+     * Set tags
+     *
+     * @access public
+     * @param  array $tags
+     * @return $this
+     */
+    public function withTags(array $tags)
+    {
+        $this->tags = $tags;
+        return $this;
+    }
+
     /**
      * Set tasks
      *
@@ -63,17 +77,19 @@ class BoardTaskFormatter extends BaseFormatter implements FormatterInterface
      */
     public function format()
     {
-        return array_values(array_filter($this->tasks, array($this, 'filterTasks')));
+        $tasks = array_values(array_filter($this->tasks, array($this, 'filterTasks')));
+        array_merge_relation($tasks, $this->tags, 'tags', 'id');
+        return $tasks;
     }
 
     /**
      * Keep only tasks of the given column and swimlane
      *
-     * @access public
+     * @access protected
      * @param  array $task
      * @return bool
      */
-    public function filterTasks(array $task)
+    protected function filterTasks(array $task)
     {
         return $task['column_id'] == $this->columnId && $task['swimlane_id'] == $this->swimlaneId;
     }
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 74d82539..3dd1dd88 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -26,7 +26,7 @@ class TaskTagModel extends Base
      * @param  integer $task_id
      * @return array
      */
-    public function getAll($task_id)
+    public function getTagsByTask($task_id)
     {
         return $this->db->table(TagModel::TABLE)
             ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name')
@@ -35,6 +35,28 @@ class TaskTagModel extends Base
             ->findAll();
     }
 
+    /**
+     * Get all tags associated to a list of tasks
+     *
+     * @access public
+     * @param  integer[] $task_ids
+     * @return array
+     */
+    public function getTagsByTasks($task_ids)
+    {
+        if (empty($task_ids)) {
+            return array();
+        }
+
+        $tags = $this->db->table(TagModel::TABLE)
+            ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name', self::TABLE.'.task_id')
+            ->in(self::TABLE.'.task_id', $task_ids)
+            ->join(self::TABLE, 'tag_id', 'id')
+            ->findAll();
+
+        return array_column_index($tags, 'task_id');
+    }
+
     /**
      * Get dictionary of tags
      *
@@ -44,7 +66,7 @@ class TaskTagModel extends Base
      */
     public function getList($task_id)
     {
-        $tags = $this->getAll($task_id);
+        $tags = $this->getTagsByTask($task_id);
         return array_column($tags, 'name', 'id');
     }
 
@@ -61,8 +83,8 @@ class TaskTagModel extends Base
     {
         $task_tags = $this->getList($task_id);
 
-        return $this->addTags($project_id, $task_id, $task_tags, $tags) &&
-            $this->removeTags($task_id, $task_tags, $tags);
+        return $this->associateTags($project_id, $task_id, $task_tags, $tags) &&
+            $this->dissociateTags($task_id, $task_tags, $tags);
     }
 
     /**
@@ -73,7 +95,7 @@ class TaskTagModel extends Base
      * @param  integer  $tag_id
      * @return boolean
      */
-    public function associate($task_id, $tag_id)
+    public function associateTag($task_id, $tag_id)
     {
         return $this->db->table(self::TABLE)->insert(array(
             'task_id' => $task_id,
@@ -89,7 +111,7 @@ class TaskTagModel extends Base
      * @param  integer  $tag_id
      * @return boolean
      */
-    public function dissociate($task_id, $tag_id)
+    public function dissociateTag($task_id, $tag_id)
     {
         return $this->db->table(self::TABLE)
             ->eq('task_id', $task_id)
@@ -97,12 +119,22 @@ class TaskTagModel extends Base
             ->remove();
     }
 
-    private function addTags($project_id, $task_id, $task_tags, $tags)
+    /**
+     * Associate missing tags
+     *
+     * @access protected
+     * @param  integer $project_id
+     * @param  integer $task_id
+     * @param  array   $task_tags
+     * @param  array   $tags
+     * @return bool
+     */
+    protected function associateTags($project_id, $task_id, $task_tags, $tags)
     {
         foreach ($tags as $tag) {
             $tag_id = $this->tagModel->findOrCreateTag($project_id, $tag);
 
-            if (! isset($task_tags[$tag_id]) && ! $this->associate($task_id, $tag_id)) {
+            if (! isset($task_tags[$tag_id]) && ! $this->associateTag($task_id, $tag_id)) {
                 return false;
             }
         }
@@ -110,11 +142,20 @@ class TaskTagModel extends Base
         return true;
     }
 
-    private function removeTags($task_id, $task_tags, $tags)
+    /**
+     * Dissociate removed tags
+     *
+     * @access protected
+     * @param  integer $task_id
+     * @param  array $task_tags
+     * @param  array $tags
+     * @return bool
+     */
+    protected function dissociateTags($task_id, $task_tags, $tags)
     {
         foreach ($task_tags as $tag_id => $tag) {
             if (! in_array($tag, $tags)) {
-                if (! $this->dissociate($task_id, $tag_id)) {
+                if (! $this->dissociateTag($task_id, $tag_id)) {
                     return false;
                 }
             }
diff --git a/app/functions.php b/app/functions.php
index 99431d9e..eaf33a52 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -2,11 +2,61 @@
 
 use Kanboard\Core\Translator;
 
+/**
+ * Associate another dict to a dict based on a common key
+ *
+ * @param array  $input
+ * @param array  $relations
+ * @param string $relation
+ * @param string $column
+ */
+function array_merge_relation(array &$input, array &$relations, $relation, $column)
+{
+    foreach ($input as &$row) {
+        if (isset($row[$column]) && isset($relations[$row[$column]])) {
+            $row[$relation] = $relations[$row[$column]];
+        } else {
+            $row[$relation] = array();
+        }
+    }
+}
+
+/**
+ * Create indexed array from a list of dict
+ *
+ * $input = [
+ *   ['k1' => 1, 'k2' => 2], ['k1' => 3, 'k2' => 4], ['k1' => 2, 'k2' => 5]
+ * ]
+ *
+ * array_column_index($input, 'k1') will returns:
+ *
+ * [
+ *   1 => [['k1' => 1, 'k2' => 2], ['k1' => 2, 'k2' => 5]],
+ *   3 => [['k1' => 3, 'k2' => 4]],
+ * ]
+ *
+ * @param  array   $input
+ * @param  string  $column
+ * @return array
+ */
+function array_column_index(array &$input, $column)
+{
+    $result = array();
+
+    foreach ($input as &$row) {
+        if (isset($row[$column])) {
+            $result[$row[$column]][] = $row;
+        }
+    }
+
+    return $result;
+}
+
 /**
  * Sum all values from a single column in the input array
  *
  * $input = [
- *   ['column' => 2'], ['column' => 3']
+ *   ['column' => 2], ['column' => 3]
  * ]
  *
  * array_column_sum($input, 'column') returns 5
diff --git a/tests/units/Formatter/BoardFormatterTest.php b/tests/units/Formatter/BoardFormatterTest.php
index 02b0b518..c107eaf5 100644
--- a/tests/units/Formatter/BoardFormatterTest.php
+++ b/tests/units/Formatter/BoardFormatterTest.php
@@ -6,6 +6,7 @@ use Kanboard\Model\ProjectModel;
 use Kanboard\Model\SwimlaneModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskTagModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -308,4 +309,84 @@ class BoardFormatterTest extends Base
         $this->assertSame(0, $board[2]['columns'][2]['nb_tasks']);
         $this->assertSame(0, $board[2]['columns'][3]['nb_tasks']);
     }
+
+    public function testFormatWithTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2', 'column_id' => 3)));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test3')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2')));
+        $this->assertTrue($taskTagModel->save(1, 2, array('My tag 3')));
+
+        $board = BoardFormatter::getInstance($this->container)
+            ->withQuery($taskFinderModel->getExtendedQuery())
+            ->withProjectId(1)
+            ->format();
+
+        $this->assertCount(1, $board);
+
+        $this->assertEquals('Default swimlane', $board[0]['name']);
+        $this->assertCount(4, $board[0]['columns']);
+        $this->assertEquals(1, $board[0]['nb_swimlanes']);
+        $this->assertEquals(4, $board[0]['nb_columns']);
+        $this->assertEquals(3, $board[0]['nb_tasks']);
+        $this->assertEquals(0, $board[0]['score']);
+
+        $this->assertEquals(2, $board[0]['columns'][0]['column_nb_tasks']);
+        $this->assertEquals(0, $board[0]['columns'][1]['column_nb_tasks']);
+        $this->assertEquals(1, $board[0]['columns'][2]['column_nb_tasks']);
+        $this->assertEquals(0, $board[0]['columns'][3]['column_nb_tasks']);
+
+        $this->assertEquals(0, $board[0]['columns'][0]['column_score']);
+        $this->assertEquals(0, $board[0]['columns'][1]['column_score']);
+        $this->assertEquals(0, $board[0]['columns'][2]['column_score']);
+        $this->assertEquals(0, $board[0]['columns'][3]['column_score']);
+
+        $this->assertSame(0, $board[0]['columns'][0]['score']);
+        $this->assertSame(0, $board[0]['columns'][1]['score']);
+        $this->assertSame(0, $board[0]['columns'][2]['score']);
+        $this->assertSame(0, $board[0]['columns'][3]['score']);
+
+        $this->assertSame(2, $board[0]['columns'][0]['nb_tasks']);
+        $this->assertSame(0, $board[0]['columns'][1]['nb_tasks']);
+        $this->assertSame(1, $board[0]['columns'][2]['nb_tasks']);
+        $this->assertSame(0, $board[0]['columns'][3]['nb_tasks']);
+
+        $this->assertEquals('test1', $board[0]['columns'][0]['tasks'][0]['title']);
+        $this->assertEquals('test3', $board[0]['columns'][0]['tasks'][1]['title']);
+        $this->assertEquals('test2', $board[0]['columns'][2]['tasks'][0]['title']);
+
+        $expected = array(
+            array(
+                'id' => 1,
+                'name' => 'My tag 1',
+                'task_id' => 1,
+            ),
+            array(
+                'id' => 2,
+                'name' => 'My tag 2',
+                'task_id' => 1,
+            ),
+        );
+
+        $this->assertEquals($expected, $board[0]['columns'][0]['tasks'][0]['tags']);
+        $this->assertEquals(array(), $board[0]['columns'][0]['tasks'][1]['tags']);
+
+        $expected = array(
+            array(
+                'id' => 3,
+                'name' => 'My tag 3',
+                'task_id' => 2,
+            ),
+        );
+
+        $this->assertEquals($expected, $board[0]['columns'][2]['tasks'][0]['tags']);
+    }
 }
diff --git a/tests/units/FunctionTest.php b/tests/units/FunctionTest.php
index 72895845..1c5f971d 100644
--- a/tests/units/FunctionTest.php
+++ b/tests/units/FunctionTest.php
@@ -18,4 +18,106 @@ class FunctionTest extends Base
 
         $this->assertSame(579.7, array_column_sum($input, 'my_column'));
     }
+
+    public function testArrayColumnIndex()
+    {
+        $input = array(
+            array(
+                'k1' => 11,
+                'k2' => 22,
+            ),
+            array(
+                'k1' => 11,
+                'k2' => 55,
+            ),
+            array(
+                'k1' => 33,
+                'k2' => 44,
+            ),
+            array()
+        );
+
+        $expected = array(
+            11 => array(
+                array(
+                    'k1' => 11,
+                    'k2' => 22,
+                ),
+                array(
+                    'k1' => 11,
+                    'k2' => 55,
+                )
+            ),
+            33 => array(
+                array(
+                    'k1' => 33,
+                    'k2' => 44,
+                )
+            )
+        );
+
+        $this->assertSame($expected, array_column_index($input, 'k1'));
+    }
+
+    public function testArrayMergeRelation()
+    {
+        $relations = array(
+            88 => array(
+                'id' => 123,
+                'value' => 'test1',
+            ),
+            99 => array(
+                'id' => 456,
+                'value' => 'test2',
+            ),
+            55 => array()
+        );
+
+        $input = array(
+            array(),
+            array(
+                'task_id' => 88,
+                'title' => 'task1'
+            ),
+            array(
+                'task_id' => 99,
+                'title' => 'task2'
+            ),
+            array(
+                'task_id' => 11,
+                'title' => 'task3'
+            )
+        );
+
+        $expected = array(
+            array(
+                'my_relation' => array(),
+            ),
+            array(
+                'task_id' => 88,
+                'title' => 'task1',
+                'my_relation' => array(
+                    'id' => 123,
+                    'value' => 'test1',
+                ),
+            ),
+            array(
+                'task_id' => 99,
+                'title' => 'task2',
+                'my_relation' => array(
+                    'id' => 456,
+                    'value' => 'test2',
+                ),
+            ),
+            array(
+                'task_id' => 11,
+                'title' => 'task3',
+                'my_relation' => array(),
+            )
+        );
+
+        array_merge_relation($input, $relations, 'my_relation', 'task_id');
+
+        $this->assertSame($expected, $input);
+    }
 }
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index c08b571f..819f55b8 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -24,7 +24,7 @@ class TaskTagModelTest extends Base
 
         $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
 
-        $tags = $taskTagModel->getAll(1);
+        $tags = $taskTagModel->getTagsByTask(1);
         $this->assertCount(3, $tags);
 
         $this->assertEquals(1, $tags[0]['id']);
@@ -38,7 +38,7 @@ class TaskTagModelTest extends Base
 
         $this->assertTrue($taskTagModel->save(1, 1, array('My tag 3', 'My tag 1', 'My tag 4')));
 
-        $tags = $taskTagModel->getAll(1);
+        $tags = $taskTagModel->getTagsByTask(1);
         $this->assertCount(3, $tags);
 
         $this->assertEquals(1, $tags[0]['id']);
@@ -64,4 +64,50 @@ class TaskTagModelTest extends Base
         $this->assertEquals('My tag 4', $tags[3]['name']);
         $this->assertEquals(1, $tags[3]['project_id']);
     }
+
+    public function testGetTagsForTasks()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test3')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 2, array('My tag 3')));
+
+        $tags = $taskTagModel->getTagsByTasks(array(1, 2, 3));
+
+        $expected = array(
+            1 => array(
+                array(
+                    'id' => 1,
+                    'name' => 'My tag 1',
+                    'task_id' => 1
+                ),
+                array(
+                    'id' => 2,
+                    'name' => 'My tag 2',
+                    'task_id' => 1
+                ),
+                array(
+                    'id' => 3,
+                    'name' => 'My tag 3',
+                    'task_id' => 1
+                ),
+            ),
+            2 => array(
+                array(
+                    'id' => 3,
+                    'name' => 'My tag 3',
+                    'task_id' => 2,
+                )
+            )
+        );
+
+        $this->assertEquals($expected, $tags);
+    }
 }
-- 
cgit v1.2.3


From b2e92480c29acb15586bc8ea305c8416927a667c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 11:40:58 -0400
Subject: Added filter class for tags

---
 app/Filter/TaskTagFilter.php             |  74 +++++++++++++++++++
 app/Model/TaskTagModel.php               |  20 ++---
 app/ServiceProvider/FilterProvider.php   |   4 +
 doc/search.markdown                      |   6 ++
 tests/units/Base.php                     |   4 +-
 tests/units/Core/Filter/LexerTest.php    |  12 +++
 tests/units/Filter/TaskTagFilterTest.php | 121 +++++++++++++++++++++++++++++++
 tests/units/Model/TaskTagModelTest.php   |  14 ++++
 8 files changed, 243 insertions(+), 12 deletions(-)
 create mode 100644 app/Filter/TaskTagFilter.php
 create mode 100644 tests/units/Filter/TaskTagFilterTest.php

(limited to 'app/Model/TaskTagModel.php')

diff --git a/app/Filter/TaskTagFilter.php b/app/Filter/TaskTagFilter.php
new file mode 100644
index 00000000..01b6f625
--- /dev/null
+++ b/app/Filter/TaskTagFilter.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Kanboard\Filter;
+
+use Kanboard\Core\Filter\FilterInterface;
+use Kanboard\Model\TagModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskTagModel;
+use PicoDb\Database;
+
+/**
+ * Class TaskTagFilter
+ *
+ * @package Kanboard\Filter
+ * @author  Frederic Guillot
+ */
+class TaskTagFilter extends BaseFilter implements FilterInterface
+{
+    /**
+     * Database object
+     *
+     * @access private
+     * @var Database
+     */
+    private $db;
+
+    /**
+     * Get search attribute
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getAttributes()
+    {
+        return array('tag');
+    }
+
+    /**
+     * Set database object
+     *
+     * @access public
+     * @param  Database $db
+     * @return $this
+     */
+    public function setDatabase(Database $db)
+    {
+        $this->db = $db;
+        return $this;
+    }
+
+    /**
+     * Apply filter
+     *
+     * @access public
+     * @return FilterInterface
+     */
+    public function apply()
+    {
+        $task_ids = $this->db
+            ->table(TagModel::TABLE)
+            ->ilike(TagModel::TABLE.'.name', $this->value)
+            ->asc(TagModel::TABLE.'.project_id')
+            ->join(TaskTagModel::TABLE, 'tag_id', 'id')
+            ->findAllByColumn(TaskTagModel::TABLE.'.task_id');
+
+        if (empty($task_ids)) {
+            $task_ids = array(-1);
+        }
+
+        $this->query->in(TaskModel::TABLE.'.id', $task_ids);
+
+        return $this;
+    }
+}
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 3dd1dd88..91dfd224 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -74,9 +74,9 @@ class TaskTagModel extends Base
      * Add or update a list of tags to a task
      *
      * @access public
-     * @param integer  $project_id
-     * @param integer  $task_id
-     * @param string[] $tags
+     * @param  integer  $project_id
+     * @param  integer  $task_id
+     * @param  string[] $tags
      * @return boolean
      */
     public function save($project_id, $task_id, array $tags)
@@ -123,10 +123,10 @@ class TaskTagModel extends Base
      * Associate missing tags
      *
      * @access protected
-     * @param  integer $project_id
-     * @param  integer $task_id
-     * @param  array   $task_tags
-     * @param  array   $tags
+     * @param  integer  $project_id
+     * @param  integer  $task_id
+     * @param  array    $task_tags
+     * @param  string[] $tags
      * @return bool
      */
     protected function associateTags($project_id, $task_id, $task_tags, $tags)
@@ -146,9 +146,9 @@ class TaskTagModel extends Base
      * Dissociate removed tags
      *
      * @access protected
-     * @param  integer $task_id
-     * @param  array $task_tags
-     * @param  array $tags
+     * @param  integer  $task_id
+     * @param  array    $task_tags
+     * @param  string[] $tags
      * @return bool
      */
     protected function dissociateTags($task_id, $task_tags, $tags)
diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
index cdef9ed8..20281a09 100644
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -26,6 +26,7 @@ use Kanboard\Filter\TaskReferenceFilter;
 use Kanboard\Filter\TaskStatusFilter;
 use Kanboard\Filter\TaskSubtaskAssigneeFilter;
 use Kanboard\Filter\TaskSwimlaneFilter;
+use Kanboard\Filter\TaskTagFilter;
 use Kanboard\Filter\TaskTitleFilter;
 use Kanboard\Model\ProjectModel;
 use Kanboard\Model\ProjectGroupRoleModel;
@@ -163,6 +164,9 @@ class FilterProvider implements ServiceProviderInterface
                     ->setDatabase($c['db'])
                 )
                 ->withFilter(new TaskSwimlaneFilter())
+                ->withFilter(TaskTagFilter::getInstance()
+                    ->setDatabase($c['db'])
+                )
                 ->withFilter(new TaskTitleFilter(), true)
             ;
 
diff --git a/doc/search.markdown b/doc/search.markdown
index 37bb8625..ab8e0b5a 100644
--- a/doc/search.markdown
+++ b/doc/search.markdown
@@ -152,6 +152,12 @@ Attribute: **comment**
 
 - Find comments that contains this title: `comment:"My comment message"`
 
+### Search by tags
+
+Attribute: **tag**
+
+- Example: `tag:"My tag"`
+
 Activity stream search
 ----------------------
 
diff --git a/tests/units/Base.php b/tests/units/Base.php
index f7bee241..9dbfb280 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -48,8 +48,8 @@ abstract class Base extends PHPUnit_Framework_TestCase
             new Stopwatch
         );
 
-        $this->container['db']->logQueries = true;
-        $this->container['logger'] = new Logger;
+        $this->container['db']->getStatementHandler()->withLogging();
+        $this->container['logger'] = new Logger();
 
         $this->container['httpClient'] = $this
             ->getMockBuilder('\Kanboard\Core\Http\Client')
diff --git a/tests/units/Core/Filter/LexerTest.php b/tests/units/Core/Filter/LexerTest.php
index c72231c4..b777531d 100644
--- a/tests/units/Core/Filter/LexerTest.php
+++ b/tests/units/Core/Filter/LexerTest.php
@@ -202,4 +202,16 @@ class LexerTest extends Base
 
         $this->assertSame($expected, $lexer->tokenize('६Δↈ五一'));
     }
+
+    public function testTokenizeWithMultipleValues()
+    {
+        $lexer = new Lexer();
+        $lexer->addToken("/^(tag:)/", 'T_TAG');
+
+        $expected = array(
+            'T_TAG' => array('tag 1', 'tag2'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('tag:"tag 1" tag:tag2'));
+    }
 }
diff --git a/tests/units/Filter/TaskTagFilterTest.php b/tests/units/Filter/TaskTagFilterTest.php
new file mode 100644
index 00000000..a36d3475
--- /dev/null
+++ b/tests/units/Filter/TaskTagFilterTest.php
@@ -0,0 +1,121 @@
+<?php
+
+use Kanboard\Filter\TaskTagFilter;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskTagModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskTagFilterTest extends Base
+{
+    public function testWithMultipleMatches()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $query = $taskFinderModel->getExtendedQuery();
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test3')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 2, array('My tag 3')));
+
+        $filter = new TaskTagFilter();
+        $filter->setDatabase($this->container['db']);
+        $filter->withQuery($query);
+        $filter->withValue('my tag 3');
+        $filter->apply();
+
+        $tasks = $query->findAll();
+        $this->assertCount(2, $tasks);
+        $this->assertEquals('test1', $tasks[0]['title']);
+        $this->assertEquals('test2', $tasks[1]['title']);
+    }
+
+    public function testWithSingleMatch()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $query = $taskFinderModel->getExtendedQuery();
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test3')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 2, array('My tag 3')));
+
+        $filter = new TaskTagFilter();
+        $filter->setDatabase($this->container['db']);
+        $filter->withQuery($query);
+        $filter->withValue('my tag 2');
+        $filter->apply();
+
+        $tasks = $query->findAll();
+        $this->assertCount(1, $tasks);
+        $this->assertEquals('test1', $tasks[0]['title']);
+    }
+
+    public function testWithNoMatch()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $query = $taskFinderModel->getExtendedQuery();
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test3')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 2, array('My tag 3')));
+
+        $filter = new TaskTagFilter();
+        $filter->setDatabase($this->container['db']);
+        $filter->withQuery($query);
+        $filter->withValue('my tag 42');
+        $filter->apply();
+
+        $tasks = $query->findAll();
+        $this->assertCount(0, $tasks);
+    }
+
+    public function testWithSameTagInMultipleProjects()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $query = $taskFinderModel->getExtendedQuery();
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 2, 'title' => 'test2')));
+
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag')));
+        $this->assertTrue($taskTagModel->save(2, 2, array('My tag')));
+
+        $filter = new TaskTagFilter();
+        $filter->setDatabase($this->container['db']);
+        $filter->withQuery($query);
+        $filter->withValue('my tag');
+        $filter->apply();
+
+        $tasks = $query->findAll();
+        $this->assertCount(2, $tasks);
+        $this->assertEquals('test1', $tasks[0]['title']);
+        $this->assertEquals('test2', $tasks[1]['title']);
+    }
+}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 819f55b8..73bbeac1 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -110,4 +110,18 @@ class TaskTagModelTest extends Base
 
         $this->assertEquals($expected, $tags);
     }
+
+    public function testGetTagsForTasksWithEmptyList()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+
+        $tags = $taskTagModel->getTagsByTasks(array());
+        $this->assertEquals(array(), $tags);
+    }
 }
-- 
cgit v1.2.3


From 853189a43fff8b8b64f18029a35ac910b14932e8 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 2 Jul 2016 11:50:32 -0400
Subject: Do not create empty tags and remove tags only when necessary

---
 app/Helper/TaskHelper.php                       |   1 +
 app/Model/TaskModificationModel.php             |   2 -
 app/Model/TaskTagModel.php                      |   1 +
 tests/units/Model/TaskModificationModelTest.php | 322 ++++++++++++++++++++++++
 tests/units/Model/TaskModificationTest.php      | 313 -----------------------
 tests/units/Model/TaskTagModelTest.php          |   2 +-
 6 files changed, 325 insertions(+), 316 deletions(-)
 create mode 100644 tests/units/Model/TaskModificationModelTest.php
 delete mode 100644 tests/units/Model/TaskModificationTest.php

(limited to 'app/Model/TaskTagModel.php')

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index ce39eb2a..84b41e42 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -70,6 +70,7 @@ class TaskHelper extends Base
         $options = $this->tagModel->getAssignableList($project['id']);
 
         $html = $this->helper->form->label(t('Tags'), 'tags[]');
+        $html .= '<input type="hidden" name="tags[]" value="">';
         $html .= '<select name="tags[]" id="form-tags" class="tag-autocomplete" multiple>';
 
         foreach ($options as $tag) {
diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php
index 1b176a41..be5f53c8 100644
--- a/app/Model/TaskModificationModel.php
+++ b/app/Model/TaskModificationModel.php
@@ -108,8 +108,6 @@ class TaskModificationModel extends Base
         if (isset($values['tags'])) {
             $this->taskTagModel->save($original_task['project_id'], $values['id'], $values['tags']);
             unset($values['tags']);
-        } else {
-            $this->taskTagModel->save($original_task['project_id'], $values['id'], array());
         }
     }
 }
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 91dfd224..2a08e867 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -82,6 +82,7 @@ class TaskTagModel extends Base
     public function save($project_id, $task_id, array $tags)
     {
         $task_tags = $this->getList($task_id);
+        $tags = array_filter($tags);
 
         return $this->associateTags($project_id, $task_id, $task_tags, $tags) &&
             $this->dissociateTags($task_id, $task_tags, $tags);
diff --git a/tests/units/Model/TaskModificationModelTest.php b/tests/units/Model/TaskModificationModelTest.php
new file mode 100644
index 00000000..c81f968b
--- /dev/null
+++ b/tests/units/Model/TaskModificationModelTest.php
@@ -0,0 +1,322 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskModificationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskTagModel;
+
+class TaskModificationModelTest extends Base
+{
+    public function onCreateUpdate($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('Task #1', $event_data['title']);
+    }
+
+    public function onUpdate($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('Task #1', $event_data['title']);
+    }
+
+    public function onAssigneeChange($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals(1, $event_data['owner_id']);
+    }
+
+    public function testThatNoEventAreFiredWhenNoChanges()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'test')));
+
+        $this->assertEmpty($this->container['dispatcher']->getCalledListeners());
+    }
+
+    public function testChangeTitle()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'Task #1')));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationModelTest::onCreateUpdate', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationModelTest::onUpdate', $called);
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('Task #1', $task['title']);
+    }
+
+    public function testChangeAssignee()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['owner_id']);
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, array($this, 'onAssigneeChange'));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.TaskModificationModelTest::onAssigneeChange', $called);
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['owner_id']);
+    }
+
+    public function testChangeDescription()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('', $task['description']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'description' => 'test')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('test', $task['description']);
+    }
+
+    public function testChangeCategory()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['category_id']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'category_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(1, $task['category_id']);
+    }
+
+    public function testChangeColor()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('yellow', $task['color_id']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'color_id' => 'blue')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('blue', $task['color_id']);
+    }
+
+    public function testChangeScore()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['score']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'score' => 13)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13, $task['score']);
+    }
+
+    public function testChangeDueDate()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['date_due']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => '2014-11-24')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24', date('Y-m-d', $task['date_due']));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => time())));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(date('Y-m-d'), date('Y-m-d', $task['date_due']));
+    }
+
+    public function testChangeStartedDate()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['date_started']);
+
+        // Set only a date
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '2014-11-24')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 '.date('H:i'), date('Y-m-d H:i', $task['date_started']));
+
+        // Set a datetime
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '2014-11-24 16:25')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 16:25', date('Y-m-d H:i', $task['date_started']));
+
+        // Set a datetime
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => '11/24/2014 18:25')));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('2014-11-24 18:25', date('Y-m-d H:i', $task['date_started']));
+
+        // Set a timestamp
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_started' => time())));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(time(), $task['date_started'], '', 1);
+    }
+
+    public function testChangeTimeEstimated()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['time_estimated']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'time_estimated' => 13.3)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13.3, $task['time_estimated']);
+    }
+
+    public function testChangeTimeSpent()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(0, $task['time_spent']);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'time_spent' => 13.3)));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals(13.3, $task['time_spent']);
+    }
+
+    public function testChangeTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array('tag2'))));
+
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(2 => 'tag2'), $tags);
+    }
+
+    public function testRemoveAllTags()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test1', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test2', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1)));
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(1 => 'tag1', 2 => 'tag2'), $tags);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array())));
+        $tags = $taskTagModel->getList(1);
+        $this->assertEquals(array(), $tags);
+
+        $this->assertTrue($taskModificationModel->update(array('id' => 2, 'tags' => array(''))));
+        $tags = $taskTagModel->getList(2);
+        $this->assertEquals(array(), $tags);
+    }
+}
diff --git a/tests/units/Model/TaskModificationTest.php b/tests/units/Model/TaskModificationTest.php
deleted file mode 100644
index 5cbc44e6..00000000
--- a/tests/units/Model/TaskModificationTest.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\TaskModificationModel;
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\TaskTagModel;
-
-class TaskModificationTest extends Base
-{
-    public function onCreateUpdate($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
-    }
-
-    public function onUpdate($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
-    }
-
-    public function onAssigneeChange($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['owner_id']);
-    }
-
-    public function testThatNoEventAreFiredWhenNoChanges()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'title' => 'test')));
-
-        $this->assertEmpty($this->container['dispatcher']->getCalledListeners());
-    }
-
-    public function testChangeTitle()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'title' => 'Task #1')));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationTest::onCreateUpdate', $called);
-        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationTest::onUpdate', $called);
-
-        $task = $tf->getById(1);
-        $this->assertEquals('Task #1', $task['title']);
-    }
-
-    public function testChangeAssignee()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['owner_id']);
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, array($this, 'onAssigneeChange'));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'owner_id' => 1)));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.TaskModificationTest::onAssigneeChange', $called);
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['owner_id']);
-    }
-
-    public function testChangeDescription()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('', $task['description']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'description' => 'test')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('test', $task['description']);
-    }
-
-    public function testChangeCategory()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['category_id']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'category_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(1, $task['category_id']);
-    }
-
-    public function testChangeColor()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('yellow', $task['color_id']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'color_id' => 'blue')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('blue', $task['color_id']);
-    }
-
-    public function testChangeScore()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['score']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'score' => 13)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13, $task['score']);
-    }
-
-    public function testChangeDueDate()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['date_due']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'date_due' => '2014-11-24')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24', date('Y-m-d', $task['date_due']));
-
-        $this->assertTrue($tm->update(array('id' => 1, 'date_due' => time())));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', $task['date_due']));
-    }
-
-    public function testChangeStartedDate()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['date_started']);
-
-        // Set only a date
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '2014-11-24')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 '.date('H:i'), date('Y-m-d H:i', $task['date_started']));
-
-        // Set a datetime
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '2014-11-24 16:25')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 16:25', date('Y-m-d H:i', $task['date_started']));
-
-        // Set a datetime
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => '11/24/2014 18:25')));
-
-        $task = $tf->getById(1);
-        $this->assertEquals('2014-11-24 18:25', date('Y-m-d H:i', $task['date_started']));
-
-        // Set a timestamp
-        $this->assertTrue($tm->update(array('id' => 1, 'date_started' => time())));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(time(), $task['date_started'], '', 1);
-    }
-
-    public function testChangeTimeEstimated()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['time_estimated']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'time_estimated' => 13.3)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13.3, $task['time_estimated']);
-    }
-
-    public function testChangeTimeSpent()
-    {
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tm = new TaskModificationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(0, $task['time_spent']);
-
-        $this->assertTrue($tm->update(array('id' => 1, 'time_spent' => 13.3)));
-
-        $task = $tf->getById(1);
-        $this->assertEquals(13.3, $task['time_spent']);
-    }
-
-    public function testChangeTags()
-    {
-        $projectModel = new ProjectModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $taskModificationModel = new TaskModificationModel($this->container);
-        $taskTagModel = new TaskTagModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
-        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'tags' => array('tag2'))));
-
-        $tags = $taskTagModel->getList(1);
-        $this->assertEquals(array(2 => 'tag2'), $tags);
-    }
-
-    public function testRemoveAllTags()
-    {
-        $projectModel = new ProjectModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $taskModificationModel = new TaskModificationModel($this->container);
-        $taskTagModel = new TaskTagModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('tag1', 'tag2'))));
-        $this->assertTrue($taskModificationModel->update(array('id' => 1)));
-
-        $tags = $taskTagModel->getList(1);
-        $this->assertEquals(array(), $tags);
-    }
-}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 73bbeac1..88055d5f 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -22,7 +22,7 @@ class TaskTagModelTest extends Base
         $this->assertEquals(1, $tagModel->create(0, 'My tag 1'));
         $this->assertEquals(2, $tagModel->create(0, 'My tag 2'));
 
-        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', 'My tag 3')));
+        $this->assertTrue($taskTagModel->save(1, 1, array('My tag 1', 'My tag 2', '', 'My tag 3')));
 
         $tags = $taskTagModel->getTagsByTask(1);
         $this->assertCount(3, $tags);
-- 
cgit v1.2.3


From 3fcc0cb9183f9ff32ce7a3c615258bcf53c385ed Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 2 Jul 2016 14:44:26 -0400
Subject: Handle tags and tasks move/duplication to another project

---
 app/Action/TaskDuplicateAnotherProject.php         |   2 +-
 app/Action/TaskMoveAnotherProject.php              |   2 +-
 app/Api/Procedure/TaskProcedure.php                |   4 +-
 app/Controller/TaskDuplicationController.php       |   4 +-
 app/Core/Base.php                                  |   4 +
 app/Model/TagDuplicationModel.php                  |  67 +++
 app/Model/TaskDuplicationModel.php                 | 156 +----
 app/Model/TaskModel.php                            |   2 +-
 app/Model/TaskProjectDuplicationModel.php          |  60 ++
 app/Model/TaskProjectMoveModel.php                 |  67 +++
 app/Model/TaskRecurrenceModel.php                  |  87 +++
 app/Model/TaskTagModel.php                         |  17 +
 app/ServiceProvider/ClassProvider.php              |   4 +
 app/Subscriber/RecurringTaskSubscriber.php         |   6 +-
 tests/units/Model/TaskDuplicationTest.php          | 667 ++-------------------
 .../Model/TaskProjectDuplicationModelTest.php      | 369 ++++++++++++
 tests/units/Model/TaskProjectMoveModelTest.php     | 269 +++++++++
 tests/units/Model/TaskRecurrenceModelTest.php      |  90 +++
 tests/units/Model/TaskTagModelTest.php             |  21 +
 19 files changed, 1121 insertions(+), 777 deletions(-)
 create mode 100644 app/Model/TagDuplicationModel.php
 create mode 100644 app/Model/TaskProjectDuplicationModel.php
 create mode 100644 app/Model/TaskProjectMoveModel.php
 create mode 100644 app/Model/TaskRecurrenceModel.php
 create mode 100644 tests/units/Model/TaskProjectDuplicationModelTest.php
 create mode 100644 tests/units/Model/TaskProjectMoveModelTest.php
 create mode 100644 tests/units/Model/TaskRecurrenceModelTest.php

(limited to 'app/Model/TaskTagModel.php')

diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index 1d4a2f13..d70d2ee8 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -76,7 +76,7 @@ class TaskDuplicateAnotherProject extends Base
     public function doAction(array $data)
     {
         $destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
-        return (bool) $this->taskDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
+        return (bool) $this->taskProjectDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
     }
 
     /**
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index 73ad4b69..66635a63 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskDuplicationModel->moveToProject($data['task_id'], $this->getParam('project_id'));
+        return $this->taskProjectMoveModel->moveToProject($data['task_id'], $this->getParam('project_id'));
     }
 
     /**
diff --git a/app/Api/Procedure/TaskProcedure.php b/app/Api/Procedure/TaskProcedure.php
index 2d29a4ef..8661deef 100644
--- a/app/Api/Procedure/TaskProcedure.php
+++ b/app/Api/Procedure/TaskProcedure.php
@@ -77,13 +77,13 @@ class TaskProcedure extends BaseProcedure
     public function moveTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
     {
         ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'moveTaskToProject', $project_id);
-        return $this->taskDuplicationModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        return $this->taskProjectMoveModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
     }
 
     public function duplicateTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
     {
         ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'duplicateTaskToProject', $project_id);
-        return $this->taskDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        return $this->taskProjectDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
     }
 
     public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0,
diff --git a/app/Controller/TaskDuplicationController.php b/app/Controller/TaskDuplicationController.php
index 6a475374..915bf8f8 100644
--- a/app/Controller/TaskDuplicationController.php
+++ b/app/Controller/TaskDuplicationController.php
@@ -50,7 +50,7 @@ class TaskDuplicationController extends BaseController
             $values = $this->request->getValues();
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
-            if ($valid && $this->taskDuplicationModel->moveToProject($task['id'],
+            if ($valid && $this->taskProjectMoveModel->moveToProject($task['id'],
                                                                 $values['project_id'],
                                                                 $values['swimlane_id'],
                                                                 $values['column_id'],
@@ -80,7 +80,7 @@ class TaskDuplicationController extends BaseController
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
             if ($valid) {
-                $task_id = $this->taskDuplicationModel->duplicateToProject(
+                $task_id = $this->taskProjectDuplicationModel->duplicateToProject(
                     $task['id'], $values['project_id'], $values['swimlane_id'],
                     $values['column_id'], $values['category_id'], $values['owner_id']
                 );
diff --git a/app/Core/Base.php b/app/Core/Base.php
index eacca65d..a8274152 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -90,11 +90,15 @@ use Pimple\Container;
  * @property \Kanboard\Model\SubtaskModel                        $subtaskModel
  * @property \Kanboard\Model\SubtaskTimeTrackingModel            $subtaskTimeTrackingModel
  * @property \Kanboard\Model\SwimlaneModel                       $swimlaneModel
+ * @property \Kanboard\Model\TagDuplicationModel                 $tagDuplicationModel
  * @property \Kanboard\Model\TagModel                            $tagModel
  * @property \Kanboard\Model\TaskModel                           $taskModel
  * @property \Kanboard\Model\TaskAnalyticModel                   $taskAnalyticModel
  * @property \Kanboard\Model\TaskCreationModel                   $taskCreationModel
  * @property \Kanboard\Model\TaskDuplicationModel                $taskDuplicationModel
+ * @property \Kanboard\Model\TaskProjectDuplicationModel         $taskProjectDuplicationModel
+ * @property \Kanboard\Model\TaskProjectMoveModel                $taskProjectMoveModel
+ * @property \Kanboard\Model\TaskRecurrenceModel                 $taskRecurrenceModel
  * @property \Kanboard\Model\TaskExternalLinkModel               $taskExternalLinkModel
  * @property \Kanboard\Model\TaskFinderModel                     $taskFinderModel
  * @property \Kanboard\Model\TaskLinkModel                       $taskLinkModel
diff --git a/app/Model/TagDuplicationModel.php b/app/Model/TagDuplicationModel.php
new file mode 100644
index 00000000..1876391d
--- /dev/null
+++ b/app/Model/TagDuplicationModel.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\Base;
+
+/**
+ * Tag Duplication
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TagDuplicationModel extends Base
+{
+    /**
+     * Link tags to the new tasks
+     *
+     * @access public
+     * @param  integer $src_task_id
+     * @param  integer $dst_task_id
+     * @param  integer $dst_project_id
+     */
+    public function duplicateTaskTagsToAnotherProject($src_task_id, $dst_task_id, $dst_project_id)
+    {
+        $tags = $this->taskTagModel->getTagsByTask($src_task_id);
+
+        foreach ($tags as $tag) {
+            $tag_id = $this->tagModel->getIdByName($dst_project_id, $tag['name']);
+
+            if ($tag_id) {
+                $this->taskTagModel->associateTag($dst_task_id, $tag_id);
+            }
+        }
+    }
+
+    /**
+     * Duplicate tags to the new task
+     *
+     * @access public
+     * @param  integer $src_task_id
+     * @param  integer $dst_task_id
+     */
+    public function duplicateTaskTags($src_task_id, $dst_task_id)
+    {
+        $tags = $this->taskTagModel->getTagsByTask($src_task_id);
+
+        foreach ($tags as $tag) {
+            $this->taskTagModel->associateTag($dst_task_id, $tag['id']);
+        }
+    }
+
+    /**
+     * Remove tags that are not available in destination project
+     *
+     * @access public
+     * @param  integer $task_id
+     * @param  integer $dst_project_id
+     */
+    public function syncTaskTagsToAnotherProject($task_id, $dst_project_id)
+    {
+        $tag_ids = $this->taskTagModel->getTagIdsByTaskNotAvailableInProject($task_id, $dst_project_id);
+
+        foreach ($tag_ids as $tag_id) {
+            $this->taskTagModel->dissociateTag($task_id, $tag_id);
+        }
+    }
+}
diff --git a/app/Model/TaskDuplicationModel.php b/app/Model/TaskDuplicationModel.php
index 9a4613e2..0dce891f 100644
--- a/app/Model/TaskDuplicationModel.php
+++ b/app/Model/TaskDuplicationModel.php
@@ -2,10 +2,7 @@
 
 namespace Kanboard\Model;
 
-use DateTime;
-use DateInterval;
 use Kanboard\Core\Base;
-use Kanboard\Event\TaskEvent;
 
 /**
  * Task Duplication
@@ -18,10 +15,10 @@ class TaskDuplicationModel extends Base
     /**
      * Fields to copy when duplicating a task
      *
-     * @access private
-     * @var array
+     * @access protected
+     * @var string[]
      */
-    private $fields_to_duplicate = array(
+    protected $fields_to_duplicate = array(
         'title',
         'description',
         'date_due',
@@ -49,106 +46,13 @@ class TaskDuplicationModel extends Base
      */
     public function duplicate($task_id)
     {
-        return $this->save($task_id, $this->copyFields($task_id));
-    }
-
-    /**
-     * Duplicate recurring task
-     *
-     * @access public
-     * @param  integer             $task_id      Task id
-     * @return boolean|integer                   Recurrence task id
-     */
-    public function duplicateRecurringTask($task_id)
-    {
-        $values = $this->copyFields($task_id);
-
-        if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
-            $values['recurrence_parent'] = $task_id;
-            $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
-            $this->calculateRecurringTaskDueDate($values);
-
-            $recurring_task_id = $this->save($task_id, $values);
-
-            if ($recurring_task_id > 0) {
-                $parent_update = $this->db
-                    ->table(TaskModel::TABLE)
-                    ->eq('id', $task_id)
-                    ->update(array(
-                        'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
-                        'recurrence_child' => $recurring_task_id,
-                    ));
-
-                if ($parent_update) {
-                    return $recurring_task_id;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Duplicate a task to another project
-     *
-     * @access public
-     * @param  integer    $task_id
-     * @param  integer    $project_id
-     * @param  integer    $swimlane_id
-     * @param  integer    $column_id
-     * @param  integer    $category_id
-     * @param  integer    $owner_id
-     * @return boolean|integer
-     */
-    public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
-    {
-        $values = $this->copyFields($task_id);
-        $values['project_id'] = $project_id;
-        $values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
-        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
-        $values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
-        $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
-
-        $this->checkDestinationProjectValues($values);
-
-        return $this->save($task_id, $values);
-    }
+        $new_task_id = $this->save($task_id, $this->copyFields($task_id));
 
-    /**
-     * Move a task to another project
-     *
-     * @access public
-     * @param  integer    $task_id
-     * @param  integer    $project_id
-     * @param  integer    $swimlane_id
-     * @param  integer    $column_id
-     * @param  integer    $category_id
-     * @param  integer    $owner_id
-     * @return boolean
-     */
-    public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
-    {
-        $task = $this->taskFinderModel->getById($task_id);
-
-        $values = array();
-        $values['is_active'] = 1;
-        $values['project_id'] = $project_id;
-        $values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
-        $values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
-        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
-        $values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
-        $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
-
-        $this->checkDestinationProjectValues($values);
-
-        if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
-            $this->container['dispatcher']->dispatch(
-                TaskModel::EVENT_MOVE_PROJECT,
-                new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])))
-            );
+        if ($new_task_id !== false) {
+            $this->tagDuplicationModel->duplicateTaskTags($task_id, $new_task_id);
         }
 
-        return true;
+        return $new_task_id;
     }
 
     /**
@@ -194,50 +98,14 @@ class TaskDuplicationModel extends Base
         return $values;
     }
 
-    /**
-     * Calculate new due date for new recurrence task
-     *
-     * @access public
-     * @param  array   $values   Task fields
-     */
-    public function calculateRecurringTaskDueDate(array &$values)
-    {
-        if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
-            if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
-                $values['date_due'] = time();
-            }
-
-            $factor = abs($values['recurrence_factor']);
-            $subtract = $values['recurrence_factor'] < 0;
-
-            switch ($values['recurrence_timeframe']) {
-                case TaskModel::RECURRING_TIMEFRAME_MONTHS:
-                    $interval = 'P' . $factor . 'M';
-                    break;
-                case TaskModel::RECURRING_TIMEFRAME_YEARS:
-                    $interval = 'P' . $factor . 'Y';
-                    break;
-                default:
-                    $interval = 'P' . $factor . 'D';
-            }
-
-            $date_due = new DateTime();
-            $date_due->setTimestamp($values['date_due']);
-
-            $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
-
-            $values['date_due'] = $date_due->getTimestamp();
-        }
-    }
-
     /**
      * Duplicate fields for the new task
      *
-     * @access private
+     * @access protected
      * @param  integer       $task_id      Task id
      * @return array
      */
-    private function copyFields($task_id)
+    protected function copyFields($task_id)
     {
         $task = $this->taskFinderModel->getById($task_id);
         $values = array();
@@ -252,16 +120,16 @@ class TaskDuplicationModel extends Base
     /**
      * Create the new task and duplicate subtasks
      *
-     * @access private
+     * @access protected
      * @param  integer            $task_id      Task id
      * @param  array              $values       Form values
      * @return boolean|integer
      */
-    private function save($task_id, array $values)
+    protected function save($task_id, array $values)
     {
         $new_task_id = $this->taskCreationModel->create($values);
 
-        if ($new_task_id) {
+        if ($new_task_id !== false) {
             $this->subtaskModel->duplicate($task_id, $new_task_id);
         }
 
diff --git a/app/Model/TaskModel.php b/app/Model/TaskModel.php
index b0e7772a..b945ee44 100644
--- a/app/Model/TaskModel.php
+++ b/app/Model/TaskModel.php
@@ -215,7 +215,7 @@ class TaskModel extends Base
         $task_ids = $this->taskFinderModel->getAllIds($src_project_id, array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED));
 
         foreach ($task_ids as $task_id) {
-            if (! $this->taskDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
+            if (! $this->taskProjectDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
                 return false;
             }
         }
diff --git a/app/Model/TaskProjectDuplicationModel.php b/app/Model/TaskProjectDuplicationModel.php
new file mode 100644
index 00000000..8ebed255
--- /dev/null
+++ b/app/Model/TaskProjectDuplicationModel.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Kanboard\Model;
+
+/**
+ * Task Project Duplication
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskProjectDuplicationModel extends TaskDuplicationModel
+{
+    /**
+     * Duplicate a task to another project
+     *
+     * @access public
+     * @param  integer    $task_id
+     * @param  integer    $project_id
+     * @param  integer    $swimlane_id
+     * @param  integer    $column_id
+     * @param  integer    $category_id
+     * @param  integer    $owner_id
+     * @return boolean|integer
+     */
+    public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
+    {
+        $values = $this->prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
+        $this->checkDestinationProjectValues($values);
+        $new_task_id = $this->save($task_id, $values);
+
+        if ($new_task_id !== false) {
+            $this->tagDuplicationModel->duplicateTaskTagsToAnotherProject($task_id, $new_task_id, $project_id);
+        }
+
+        return $new_task_id;
+    }
+
+    /**
+     * Prepare values before duplication
+     *
+     * @access protected
+     * @param  integer $task_id
+     * @param  integer $project_id
+     * @param  integer $swimlane_id
+     * @param  integer $column_id
+     * @param  integer $category_id
+     * @param  integer $owner_id
+     * @return array
+     */
+    protected function prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id)
+    {
+        $values = $this->copyFields($task_id);
+        $values['project_id'] = $project_id;
+        $values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
+        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
+        $values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
+        $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
+        return $values;
+    }
+}
diff --git a/app/Model/TaskProjectMoveModel.php b/app/Model/TaskProjectMoveModel.php
new file mode 100644
index 00000000..7e9714d6
--- /dev/null
+++ b/app/Model/TaskProjectMoveModel.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Event\TaskEvent;
+
+/**
+ * Task Project Move
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskProjectMoveModel extends TaskDuplicationModel
+{
+    /**
+     * Move a task to another project
+     *
+     * @access public
+     * @param  integer    $task_id
+     * @param  integer    $project_id
+     * @param  integer    $swimlane_id
+     * @param  integer    $column_id
+     * @param  integer    $category_id
+     * @param  integer    $owner_id
+     * @return boolean
+     */
+    public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
+    {
+        $task = $this->taskFinderModel->getById($task_id);
+        $values = $this->prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, $task);
+
+        $this->checkDestinationProjectValues($values);
+        $this->tagDuplicationModel->syncTaskTagsToAnotherProject($task_id, $project_id);
+
+        if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
+            $event = new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])));
+            $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_PROJECT, $event);
+        }
+
+        return true;
+    }
+
+    /**
+     * Prepare new task values
+     *
+     * @access protected
+     * @param  integer $project_id
+     * @param  integer $swimlane_id
+     * @param  integer $column_id
+     * @param  integer $category_id
+     * @param  integer $owner_id
+     * @param  array   $task
+     * @return array
+     */
+    protected function prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, array $task)
+    {
+        $values = array();
+        $values['is_active'] = 1;
+        $values['project_id'] = $project_id;
+        $values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
+        $values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
+        $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
+        $values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
+        $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
+        return $values;
+    }
+}
diff --git a/app/Model/TaskRecurrenceModel.php b/app/Model/TaskRecurrenceModel.php
new file mode 100644
index 00000000..a5f2ab90
--- /dev/null
+++ b/app/Model/TaskRecurrenceModel.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Kanboard\Model;
+
+use DateInterval;
+use DateTime;
+
+/**
+ * Task Recurrence
+ *
+ * @package  Kanboard\Model
+ * @author   Frederic Guillot
+ */
+class TaskRecurrenceModel extends TaskDuplicationModel
+{
+    /**
+     * Duplicate recurring task
+     *
+     * @access public
+     * @param  integer             $task_id      Task id
+     * @return boolean|integer                   Recurrence task id
+     */
+    public function duplicateRecurringTask($task_id)
+    {
+        $values = $this->copyFields($task_id);
+
+        if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
+            $values['recurrence_parent'] = $task_id;
+            $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
+            $this->calculateRecurringTaskDueDate($values);
+
+            $recurring_task_id = $this->save($task_id, $values);
+
+            if ($recurring_task_id > 0) {
+                $parent_update = $this->db
+                    ->table(TaskModel::TABLE)
+                    ->eq('id', $task_id)
+                    ->update(array(
+                        'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
+                        'recurrence_child' => $recurring_task_id,
+                    ));
+
+                if ($parent_update) {
+                    return $recurring_task_id;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Calculate new due date for new recurrence task
+     *
+     * @access public
+     * @param  array   $values   Task fields
+     */
+    public function calculateRecurringTaskDueDate(array &$values)
+    {
+        if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
+            if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
+                $values['date_due'] = time();
+            }
+
+            $factor = abs($values['recurrence_factor']);
+            $subtract = $values['recurrence_factor'] < 0;
+
+            switch ($values['recurrence_timeframe']) {
+                case TaskModel::RECURRING_TIMEFRAME_MONTHS:
+                    $interval = 'P' . $factor . 'M';
+                    break;
+                case TaskModel::RECURRING_TIMEFRAME_YEARS:
+                    $interval = 'P' . $factor . 'Y';
+                    break;
+                default:
+                    $interval = 'P' . $factor . 'D';
+            }
+
+            $date_due = new DateTime();
+            $date_due->setTimestamp($values['date_due']);
+
+            $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
+
+            $values['date_due'] = $date_due->getTimestamp();
+        }
+    }
+}
diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php
index 2a08e867..0553cc6c 100644
--- a/app/Model/TaskTagModel.php
+++ b/app/Model/TaskTagModel.php
@@ -19,6 +19,23 @@ class TaskTagModel extends Base
      */
     const TABLE = 'task_has_tags';
 
+    /**
+     * Get all tags not available in a project
+     *
+     * @access public
+     * @param  integer $task_id
+     * @param  integer $project_id
+     * @return array
+     */
+    public function getTagIdsByTaskNotAvailableInProject($task_id, $project_id)
+    {
+        return $this->db->table(TagModel::TABLE)
+            ->eq(self::TABLE.'.task_id', $task_id)
+            ->notIn(TagModel::TABLE.'.project_id', array(0, $project_id))
+            ->join(self::TABLE, 'tag_id', 'id')
+            ->findAllByColumn(TagModel::TABLE.'.id');
+    }
+
     /**
      * Get all tags associated to a task
      *
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index c0fb93bd..1f584fca 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -60,11 +60,15 @@ class ClassProvider implements ServiceProviderInterface
             'SubtaskModel',
             'SubtaskTimeTrackingModel',
             'SwimlaneModel',
+            'TagDuplicationModel',
             'TagModel',
             'TaskModel',
             'TaskAnalyticModel',
             'TaskCreationModel',
             'TaskDuplicationModel',
+            'TaskProjectDuplicationModel',
+            'TaskProjectMoveModel',
+            'TaskRecurrenceModel',
             'TaskExternalLinkModel',
             'TaskFinderModel',
             'TaskFileModel',
diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 75b7ff76..21cd3996 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -22,9 +22,9 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
 
         if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
             if ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
-                $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+                $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
             } elseif ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
-                $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+                $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
             }
         }
     }
@@ -34,7 +34,7 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
         $this->logger->debug('Subscriber executed: '.__METHOD__);
 
         if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
-            $this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
+            $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
         }
     }
 }
diff --git a/tests/units/Model/TaskDuplicationTest.php b/tests/units/Model/TaskDuplicationTest.php
index 79b75e54..7ce851d0 100644
--- a/tests/units/Model/TaskDuplicationTest.php
+++ b/tests/units/Model/TaskDuplicationTest.php
@@ -2,31 +2,27 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Core\DateParser;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskDuplicationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
-use Kanboard\Model\ProjectUserRoleModel;
 use Kanboard\Model\CategoryModel;
-use Kanboard\Model\UserModel;
-use Kanboard\Model\SwimlaneModel;
-use Kanboard\Core\Security\Role;
+use Kanboard\Model\TaskTagModel;
 
 class TaskDuplicationTest extends Base
 {
     public function testThatDuplicateDefineCreator()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['project_id']);
@@ -35,37 +31,41 @@ class TaskDuplicationTest extends Base
         $this->container['sessionStorage']->user = array('id' => 1);
 
         // We duplicate our task
-        $this->assertEquals(2, $td->duplicate(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
         // Check the values of the duplicated task
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['creator_id']);
     }
 
     public function testDuplicateSameProject()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         // We create a task and a project
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
         // Some categories
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #2', 'project_id' => 1)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #2', 'project_id' => 1)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
 
-        $this->assertEquals(
-            1,
-            $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1, 'category_id' => 2, 'time_spent' => 4.4)
-        ));
+        $this->assertEquals(1, $taskCreationModel->create(array(
+            'title' => 'test',
+            'project_id' => 1,
+            'column_id' => 3,
+            'owner_id' => 1,
+            'category_id' => 2,
+            'time_spent' => 4.4
+        )));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertNotEmpty($task);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['project_id']);
@@ -77,14 +77,14 @@ class TaskDuplicationTest extends Base
         $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
 
         // We duplicate our task
-        $this->assertEquals(2, $td->duplicate(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
 
         // Check the values of the duplicated task
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertNotEmpty($task);
         $this->assertEquals(TaskModel::STATUS_OPEN, $task['is_active']);
         $this->assertEquals(1, $task['project_id']);
@@ -97,604 +97,25 @@ class TaskDuplicationTest extends Base
         $this->assertEquals(0, $task['time_spent']);
     }
 
-    public function testDuplicateAnotherProject()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertTrue($c->exists(1));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1, 'category_id' => 1)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function () {});
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
-        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #2', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-        $this->assertTrue($c->exists(3));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We duplicate our task to the 2nd project with no category
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, null, 0));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['category_id']);
-
-        // We duplicate our task to the 2nd project with a different category
-        $this->assertEquals(3, $td->duplicateToProject(1, 2, null, null, 3));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(3);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(3, $task['category_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(2, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithoutSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, 3));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(3, $task['swimlane_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedColumn()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2)));
-
-        // We duplicate our task to the 2nd project with a different column
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, 7));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(7, $task['column_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-
-        // We create a new user for our project
-        $user = new UserModel($this->container);
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(3, $td->duplicateToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(3);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(2, $task['position']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(2, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-
-        // We duplicate a task with a not allowed user
-        $this->assertEquals(4, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 3)));
-        $this->assertEquals(5, $td->duplicateToProject(4, 2));
-
-        $task = $tf->getById(5);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(5, $task['column_id']);
-    }
-
-    public function testDuplicateAnotherProjectWithPredefinedUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pr = new ProjectUserRoleModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-        $this->assertTrue($pr->addUser(2, 1, Role::PROJECT_MEMBER));
-
-        // We duplicate our task to the 2nd project
-        $this->assertEquals(2, $td->duplicateToProject(1, 2, null, null, null, 1));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['owner_id']);
-    }
-
-    public function onMoveProject($event)
-    {
-        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
-
-        $event_data = $event->getAll();
-        $this->assertNotEmpty($event_data);
-        $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
-    }
-
-    public function testMoveAnotherProject()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'owner_id' => 1, 'category_id' => 10, 'position' => 333)));
-
-        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, array($this, 'onMoveProject'));
-
-        // We duplicate our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.TaskDuplicationTest::onMoveProject', $called);
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(5, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithCategory()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 1)));
-        $this->assertNotFalse($c->create(array('name' => 'Category #1', 'project_id' => 2)));
-        $this->assertTrue($c->exists(1));
-        $this->assertTrue($c->exists(2));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the duplicated task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a new user for our project
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(6, $task['column_id']);
-    }
-
-    public function testMoveAnotherProjectWithForbiddenUser()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $pp = new ProjectUserRoleModel($this->container);
-        $user = new UserModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        // We create a new user for our project
-        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
-        $this->assertTrue($pp->addUser(1, 2, Role::PROJECT_MEMBER));
-        $this->assertTrue($pp->addUser(2, 2, Role::PROJECT_MEMBER));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 3)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals(6, $task['column_id']);
-    }
-
-    public function testMoveAnotherProjectWithSwimlane()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(2, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testMoveAnotherProjectWithoutSwimlane()
+    public function testDuplicateSameProjectWitTags()
     {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
+        $taskDuplicationModel = new TaskDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
 
-        // We create 2 projects
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-
-        $this->assertNotFalse($s->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
-        $this->assertNotFalse($s->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
-
-        // We create a task
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
-
-        // We move our task to the 2nd project
-        $this->assertTrue($td->moveToProject(1, 2));
-
-        // Check the values of the moved task
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['owner_id']);
-        $this->assertEquals(0, $task['category_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-        $this->assertEquals(6, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['project_id']);
-        $this->assertEquals('test', $task['title']);
-    }
-
-    public function testCalculateRecurringTaskDueDate()
-    {
-        $td = new TaskDuplicationModel($this->container);
-
-        $values = array('date_due' => 0);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(0, $values['date_due']);
-
-        $values = array('date_due' => 0, 'recurrence_factor' => 0, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(0, $values['date_due']);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(time() + 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => -2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(time() - 2 * 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1431291376 + 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => -1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1431291376 - 86400, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_MONTHS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1436561776, $values['date_due'], '', 1);
-
-        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_YEARS);
-        $td->calculateRecurringTaskDueDate($values);
-        $this->assertEquals(1494449776, $values['date_due'], '', 1);
-    }
-
-    public function testDuplicateRecurringTask()
-    {
-        $td = new TaskDuplicationModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $dp = new DateParser($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-
-        $this->assertEquals(1, $tc->create(array(
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array(
             'title' => 'test',
             'project_id' => 1,
-            'date_due' => 1436561776,
-            'recurrence_status' => TaskModel::RECURRING_STATUS_PENDING,
-            'recurrence_trigger' => TaskModel::RECURRING_TRIGGER_CLOSE,
-            'recurrence_factor' => 2,
-            'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS,
-            'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE,
+            'tags' => array('T1', 'T2')
         )));
 
-        $this->assertEquals(2, $td->duplicateRecurringTask(1));
+        $this->assertEquals(2, $taskDuplicationModel->duplicate(1));
 
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(TaskModel::RECURRING_STATUS_PROCESSED, $task['recurrence_status']);
-        $this->assertEquals(2, $task['recurrence_child']);
-        $this->assertEquals(1436486400, $task['date_due'], '', 2);
-
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(TaskModel::RECURRING_STATUS_PENDING, $task['recurrence_status']);
-        $this->assertEquals(TaskModel::RECURRING_TRIGGER_CLOSE, $task['recurrence_trigger']);
-        $this->assertEquals(TaskModel::RECURRING_TIMEFRAME_DAYS, $task['recurrence_timeframe']);
-        $this->assertEquals(TaskModel::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']);
-        $this->assertEquals(1, $task['recurrence_parent']);
-        $this->assertEquals(2, $task['recurrence_factor']);
-        $this->assertEquals($dp->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2);
+        $tags = $taskTagModel->getList(2);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(1, $tags);
+        $this->assertArrayHasKey(2, $tags);
     }
 }
diff --git a/tests/units/Model/TaskProjectDuplicationModelTest.php b/tests/units/Model/TaskProjectDuplicationModelTest.php
new file mode 100644
index 00000000..798257ba
--- /dev/null
+++ b/tests/units/Model/TaskProjectDuplicationModelTest.php
@@ -0,0 +1,369 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\Security\Role;
+use Kanboard\Model\CategoryModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TagModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskProjectDuplicationModel;
+use Kanboard\Model\TaskTagModel;
+use Kanboard\Model\UserModel;
+
+class TaskProjectDuplicationModelTest extends Base
+{
+    public function testDuplicateAnotherProject()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertTrue($categoryModel->exists(1));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1, 'category_id' => 1)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function () {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function () {});
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithCategory()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedCategory()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #2', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+        $this->assertTrue($categoryModel->exists(3));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We duplicate our task to the 2nd project with no category
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, 0));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['category_id']);
+
+        // We duplicate our task to the 2nd project with a different category
+        $this->assertEquals(3, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, 3));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['category_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(2, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithoutSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedSwimlane()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, 3));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3, $task['swimlane_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedColumn()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2)));
+
+        // We duplicate our task to the 2nd project with a different column
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, 7));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(7, $task['column_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithUser()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+
+        // We create a new user for our project
+        $user = new UserModel($this->container);
+        $this->assertNotFalse($user->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(3, $taskProjectDuplicationModel->duplicateToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['position']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(2, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+
+        // We duplicate a task with a not allowed user
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 3)));
+        $this->assertEquals(5, $taskProjectDuplicationModel->duplicateToProject(4, 2));
+
+        $task = $taskFinderModel->getById(5);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(5, $task['column_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithPredefinedUser()
+    {
+        $taskProjectDuplicationModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 1, Role::PROJECT_MEMBER));
+
+        // We duplicate our task to the 2nd project
+        $this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2, null, null, null, 1));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['owner_id']);
+    }
+
+    public function testDuplicateAnotherProjectWithDifferentTags()
+    {
+        $taskProjectMoveModel = new TaskProjectDuplicationModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $tagModel = new TagModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create our tags for each projects
+        $this->assertEquals(1, $tagModel->create(1, 'T1'));
+        $this->assertEquals(2, $tagModel->create(1, 'T2'));
+        $this->assertEquals(3, $tagModel->create(2, 'T2'));
+        $this->assertEquals(4, $tagModel->create(2, 'T3'));
+        $this->assertEquals(5, $tagModel->create(0, 'T4'));
+        $this->assertEquals(6, $tagModel->create(0, 'T5'));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('T1', 'T2', 'T5'))));
+
+        // We move our task to the 2nd project
+        $this->assertEquals(2, $taskProjectMoveModel->duplicateToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['id']);
+        $this->assertEquals(2, $task['project_id']);
+
+        // Check tags
+        $tags = $taskTagModel->getList(2);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(3, $tags);
+        $this->assertArrayHasKey(6, $tags);
+    }
+}
diff --git a/tests/units/Model/TaskProjectMoveModelTest.php b/tests/units/Model/TaskProjectMoveModelTest.php
new file mode 100644
index 00000000..ed6c0c3c
--- /dev/null
+++ b/tests/units/Model/TaskProjectMoveModelTest.php
@@ -0,0 +1,269 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\Security\Role;
+use Kanboard\Model\CategoryModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TagModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskProjectMoveModel;
+use Kanboard\Model\TaskTagModel;
+use Kanboard\Model\UserModel;
+
+class TaskProjectMoveModelTest extends Base
+{
+    public function onMoveProject($event)
+    {
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+
+        $event_data = $event->getAll();
+        $this->assertNotEmpty($event_data);
+        $this->assertEquals(1, $event_data['task_id']);
+        $this->assertEquals('test', $event_data['title']);
+    }
+
+    public function testMoveAnotherProject()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'owner_id' => 1, 'category_id' => 10, 'position' => 333)));
+
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, array($this, 'onMoveProject'));
+
+        // We duplicate our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.TaskProjectMoveModelTest::onMoveProject', $called);
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(5, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithCategory()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 1)));
+        $this->assertNotFalse($categoryModel->create(array('name' => 'Category #1', 'project_id' => 2)));
+        $this->assertTrue($categoryModel->exists(1));
+        $this->assertTrue($categoryModel->exists(2));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'category_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the duplicated task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithUser()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a new user for our project
+        $this->assertNotFalse($userModel->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(6, $task['column_id']);
+    }
+
+    public function testMoveAnotherProjectWithForbiddenUser()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectUserRoleModel = new ProjectUserRoleModel($this->container);
+        $userModel = new UserModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create a new user for our project
+        $this->assertNotFalse($userModel->create(array('username' => 'unittest#1', 'password' => 'unittest')));
+        $this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+        $this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 3)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals(6, $task['column_id']);
+    }
+
+    public function testMoveAnotherProjectWithSwimlane()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #1')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(2, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithoutSwimlane()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 1, 'name' => 'Swimlane #1')));
+        $this->assertNotFalse($swimlaneModel->create(array('project_id' => 2, 'name' => 'Swimlane #2')));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['owner_id']);
+        $this->assertEquals(0, $task['category_id']);
+        $this->assertEquals(0, $task['swimlane_id']);
+        $this->assertEquals(6, $task['column_id']);
+        $this->assertEquals(1, $task['position']);
+        $this->assertEquals(2, $task['project_id']);
+        $this->assertEquals('test', $task['title']);
+    }
+
+    public function testMoveAnotherProjectWithDifferentTags()
+    {
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $tagModel = new TagModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+
+        // We create 2 projects
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+
+        // We create our tags for each projects
+        $this->assertEquals(1, $tagModel->create(1, 'T1'));
+        $this->assertEquals(2, $tagModel->create(1, 'T2'));
+        $this->assertEquals(3, $tagModel->create(2, 'T3'));
+        $this->assertEquals(4, $tagModel->create(2, 'T4'));
+        $this->assertEquals(5, $tagModel->create(0, 'T5'));
+        $this->assertEquals(6, $tagModel->create(0, 'T6'));
+
+        // We create a task
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'tags' => array('T1', 'T5', 'T6'))));
+
+        // We move our task to the 2nd project
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
+
+        // Check the values of the moved task
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2, $task['project_id']);
+
+        // Check tags
+        $tags = $taskTagModel->getList(1);
+        $this->assertCount(2, $tags);
+        $this->assertArrayHasKey(5, $tags);
+        $this->assertArrayHasKey(6, $tags);
+    }
+}
diff --git a/tests/units/Model/TaskRecurrenceModelTest.php b/tests/units/Model/TaskRecurrenceModelTest.php
new file mode 100644
index 00000000..6970e30f
--- /dev/null
+++ b/tests/units/Model/TaskRecurrenceModelTest.php
@@ -0,0 +1,90 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Core\DateParser;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskRecurrenceModel;
+
+class TaskRecurrenceModelTest extends Base
+{
+    public function testCalculateRecurringTaskDueDate()
+    {
+        $taskRecurrenceModel = new TaskRecurrenceModel($this->container);
+
+        $values = array('date_due' => 0);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(0, $values['date_due']);
+
+        $values = array('date_due' => 0, 'recurrence_factor' => 0, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(0, $values['date_due']);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(time() + 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => -2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(time() - 2 * 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1431291376 + 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => -1, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1431291376 - 86400, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_MONTHS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1436561776, $values['date_due'], '', 1);
+
+        $values = array('date_due' => 1431291376, 'recurrence_factor' => 2, 'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_DUEDATE, 'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_YEARS);
+        $taskRecurrenceModel->calculateRecurringTaskDueDate($values);
+        $this->assertEquals(1494449776, $values['date_due'], '', 1);
+    }
+
+    public function testDuplicateRecurringTask()
+    {
+        $taskRecurrenceModel = new TaskRecurrenceModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $dateParser = new DateParser($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array(
+            'title' => 'test',
+            'project_id' => 1,
+            'date_due' => 1436561776,
+            'recurrence_status' => TaskModel::RECURRING_STATUS_PENDING,
+            'recurrence_trigger' => TaskModel::RECURRING_TRIGGER_CLOSE,
+            'recurrence_factor' => 2,
+            'recurrence_timeframe' => TaskModel::RECURRING_TIMEFRAME_DAYS,
+            'recurrence_basedate' => TaskModel::RECURRING_BASEDATE_TRIGGERDATE,
+        )));
+
+        $this->assertEquals(2, $taskRecurrenceModel->duplicateRecurringTask(1));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(TaskModel::RECURRING_STATUS_PROCESSED, $task['recurrence_status']);
+        $this->assertEquals(2, $task['recurrence_child']);
+        $this->assertEquals(1436486400, $task['date_due'], '', 2);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(TaskModel::RECURRING_STATUS_PENDING, $task['recurrence_status']);
+        $this->assertEquals(TaskModel::RECURRING_TRIGGER_CLOSE, $task['recurrence_trigger']);
+        $this->assertEquals(TaskModel::RECURRING_TIMEFRAME_DAYS, $task['recurrence_timeframe']);
+        $this->assertEquals(TaskModel::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']);
+        $this->assertEquals(1, $task['recurrence_parent']);
+        $this->assertEquals(2, $task['recurrence_factor']);
+        $this->assertEquals($dateParser->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2);
+    }
+}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 88055d5f..3485368e 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -124,4 +124,25 @@ class TaskTagModelTest extends Base
         $tags = $taskTagModel->getTagsByTasks(array());
         $this->assertEquals(array(), $tags);
     }
+
+    public function testGetTagIdNotAvailableInDestinationProject()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskTagModel = new TaskTagModel($this->container);
+        $tagModel = new TagModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'P2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
+
+        $this->assertEquals(1, $tagModel->create(0, 'T0'));
+        $this->assertEquals(2, $tagModel->create(2, 'T1'));
+        $this->assertEquals(3, $tagModel->create(2, 'T3'));
+        $this->assertEquals(4, $tagModel->create(1, 'T2'));
+        $this->assertEquals(5, $tagModel->create(1, 'T3'));
+        $this->assertTrue($taskTagModel->save(1, 1, array('T0', 'T2', 'T3')));
+
+        $this->assertEquals(array(4, 5), $taskTagModel->getTagIdsByTaskNotAvailableInProject(1, 2));
+    }
 }
-- 
cgit v1.2.3