Fix removeAttribute not syncing back the new attribute values

Closes #152
baopham · Nov 10, 2018 · 413af4e · 413af4e
1 parent 7367d68
commit 413af4e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/src/DynamoDbQueryBuilder.php b/src/DynamoDbQueryBuilder.php
@@ -586,14 +586,23 @@ public function removeAttribute(...$attributes)
 
         $this->resetExpressions();
 
+        /** @var \Aws\Result $result */
         $result = DynamoDb::table($this->model->getTable())
             ->setKey($key)
             ->setUpdateExpression($this->updateExpression->remove($attributes))
             ->setExpressionAttributeNames($this->expressionAttributeNames->all())
+            ->setReturnValues('ALL_NEW')
             ->prepare($this->client)
             ->updateItem();
 
-        return array_get($result, '@metadata.statusCode') === 200;
+        $success = array_get($result, '@metadata.statusCode') === 200;
+
+        if ($success) {
+            $this->model->setRawAttributes(DynamoDb::unmarshalItem($result->get('Attributes')));
+            $this->model->syncOriginal();
+        }
+
+        return $success;
     }
 
     public function delete()

diff --git a/tests/DynamoDbCompositeModelTest.php b/tests/DynamoDbCompositeModelTest.php
@@ -495,6 +495,9 @@ public function testRemoveNestedAttribute()
             ->where('id2', 'bar')
             ->removeAttribute('nested.foo');
 
+        $this->assertArrayNotHasKey('foo', $this->testModel->nested);
+        $this->assertFalse($this->testModel->isDirty());
+
         $item = $this->testModel->find(['id' => 'foo', 'id2' => 'bar']);
         $this->assertArrayNotHasKey('foo', $item->nested);
     }
@@ -511,8 +514,10 @@ public function testRemoveAttributesOnQuery()
             ->where('id2', 'bar')
             ->removeAttribute('description', 'name', 'nested.foo', 'nested.nestedArray[0]', 'nestedArray[0]');
 
-        $item = $this->testModel->find(['id' => 'foo', 'id2' => 'bar']);
+        $this->assertRemoveAttributes($this->testModel);
+        $this->assertFalse($this->testModel->isDirty());
 
+        $item = $this->testModel->find(['id' => 'foo', 'id2' => 'bar']);
         $this->assertRemoveAttributes($item);
     }
 
@@ -525,9 +530,12 @@ public function testRemoveAttributesOnModel()
 
         $item = $this->testModel->first();
         $item->removeAttribute('description', 'name', 'nested.foo', 'nested.nestedArray[0]', 'nestedArray[0]');
-        $item = $this->testModel->first();
 
         $this->assertRemoveAttributes($item);
+        $this->assertFalse($item->isDirty());
+
+        $item = $this->testModel->first();
+        $this->assertRemoveAttributes($item);
     }
 
     public function testAfterForQueryOperation()

diff --git a/tests/DynamoDbNonCompositeModelTest.php b/tests/DynamoDbNonCompositeModelTest.php
@@ -786,6 +786,9 @@ public function testRemoveNestedAttribute()
             ->where('id', 'foo')
             ->removeAttribute('nested.foo');
 
+        $this->assertArrayNotHasKey('foo', $this->testModel->nested);
+        $this->assertFalse($this->testModel->isDirty());
+
         $item = $this->testModel->find('foo');
         $this->assertArrayNotHasKey('foo', $item->nested);
     }
@@ -798,6 +801,9 @@ public function testRemoveAttributesOnQuery()
             ->where('id', 'foo')
             ->removeAttribute('description', 'name', 'nested.foo', 'nested.nestedArray[0]', 'nestedArray[0]');
 
+        $this->assertRemoveAttributes($this->testModel);
+        $this->assertFalse($this->testModel->isDirty());
+
         $item = $this->testModel->find('foo');
         $this->assertRemoveAttributes($item);
     }
@@ -808,9 +814,12 @@ public function testRemoveAttributesOnModel()
 
         $item = $this->testModel->first();
         $item->removeAttribute('description', 'name', 'nested.foo', 'nested.nestedArray[0]', 'nestedArray[0]');
-        $item = $this->testModel->first();
 
         $this->assertRemoveAttributes($item);
+        $this->assertFalse($item->isDirty());
+
+        $item = $this->testModel->first();
+        $this->assertRemoveAttributes($item);
     }
 
     public function testAfterForQueryOperation()