Skip to content

Error with the Dynamo Pagination #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/Kitar/Dynamodb/Helpers/Collection.php
Original file line number Diff line number Diff line change
@@ -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;
}
}
15 changes: 12 additions & 3 deletions src/Kitar/Dynamodb/Query/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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;
}

Expand All @@ -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);
Expand All @@ -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)
Expand All @@ -108,6 +116,7 @@ public function processBatchGetItems(Result $awsResponse, $modelClass = null)

return $items->map(function ($item) use ($response) {
$item->setMeta($response);

return $item;
});
}
Expand Down