Add unit test for transition model

10 files changed, 112 insertions, 79 deletions

diff --git a/app/Console/TransitionExport.php b/app/Console/TransitionExport.php
index 9ae41417..d9f805a4 100644
--- a/app/Console/TransitionExport.php
+++ b/app/Console/TransitionExport.php
@@ -21,7 +21,7 @@ class TransitionExport extends Base
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $data = $this->transition->export(
+        $data = $this->transitionExport->export(
             $input->getArgument('project_id'),
             $input->getArgument('start_date'),
             $input->getArgument('end_date')
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 539d377b..5f35be55 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Controller;
 
+use Kanboard\Core\DateParser;
+
 /**
  * Task controller
  *
@@ -62,7 +64,7 @@ class Task extends Base
             'time_spent' => $task['time_spent'] ?: '',
         );
 
-        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
+        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
 
         $this->response->html($this->helper->layout->task('task/show', array(
             'project' => $this->project->getById($task['project_id']),
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
index 306d34c0..5fcb810c 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/Taskmodification.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Controller;
 
+use Kanboard\Core\DateParser;
+
 /**
  * Task Modification controller
  *
@@ -83,8 +85,8 @@ class Taskmodification extends Base
             $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
         }
 
-        $values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', 'm/d/Y'));
-        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
+        $values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', DateParser::DATE_FORMAT));
+        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
 
         $this->response->html($this->helper->layout->task('task_modification/edit_task', array(
             'project' => $project,
diff --git a/app/Core/Base.php b/app/Core/Base.php
index f1053114..dce3e3dc 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -111,6 +111,7 @@ use Pimple\Container;
  * @property \Kanboard\Model\TaskStatus                                 $taskStatus
  * @property \Kanboard\Model\TaskMetadata                               $taskMetadata
  * @property \Kanboard\Model\Transition                                 $transition
+ * @property \Kanboard\Model\TransitionExport                           $transitionExport
  * @property \Kanboard\Model\User                                       $user
  * @property \Kanboard\Model\UserImport                                 $userImport
  * @property \Kanboard\Model\UserLocking                                $userLocking
diff --git a/app/Core/DateParser.php b/app/Core/DateParser.php
index 20e79ff9..835eb3e3 100644
--- a/app/Core/DateParser.php
+++ b/app/Core/DateParser.php
@@ -12,6 +12,9 @@ use DateTime;
  */
 class DateParser extends Base
 {
+    const DATE_FORMAT = 'm/d/Y';
+    const DATE_TIME_FORMAT = 'm/d/Y H:i';
+
     /**
      * List of time formats
      *
@@ -201,7 +204,7 @@ class DateParser extends Base
     }
 
     /**
-     * Get a timetstamp from an ISO date format
+     * Get a timestamp from an ISO date format
      *
      * @access public
      * @param  string   $value
diff --git a/app/Core/Http/Request.php b/app/Core/Http/Request.php
index 7f1399e6..e0df2d3c 100644
--- a/app/Core/Http/Request.php
+++ b/app/Core/Http/Request.php
@@ -29,7 +29,12 @@ class Request extends Base
      * Constructor
      *
      * @access public
-     * @param  \Pimple\Container   $container
+     * @param \Pimple\Container $container
+     * @param array $server
+     * @param array $get
+     * @param array $post
+     * @param array $files
+     * @param array $cookies
      */
     public function __construct(Container $container, array $server = array(), array $get = array(), array $post = array(), array $files = array(), array $cookies = array())
     {
diff --git a/app/Model/TaskExport.php b/app/Model/TaskExport.php
index ed179a4f..64f5e77a 100644
--- a/app/Model/TaskExport.php
+++ b/app/Model/TaskExport.php
@@ -2,6 +2,7 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\DateParser;
 use PDO;
 
 /**
@@ -106,7 +107,7 @@ class TaskExport extends Base
         $task['score'] = $task['score'] ?: 0;
         $task['swimlane_id'] = isset($swimlanes[$task['swimlane_id']]) ? $swimlanes[$task['swimlane_id']] : '?';
 
-        $task = $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), 'Y-m-d');
+        $task = $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), DateParser::DATE_FORMAT);
 
         return $task;
     }
diff --git a/app/Model/Transition.php b/app/Model/Transition.php
index aa76d58f..870d95fd 100644
--- a/app/Model/Transition.php
+++ b/app/Model/Transition.php
@@ -3,7 +3,7 @@
 namespace Kanboard\Model;
 
 /**
- * Transition model
+ * Transition
  *
  * @package  model
  * @author   Frederic Guillot
@@ -21,20 +21,22 @@ class Transition extends Base
      * Save transition event
      *
      * @access public
-     * @param  integer  $user_id
-     * @param  array    $task
-     * @return boolean
+     * @param  integer $user_id
+     * @param  array   $task_event
+     * @return bool
      */
-    public function save($user_id, array $task)
+    public function save($user_id, array $task_event)
     {
+        $time = time();
+
         return $this->db->table(self::TABLE)->insert(array(
             'user_id' => $user_id,
-            'project_id' => $task['project_id'],
-            'task_id' => $task['task_id'],
-            'src_column_id' => $task['src_column_id'],
-            'dst_column_id' => $task['dst_column_id'],
-            'date' => time(),
-            'time_spent' => time() - $task['date_moved']
+            'project_id' => $task_event['project_id'],
+            'task_id' => $task_event['task_id'],
+            'src_column_id' => $task_event['src_column_id'],
+            'dst_column_id' => $task_event['dst_column_id'],
+            'date' => $time,
+            'time_spent' => $time - $task_event['date_moved']
         ));
     }
 
@@ -116,71 +118,11 @@ class Transition extends Base
                         ->lte('date', $to)
                         ->eq(self::TABLE.'.project_id', $project_id)
                         ->desc('date')
+                        ->desc(self::TABLE.'.id')
                         ->join(Task::TABLE, 'id', 'task_id')
                         ->join(User::TABLE, 'id', 'user_id')
                         ->join(Column::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src')
                         ->join(Column::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst')
                         ->findAll();
     }
-
-    /**
-     * Get project export
-     *
-     * @access public
-     * @param  integer    $project_id      Project id
-     * @param  mixed      $from            Start date (timestamp or user formatted date)
-     * @param  mixed      $to              End date (timestamp or user formatted date)
-     * @return array
-     */
-    public function export($project_id, $from, $to)
-    {
-        $results = array($this->getColumns());
-        $transitions = $this->getAllByProjectAndDate($project_id, $from, $to);
-
-        foreach ($transitions as $transition) {
-            $results[] = $this->format($transition);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Get column titles
-     *
-     * @access public
-     * @return string[]
-     */
-    public function getColumns()
-    {
-        return array(
-            e('Id'),
-            e('Task Title'),
-            e('Source column'),
-            e('Destination column'),
-            e('Executer'),
-            e('Date'),
-            e('Time spent'),
-        );
-    }
-
-    /**
-     * Format the output of a transition array
-     *
-     * @access public
-     * @param  array     $transition
-     * @return array
-     */
-    public function format(array $transition)
-    {
-        $values = array();
-        $values[] = $transition['id'];
-        $values[] = $transition['title'];
-        $values[] = $transition['src_column'];
-        $values[] = $transition['dst_column'];
-        $values[] = $transition['name'] ?: $transition['username'];
-        $values[] = date('Y-m-d H:i', $transition['date']);
-        $values[] = round($transition['time_spent'] / 3600, 2);
-
-        return $values;
-    }
 }
diff --git a/app/Model/TransitionExport.php b/app/Model/TransitionExport.php
new file mode 100644
index 00000000..33becb82
--- /dev/null
+++ b/app/Model/TransitionExport.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\DateParser;
+
+/**
+ * Transition Export
+ *
+ * @package  model
+ * @author   Frederic Guillot
+ */
+class TransitionExport extends Base
+{
+    /**
+     * Get project export
+     *
+     * @access public
+     * @param  integer    $project_id      Project id
+     * @param  mixed      $from            Start date (timestamp or user formatted date)
+     * @param  mixed      $to              End date (timestamp or user formatted date)
+     * @return array
+     */
+    public function export($project_id, $from, $to)
+    {
+        $results = array($this->getColumns());
+        $transitions = $this->transition->getAllByProjectAndDate($project_id, $from, $to);
+
+        foreach ($transitions as $transition) {
+            $results[] = $this->format($transition);
+        }
+
+        return $results;
+    }
+
+    /**
+     * Get column titles
+     *
+     * @access protected
+     * @return string[]
+     */
+    protected function getColumns()
+    {
+        return array(
+            e('Id'),
+            e('Task Title'),
+            e('Source column'),
+            e('Destination column'),
+            e('Executer'),
+            e('Date'),
+            e('Time spent'),
+        );
+    }
+
+    /**
+     * Format the output of a transition array
+     *
+     * @access protected
+     * @param  array     $transition
+     * @return array
+     */
+    protected function format(array $transition)
+    {
+        $values = array(
+            (int) $transition['id'],
+            $transition['title'],
+            $transition['src_column'],
+            $transition['dst_column'],
+            $transition['name'] ?: $transition['username'],
+            date($this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT), $transition['date']),
+            round($transition['time_spent'] / 3600, 2)
+        );
+
+        return $values;
+    }
+}
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 0f2fbab5..4f022571 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -74,6 +74,7 @@ class ClassProvider implements ServiceProviderInterface
             'TaskImport',
             'TaskMetadata',
             'Transition',
+            'TransitionExport',
             'User',
             'UserImport',
             'UserLocking',