TaskAssignColorOnDueDateAction: update task only when necessary

3 files changed, 30 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bfb7057d..97f26707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Version 1.0.44 (unreleased)
+---------------------------
+
+Improvements:
+
+* Improve automated action TaskAssignColorOnDueDate to update task only when necessary
+
 Version 1.0.43 (April 30, 2017)
 -------------------------------
 
diff --git a/app/Action/TaskAssignColorOnDueDate.php b/app/Action/TaskAssignColorOnDueDate.php
index 06b70a18..791f0cff 100644
--- a/app/Action/TaskAssignColorOnDueDate.php
+++ b/app/Action/TaskAssignColorOnDueDate.php
@@ -74,7 +74,7 @@ class TaskAssignColorOnDueDate extends Base
         $results = array();
 
         foreach ($data['tasks'] as $task) {
-            if ($task['date_due'] <= time() && $task['date_due'] > 0) {
+            if ($task['date_due'] <= time() && $task['date_due'] > 0 && $task['color_id'] != $this->getParam('color_id')) {
                 $values = array(
                     'id'       => $task['id'],
                     'color_id' => $this->getParam('color_id'),
diff --git a/tests/units/Action/TaskAssignColorOnDueDateTest.php b/tests/units/Action/TaskAssignColorOnDueDateTest.php
index 4bb87c06..cf1373d5 100644
--- a/tests/units/Action/TaskAssignColorOnDueDateTest.php
+++ b/tests/units/Action/TaskAssignColorOnDueDateTest.php
@@ -34,4 +34,26 @@ class TaskAssignColorOnDueDateTest extends Base
         $this->assertEquals('red', $tasks[0]['color_id']);
         $this->assertEquals('yellow', $tasks[1]['color_id']);
     }
+
+    public function testChangeColorOnlyWhenNecessary()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'date_due' => strtotime('-1 day'), 'color_id' => 'red')));
+
+        $tasks = $taskFinderModel->getAll(1);
+        $event = new TaskListEvent(array('tasks' => $tasks, 'project_id' => 1));
+
+        $action = new TaskAssignColorOnDueDate($this->container);
+        $action->setProjectId(1);
+        $action->setParam('color_id', 'red');
+
+        $this->assertFalse($action->execute($event, TaskModel::EVENT_DAILY_CRONJOB));
+
+        $tasks = $taskFinderModel->getAll(1);
+        $this->assertEquals('red', $tasks[0]['color_id']);
+    }
 }