Fix bug duplicate project with a too long name

7 files changed, 185 insertions, 64 deletions

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 1f8b243c..e0f99d18 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -36,6 +36,7 @@ use Symfony\Component\EventDispatcher\Event;
  * @property \Model\Notification           $notification
  * @property \Model\Project                $project
  * @property \Model\ProjectPermission      $projectPermission
+ * @property \Model\ProjectDuplication     $projectDuplication
  * @property \Model\ProjectAnalytic        $projectAnalytic
  * @property \Model\ProjectActivity        $projectActivity
  * @property \Model\ProjectDailySummary    $projectDailySummary
diff --git a/app/Controller/Project.php b/app/Controller/Project.php
index a53c917c..4beb19ce 100644
--- a/app/Controller/Project.php
+++ b/app/Controller/Project.php
@@ -307,7 +307,7 @@ class Project extends Base
 
             $this->checkCSRFParam();
 
-            if ($this->project->duplicate($project['id'])) {
+            if ($this->projectDuplication->duplicate($project['id'])) {
                 $this->session->flash(t('Project cloned successfully.'));
             } else {
                 $this->session->flashError(t('Unable to clone this project.'));
diff --git a/app/Model/Base.php b/app/Model/Base.php
index a6333144..785785a7 100644
--- a/app/Model/Base.php
+++ b/app/Model/Base.php
@@ -27,6 +27,7 @@ use Pimple\Container;
  * @property \Model\LastLogin          $lastLogin
  * @property \Model\Notification       $notification
  * @property \Model\Project            $project
+ * @property \Model\ProjectDuplication $projectDuplication
  * @property \Model\ProjectPermission  $projectPermission
  * @property \Model\SubTask            $subTask
  * @property \Model\SubtaskHistory     $subtaskHistory
diff --git a/app/Model/Project.php b/app/Model/Project.php
index a072a5c1..f802e4ed 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -262,65 +262,6 @@ class Project extends Base
     }
 
     /**
-     * Create a project from another one.
-     *
-     * @author Antonio Rabelo
-     * @param  integer    $project_id      Project Id
-     * @return integer                     Cloned Project Id
-     */
-    public function createProjectFromAnotherProject($project_id)
-    {
-        $project = $this->getById($project_id);
-
-        $values = array(
-            'name' => $project['name'].' ('.t('Clone').')',
-            'is_active' => true,
-            'last_modified' => 0,
-            'token' => '',
-            'is_public' => 0,
-            'is_private' => empty($project['is_private']) ? 0 : 1,
-        );
-
-        if (! $this->db->table(self::TABLE)->save($values)) {
-            return 0;
-        }
-
-        return $this->db->getConnection()->getLastId();
-    }
-
-    /**
-     * Clone a project
-     *
-     * @author Antonio Rabelo
-     * @param  integer    $project_id  Project Id
-     * @return integer                 Cloned Project Id
-     */
-    public function duplicate($project_id)
-    {
-        $this->db->startTransaction();
-
-        // Get the cloned project Id
-        $clone_project_id = $this->createProjectFromAnotherProject($project_id);
-
-        if (! $clone_project_id) {
-            $this->db->cancelTransaction();
-            return false;
-        }
-
-        foreach (array('board', 'category', 'projectPermission', 'action') as $model) {
-
-            if (! $this->$model->duplicate($project_id, $clone_project_id)) {
-                $this->db->cancelTransaction();
-                return false;
-            }
-        }
-
-        $this->db->closeTransaction();
-
-        return (int) $clone_project_id;
-    }
-
-    /**
      * Create a project
      *
      * @access public
diff --git a/app/Model/ProjectDuplication.php b/app/Model/ProjectDuplication.php
new file mode 100644
index 00000000..11a606d7
--- /dev/null
+++ b/app/Model/ProjectDuplication.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Model;
+
+/**
+ * Project Duplication
+ *
+ * @package  model
+ * @author   Frederic Guillot
+ * @author   Antonio Rabelo
+ */
+class ProjectDuplication extends Base
+{
+    /**
+     * Get a valid project name for the duplication
+     *
+     * @access public
+     * @param  string   $name         Project name
+     * @param  integer  $max_length   Max length allowed
+     * @return string
+     */
+    public function getClonedProjectName($name, $max_length = 50)
+    {
+        $suffix = ' ('.t('Clone').')';
+
+        if (strlen($name.$suffix) > 50) {
+            $name = substr($name, 0, 50 - strlen($suffix));
+        }
+
+        return $name.$suffix;
+    }
+
+    /**
+     * Create a project from another one
+     *
+     * @param  integer    $project_id      Project Id
+     * @return integer                     Cloned Project Id
+     */
+    public function copy($project_id)
+    {
+        $project = $this->project->getById($project_id);
+
+        $values = array(
+            'name' => $this->getClonedProjectName($project['name']),
+            'is_active' => true,
+            'last_modified' => 0,
+            'token' => '',
+            'is_public' => 0,
+            'is_private' => empty($project['is_private']) ? 0 : 1,
+        );
+
+        if (! $this->db->table(Project::TABLE)->save($values)) {
+            return 0;
+        }
+
+        return $this->db->getConnection()->getLastId();
+    }
+
+    /**
+     * Clone a project with all settings
+     *
+     * @param  integer    $project_id  Project Id
+     * @return integer                 Cloned Project Id
+     */
+    public function duplicate($project_id)
+    {
+        $this->db->startTransaction();
+
+        // Get the cloned project Id
+        $clone_project_id = $this->copy($project_id);
+
+        if (! $clone_project_id) {
+            $this->db->cancelTransaction();
+            return false;
+        }
+
+        foreach (array('board', 'category', 'projectPermission', 'action') as $model) {
+
+            if (! $this->$model->duplicate($project_id, $clone_project_id)) {
+                $this->db->cancelTransaction();
+                return false;
+            }
+        }
+
+        $this->db->closeTransaction();
+
+        return (int) $clone_project_id;
+    }
+}
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 8ff00137..91a42fa9 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -28,6 +28,7 @@ class ClassProvider implements ServiceProviderInterface
             'Project',
             'ProjectActivity',
             'ProjectAnalytic',
+            'ProjectDuplication',
             'ProjectDailySummary',
             'ProjectPermission',
             'SubTask',
diff --git a/tests/units/ProjectDuplicateTest.php b/tests/units/ProjectDuplicationTest.php
index 161bbe20..ab50b9f1 100644
--- a/tests/units/ProjectDuplicateTest.php
+++ b/tests/units/ProjectDuplicationTest.php
@@ -2,9 +2,11 @@
 
 require_once __DIR__.'/Base.php';
 
+use Model\Action;
 use Model\Project;
 use Model\Category;
 use Model\ProjectPermission;
+use Model\ProjectDuplication;
 use Model\User;
 use Model\Task;
 use Model\TaskCreation;
@@ -13,12 +15,39 @@ use Model\Board;
 
 class ProjectDuplicationTest extends Base
 {
+    public function testProjectName()
+    {
+        $pd = new ProjectDuplication($this->container);
+
+        $this->assertEquals('test (Clone)', $pd->getClonedProjectName('test'));
+        
+        $this->assertEquals(50, strlen($pd->getClonedProjectName(str_repeat('a', 50))));
+        $this->assertEquals(str_repeat('a', 42).' (Clone)', $pd->getClonedProjectName(str_repeat('a', 50)));
+
+        $this->assertEquals(50, strlen($pd->getClonedProjectName(str_repeat('a', 60))));
+        $this->assertEquals(str_repeat('a', 42).' (Clone)', $pd->getClonedProjectName(str_repeat('a', 60)));
+    }
+
+    public function testCopyProjectWithLongName()
+    {
+        $p = new Project($this->container);
+        $pd = new ProjectDuplication($this->container);
+
+        $this->assertEquals(1, $p->create(array('name' => str_repeat('a', 50))));
+        $this->assertEquals(2, $pd->duplicate(1));
+
+        $project = $p->getById(2);
+        $this->assertNotEmpty($project);
+        $this->assertEquals(str_repeat('a', 42).' (Clone)', $project['name']);
+    }
+
     public function testClonePublicProject()
     {
         $p = new Project($this->container);
+        $pd = new ProjectDuplication($this->container);
 
         $this->assertEquals(1, $p->create(array('name' => 'Public')));
-        $this->assertEquals(2, $p->duplicate(1));
+        $this->assertEquals(2, $pd->duplicate(1));
 
         $project = $p->getById(2);
         $this->assertNotEmpty($project);
@@ -31,9 +60,10 @@ class ProjectDuplicationTest extends Base
     public function testClonePrivateProject()
     {
         $p = new Project($this->container);
+        $pd = new ProjectDuplication($this->container);
 
         $this->assertEquals(1, $p->create(array('name' => 'Private', 'is_private' => 1), 1, true));
-        $this->assertEquals(2, $p->duplicate(1));
+        $this->assertEquals(2, $pd->duplicate(1));
 
         $project = $p->getById(2);
         $this->assertNotEmpty($project);
@@ -52,6 +82,7 @@ class ProjectDuplicationTest extends Base
     {
         $p = new Project($this->container);
         $c = new Category($this->container);
+        $pd = new ProjectDuplication($this->container);
 
         $this->assertEquals(1, $p->create(array('name' => 'P1')));
 
@@ -59,7 +90,7 @@ class ProjectDuplicationTest extends Base
         $this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
         $this->assertEquals(3, $c->create(array('name' => 'C3', 'project_id' => 1)));
 
-        $this->assertEquals(2, $p->duplicate(1));
+        $this->assertEquals(2, $pd->duplicate(1));
 
         $project = $p->getById(2);
         $this->assertNotEmpty($project);
@@ -85,6 +116,7 @@ class ProjectDuplicationTest extends Base
         $c = new Category($this->container);
         $pp = new ProjectPermission($this->container);
         $u = new User($this->container);
+        $pd = new ProjectDuplication($this->container);
 
         $this->assertEquals(2, $u->create(array('username' => 'unittest1', 'password' => 'unittest')));
         $this->assertEquals(3, $u->create(array('username' => 'unittest2', 'password' => 'unittest')));
@@ -101,7 +133,7 @@ class ProjectDuplicationTest extends Base
         $this->assertTrue($pp->isManager(1, 3));
         $this->assertFalse($pp->isManager(1, 4));
 
-        $this->assertEquals(2, $p->duplicate(1));
+        $this->assertEquals(2, $pd->duplicate(1));
 
         $project = $p->getById(2);
         $this->assertNotEmpty($project);
@@ -115,4 +147,60 @@ class ProjectDuplicationTest extends Base
         $this->assertTrue($pp->isManager(2, 3));
         $this->assertFalse($pp->isManager(2, 4));
     }
+
+    public function testCloneProjectWithActionTaskAssignCurrentUser()
+    {
+        $p = new Project($this->container);
+        $a = new Action($this->container);
+        $pd = new ProjectDuplication($this->container);
+
+        $this->assertEquals(1, $p->create(array('name' => 'P1')));
+        
+        $this->assertTrue($a->create(array(
+            'project_id' => 1,
+            'event_name' => Task::EVENT_MOVE_COLUMN,
+            'action_name' => 'TaskAssignCurrentUser',
+            'params' => array('column_id' => 2),
+        )));
+
+        $this->assertEquals(2, $pd->duplicate(1));
+
+        $actions = $a->getAllByProject(2);
+
+        $this->assertNotEmpty($actions);
+        $this->assertEquals('TaskAssignCurrentUser', $actions[0]['action_name']);
+        $this->assertNotEmpty($actions[0]['params']);
+        $this->assertEquals(6, $actions[0]['params'][0]['value']);
+    }
+
+    public function testCloneProjectWithActionTaskAssignColorCategory()
+    {
+        $p = new Project($this->container);
+        $a = new Action($this->container);
+        $c = new Category($this->container);
+        $pd = new ProjectDuplication($this->container);
+
+        $this->assertEquals(1, $p->create(array('name' => 'P1')));
+
+        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
+        $this->assertEquals(3, $c->create(array('name' => 'C3', 'project_id' => 1)));
+        
+        $this->assertTrue($a->create(array(
+            'project_id' => 1,
+            'event_name' => Task::EVENT_CREATE_UPDATE,
+            'action_name' => 'TaskAssignColorCategory',
+            'params' => array('color_id' => 'blue', 'category_id' => 2),
+        )));
+
+        $this->assertEquals(2, $pd->duplicate(1));
+
+        $actions = $a->getAllByProject(2);
+
+        $this->assertNotEmpty($actions);
+        $this->assertEquals('TaskAssignColorCategory', $actions[0]['action_name']);
+        $this->assertNotEmpty($actions[0]['params']);
+        $this->assertEquals('blue', $actions[0]['params'][0]['value']);
+        $this->assertEquals(5, $actions[0]['params'][1]['value']);
+    }
 }