Create new class SubtaskPositionModel

2 files changed, 47 insertions, 33 deletions

diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php
index f3fc72ba..5a4e87a2 100644
--- a/app/Model/SubtaskModel.php
+++ b/app/Model/SubtaskModel.php
@@ -273,39 +273,6 @@ class SubtaskModel extends Base
     }
 
     /**
-     * Save subtask position
-     *
-     * @access public
-     * @param  integer  $task_id
-     * @param  integer  $subtask_id
-     * @param  integer  $position
-     * @return boolean
-     */
-    public function changePosition($task_id, $subtask_id, $position)
-    {
-        if ($position < 1 || $position > $this->db->table(self::TABLE)->eq('task_id', $task_id)->count()) {
-            return false;
-        }
-
-        $subtask_ids = $this->db->table(self::TABLE)->eq('task_id', $task_id)->neq('id', $subtask_id)->asc('position')->findAllByColumn('id');
-        $offset = 1;
-        $results = array();
-
-        foreach ($subtask_ids as $current_subtask_id) {
-            if ($offset == $position) {
-                $offset++;
-            }
-
-            $results[] = $this->db->table(self::TABLE)->eq('id', $current_subtask_id)->update(array('position' => $offset));
-            $offset++;
-        }
-
-        $results[] = $this->db->table(self::TABLE)->eq('id', $subtask_id)->update(array('position' => $position));
-
-        return !in_array(false, $results, true);
-    }
-
-    /**
      * Change the status of subtask
      *
      * @access public
diff --git a/app/Model/SubtaskPositionModel.php b/app/Model/SubtaskPositionModel.php
new file mode 100644
index 00000000..3c26465d
--- /dev/null
+++ b/app/Model/SubtaskPositionModel.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\Base;
+
+/**
+ * Class SubtaskPositionModel
+ *
+ * @package Kanboard\Model
+ * @author  Frederic Guillot
+ */
+class SubtaskPositionModel extends Base
+{
+    /**
+     * Change subtask position
+     *
+     * @access public
+     * @param  integer  $task_id
+     * @param  integer  $subtask_id
+     * @param  integer  $position
+     * @return boolean
+     */
+    public function changePosition($task_id, $subtask_id, $position)
+    {
+        if ($position < 1 || $position > $this->db->table(SubtaskModel::TABLE)->eq('task_id', $task_id)->count()) {
+            return false;
+        }
+
+        $subtask_ids = $this->db->table(SubtaskModel::TABLE)->eq('task_id', $task_id)->neq('id', $subtask_id)->asc('position')->findAllByColumn('id');
+        $offset = 1;
+        $results = array();
+
+        foreach ($subtask_ids as $current_subtask_id) {
+            if ($offset == $position) {
+                $offset++;
+            }
+
+            $results[] = $this->db->table(SubtaskModel::TABLE)->eq('id', $current_subtask_id)->update(array('position' => $offset));
+            $offset++;
+        }
+
+        $results[] = $this->db->table(SubtaskModel::TABLE)->eq('id', $subtask_id)->update(array('position' => $position));
+
+        return !in_array(false, $results, true);
+    }
+}