Adding additional check for User::getNextId method. photo#1230

Author: jmathai

src/libraries/models/User.php

@@ -139,7 +139,9 @@ public function getNextId($type)
     $nextIntId = base_convert($user[$key], 31, 10) + 1;
     $nextId = base_convert($nextIntId, 10, 31);
 
-    $this->update(array($key => $nextId));
+    $status = $this->update(array($key => $nextId));
+    if(!$status)
+      return false;
     return $nextId;
   }
 

src/tests/libraries/models/UserTest.php

@@ -223,6 +223,26 @@ public function testGetNextIdFailure()
     $this->assertFalse($res);
   }
 
+  public function testGetNextIdUpdateFailure()
+  {
+    $db = $this->getMock('Db', array('getUser', 'postUser', 'putUser'));
+    $db->expects($this->any())
+      ->method('getUser')
+      ->will($this->onConsecutiveCalls(
+        array('id' => 'test@example.com', 'lastPhotoId' => 'abc'),
+        array('id' => '', 'lastPhotoId' => '')
+      ));
+    $db->expects($this->any())
+      ->method('postUser')
+      ->will($this->returnValue(false));
+    $this->user->inject('db', $db);
+
+    // abc
+    $res = $this->user->getNextId('photo');
+    $this->assertEquals(false, $res);
+  }
+
+
   public function testGetAttributeNameSuccess()
   {
     $res = $this->user->getAttributeName('foobar');