Merge pull request #40 from raphaelcangucu/fixLastEvaluatedKey

Error with the Dynamo Pagination

Author: kitar

src/Kitar/Dynamodb/Helpers/Collection.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Kitar\Dynamodb\Helpers;
+
+use Illuminate\Support\Collection as BaseCollection;
+
+class Collection extends BaseCollection
+{
+    /**
+     * @var array
+     */
+    private $meta;
+
+    /**
+     * @param  array  $meta
+     * @return $this
+     */
+    public function setMeta($meta)
+    {
+        $this->meta = $meta;
+
+        return $this;
+    }
+
+    /**
+     * Get meta data.
+     */
+    public function getMeta()
+    {
+        return $this->meta;
+    }
+
+    /**
+     * Get LastEvaluatedKey from meta
+     */
+    public function getLastEvaluatedKey()
+    {
+        return $this->meta['LastEvaluatedKey'] ?? null;
+    }
+}

src/Kitar/Dynamodb/Query/Processor.php

@@ -2,9 +2,10 @@
 
 namespace Kitar\Dynamodb\Query;
 
-use Aws\Result;
 use Aws\DynamoDb\Marshaler;
+use Aws\Result;
 use Illuminate\Database\Query\Processors\Processor as BaseProcessor;
+use Kitar\Dynamodb\Helpers\Collection;
 
 class Processor extends BaseProcessor
 {
@@ -56,6 +57,7 @@ public function processSingleItem(Result $awsResponse, $modelClass = null)
             $item = (new $modelClass)->newFromBuilder($response['Item']);
             unset($response['Item']);
             $item->setMeta($response ?? null);
+
             return $item;
         }
 
@@ -72,7 +74,7 @@ public function processMultipleItems(Result $awsResponse, $modelClass = null)
             return $response;
         }
 
-        $items = collect();
+        $items = new Collection([]);
 
         foreach ($response['Items'] as $item) {
             $item = (new $modelClass)->newFromBuilder($item);
@@ -81,10 +83,16 @@ public function processMultipleItems(Result $awsResponse, $modelClass = null)
 
         unset($response['Items']);
 
-        return $items->map(function ($item) use ($response) {
+        $items = $items->map(function ($item) use ($response) {
             $item->setMeta($response);
+
             return $item;
         });
+
+        // set meta at the collection level
+        $items->setMeta($response);
+
+        return $items;
     }
 
     public function processBatchGetItems(Result $awsResponse, $modelClass = null)
@@ -108,6 +116,7 @@ public function processBatchGetItems(Result $awsResponse, $modelClass = null)
 
         return $items->map(function ($item) use ($response) {
             $item->setMeta($response);
+
             return $item;
         });
     }