From e1ddf7f0127e9745f94e5ff9f76ea828e9058720 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Mon, 15 Sep 2014 22:35:56 +0200
Subject: Run unit tests across different database backends + fix bugs

---
 app/Model/Project.php | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

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

diff --git a/app/Model/Project.php b/app/Model/Project.php
index 0ba18498..f8df1ae1 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -553,7 +553,8 @@ class Project extends Base
      */
     public function update(array $values)
     {
-        return $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
+        return $this->exists($values['id']) &&
+               $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
     }
 
     /**
@@ -568,6 +569,18 @@ class Project extends Base
         return $this->db->table(self::TABLE)->eq('id', $project_id)->remove();
     }
 
+    /**
+     * Return true if the project exists
+     *
+     * @access public
+     * @param  integer    $project_id   Project id
+     * @return boolean
+     */
+    public function exists($project_id)
+    {
+        return $this->db->table(self::TABLE)->eq('id', $project_id)->count() === 1;
+    }
+
     /**
      * Enable a project
      *
@@ -577,10 +590,11 @@ class Project extends Base
      */
     public function enable($project_id)
     {
-        return $this->db
+        return $this->exists($project_id) &&
+               $this->db
                     ->table(self::TABLE)
                     ->eq('id', $project_id)
-                    ->save(array('is_active' => 1));
+                    ->update(array('is_active' => 1));
     }
 
     /**
@@ -592,10 +606,11 @@ class Project extends Base
      */
     public function disable($project_id)
     {
-        return $this->db
+        return $this->exists($project_id) &&
+               $this->db
                     ->table(self::TABLE)
                     ->eq('id', $project_id)
-                    ->save(array('is_active' => 0));
+                    ->update(array('is_active' => 0));
     }
 
     /**
@@ -607,7 +622,8 @@ class Project extends Base
      */
     public function enablePublicAccess($project_id)
     {
-        return $this->db
+        return $this->exists($project_id) &&
+               $this->db
                     ->table(self::TABLE)
                     ->eq('id', $project_id)
                     ->save(array('is_public' => 1, 'token' => Security::generateToken()));
@@ -622,7 +638,8 @@ class Project extends Base
      */
     public function disablePublicAccess($project_id)
     {
-        return $this->db
+        return $this->exists($project_id) &&
+               $this->db
                     ->table(self::TABLE)
                     ->eq('id', $project_id)
                     ->save(array('is_public' => 0, 'token' => ''));
-- 
cgit v1.2.3