Merge remote-tracking branch 'kitar/make-update-item-returns-new-values' into feature/increment-decrement

Author: mehedimi

src/Kitar/Dynamodb/Query/Builder.php

@@ -274,7 +274,7 @@ public function deleteItem($key)
      * Update item.
      *
      * @param array $item
-     * @return \Aws\Result
+     * @return array|null
      */
     public function updateItem($item)
     {
@@ -292,7 +292,7 @@ public function updateItem($item)
             }
         }
 
-        return $this->process('updateItem', null);
+        return $this->process('updateItem', 'processSingleItem');
     }
 
     /**

src/Kitar/Dynamodb/Query/Grammar.php

@@ -130,7 +130,8 @@ public function compileUpdates($updates)
         }
 
         return [
-            'UpdateExpression' => implode(' ', $expressions)
+            'UpdateExpression' => implode(' ', $expressions),
+            'ReturnValues' => 'UPDATED_NEW',
         ];
     }
 

src/Kitar/Dynamodb/Query/Processor.php

@@ -29,6 +29,10 @@ protected function unmarshal(Result $res)
             }
         }
 
+        if (! empty($responseArray['Attributes'])) {
+            $responseArray['Attributes'] = $this->marshaler->unmarshalItem($responseArray['Attributes']);
+        }
+
         return $responseArray;
     }
 
@@ -46,6 +50,10 @@ public function processSingleItem(Result $awsResponse, $modelClass = null)
             $item->setMeta($response ?? null);
             return $item;
         }
+
+        if (! empty($response['Attributes'])) {
+            return $response;
+        }
     }
 
     public function processMultipleItems(Result $awsResponse, $modelClass = null)

tests/Model/AuthUserProviderTest.php

@@ -255,6 +255,7 @@ public function it_can_update_remember_token()
                 ]
             ],
             'UpdateExpression' => 'set #1 = :1',
+            'ReturnValues' => 'UPDATED_NEW',
             'ExpressionAttributeNames' => [
                 '#1' => 'remember_token'
             ],
@@ -263,7 +264,7 @@ public function it_can_update_remember_token()
                     'S' => 'new_token'
                 ]
             ]
-        ]);
+        ])->andReturn($this->sampleAwsResultEmpty());
         $this->setConnectionResolver($connection);
 
         $provider = new AuthUserProvider($this->hasher, UserA::class);

tests/Model/ModelTest.php

@@ -36,6 +36,15 @@ protected function newConnectionMock()
         return $connection;
     }
 
+    protected function sampleAwsResultEmpty()
+    {
+        return new Result([
+            '@metadata' => [
+                'statuscode' => 200
+            ]
+        ]);
+    }
+
     /** @test */
     public function it_can_create_new_instance()
     {
@@ -446,6 +455,7 @@ public function it_can_save_existing_instance()
                 ]
             ],
             'UpdateExpression' => 'set #1 = :1',
+            'ReturnValues' => 'UPDATED_NEW',
             'ExpressionAttributeNames' => [
                 '#1' => 'name'
             ],
@@ -457,7 +467,7 @@ public function it_can_save_existing_instance()
         ];
 
         $connection = $this->newConnectionMock();
-        $connection->shouldReceive('updateItem')->with($params);
+        $connection->shouldReceive('updateItem')->with($params)->andReturn($this->sampleAwsResultEmpty());
         $this->setConnectionResolver($connection);
 
         $user = (new UserA)->newFromBuilder(['partition' => 'p']);

tests/Query/BuilderTest.php

@@ -668,6 +668,7 @@ public function it_can_process_update_item()
                 ]
             ],
             'UpdateExpression' => 'set #1 = :1, #2 = :2 remove #3, #4',
+            'ReturnValues' => 'UPDATED_NEW',
             'ExpressionAttributeNames' => [
                 '#1' => 'LastPostedBy',
                 '#2' => 'Replies',
@@ -683,6 +684,7 @@ public function it_can_process_update_item()
                 ]
             ]
         ];
+        $processor = 'processSingleItem';
 
         $query = $this->newQuery('Thread')
              ->key([
@@ -697,7 +699,7 @@ public function it_can_process_update_item()
 
         $this->assertEquals($method, $query['method']);
         $this->assertEquals($params, $query['params']);
-        $this->assertNull($query['processor']);
+        $this->assertEquals($processor, $query['processor']);
     }
 
     /** @test */