Fix method chaining

Author: baopham

composer.json

@@ -27,7 +27,8 @@
     "autoload-dev": {
         "classmap": [
             "tests/TestCase.php",
-            "tests/ModelTest.php"
+            "tests/ModelTest.php",
+            "tests/DynamoDbModelTest.php"
         ]
     }
 }

src/DynamoDbModel.php

@@ -57,6 +57,11 @@ abstract class DynamoDbModel extends Model
 
     protected $compositeKey = [];
 
+    /**
+     * @var DynamoDbModel
+     */
+    protected static $instance;
+
     public function __construct(array $attributes = [], DynamoDbClientService $dynamoDb = null)
     {
         $this->bootIfNotBooted();
@@ -70,11 +75,17 @@ public function __construct(array $attributes = [], DynamoDbClientService $dynam
         }
 
         $this->setupDynamoDb();
+
+        static::$instance = $this;
     }
 
     protected static function getInstance()
     {
-        return new static();
+        if (is_null(static::$instance)) {
+            static::$instance = new static;
+        }
+        
+        return static::$instance;
     }
 
     protected function setupDynamoDb()

tests/DynamoDbCompositeModelTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class DynamoDbCompositeModelTest extends ModelTest
+class DynamoDbCompositeModelTest extends DynamoDbModelTest
 {
     protected function getTestModel()
     {
@@ -45,16 +45,6 @@ public function testFindRecord()
         $this->assertEquals($seedName, $item->name);
     }
 
-    public function testGetAllRecords()
-    {
-        $this->seed();
-        $this->seed();
-
-        $items = $this->testModel->all()->toArray();
-
-        $this->assertEquals(2, count($items));
-    }
-
     public function testUpdateRecord()
     {
         $seed = $this->seed();
@@ -126,81 +116,6 @@ public function testDeleteRecord()
         $this->assertArrayNotHasKey('Item', $record);
     }
 
-    public function testGetAllRecordsWithEqualCondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 10]]);
-
-        $items = $this->testModel->where('count', 10)->get()->toArray();
-
-        $this->assertEquals(3, count($items));
-    }
-
-    public function testGetAllRecordsWithNonEqualCondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 11]]);
-        $this->seed(['count' => ['N' => 11]]);
-
-        $items = $this->testModel->where('count', '!=', 10)->get()->toArray();
-
-        $this->assertEquals(2, count($items));
-    }
-
-    public function testGetAllRecordsWithGTCondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 11]]);
-        $this->seed(['count' => ['N' => 11]]);
-
-        $items = $this->testModel->where('count', '>', 10)->get()->toArray();
-
-        $this->assertEquals(2, count($items));
-    }
-
-    public function testGetAllRecordsWithLTCondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 9]]);
-        $this->seed(['count' => ['N' => 11]]);
-
-        $items = $this->testModel->where('count', '<', 10)->get()->toArray();
-
-        $this->assertEquals(1, count($items));
-    }
-
-    public function testGetAllRecordsWithGECondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 9]]);
-        $this->seed(['count' => ['N' => 11]]);
-
-        $items = $this->testModel->where('count', '>=', 10)->get()->toArray();
-
-        $this->assertEquals(2, count($items));
-    }
-
-    public function testGetAllRecordsWithLECondition()
-    {
-        $this->seed(['count' => ['N' => 10]]);
-        $this->seed(['count' => ['N' => 9]]);
-        $this->seed(['count' => ['N' => 11]]);
-
-        $items = $this->testModel->where('count', '<=', 10)->get()->toArray();
-
-        $this->assertEquals(2, count($items));
-    }
-
-    public function testGetFirstRecord()
-    {
-        $firstItem = $this->seed();
-
-        $items = $this->testModel->first();
-
-        $this->assertEquals(array_get($firstItem, 'id.S'), $items->id);
-    }
-
     protected function seed($attributes = [])
     {
         $item = [

tests/DynamoDbModelTest.php

@@ -191,13 +191,45 @@ public function testGetFirstRecord()
         $this->assertEquals(array_get($firstItem, 'id.S'), $items->id);
     }
 
+    public function testChainedMethods()
+    {
+        $firstItem = $this->seed([
+            'name' => ['S' => 'Same Name'],
+            'description' => ['S' => 'First Description'],
+        ]);
+
+        $secondItem = $this->seed([
+            'name' => ['S' => 'Same Name'],
+            'description' => ['S' => 'Second Description'],
+        ]);
+
+        $foundItems = $this->testModel
+            ->where('name', $firstItem['name']['S'])
+            ->where('description', $firstItem['description']['S'])
+            ->all();
+
+        $this->assertEquals(1, $foundItems->count());
+
+        $this->assertEquals($this->testModel->unmarshalItem($firstItem), $foundItems->first()->toArray());
+
+        $foundItems = $this->testModel
+            ->where('name', $secondItem['name']['S'])
+            ->where('description', $secondItem['description']['S'])
+            ->all();
+
+        $this->assertEquals(1, $foundItems->count());
+
+        $this->assertEquals($this->testModel->unmarshalItem($secondItem), $foundItems->first()->toArray());
+    }
+
     protected function seed($attributes = [])
     {
         $item = [
             'id' => ['S' => str_random(36)],
             'name' => ['S' => str_random(36)],
             'description' => ['S' => str_random(256)],
             'count' => ['N' => rand()],
+            'author' => ['S' => str_random()],
         ];
 
         $item = array_merge($item, $attributes);

tests/ModelTest.php

@@ -48,6 +48,7 @@ protected function bindDynamoDbClientInstance()
             'version' => '2012-08-10',
             'endpoint' => 'http://localhost:3000',
         ];
+        
         $this->dynamoDb = new DynamoDbClientService($config, new Marshaler($marshalerOptions),
             new EmptyAttributeFilter);