wip (#10)

src/Clients/AwsLambda/Client.php

@@ -28,7 +28,7 @@ public function request(string $method, $uri = '', array $options = [])
 
  protected function getPayload(string $method, string $url, array $options = []) : array
  {
- return  [
+ $returnOptions = [
  'path' => $url,
  'httpMethod' => $method,
  'headers' => $options['headers'] ?? [],
@@ -41,5 +41,11 @@ protected function getPayload(string $method, string $url, array $options = [])
  'body' => $options['json'] ?? '',
  'isBase64Encoded' => $options['isBase64Encoded'] ?? false,
  ];
+
+ if ($options['multiValueHeaders'] ?? false) {
+ $returnOptions['multiValueHeaders'] = $options['multiValueHeaders'];
+ }
+
+ return $returnOptions;
  }
 }

src/Clients/AwsLambda/Response.php

@@ -6,6 +6,21 @@
 
 class Response extends ClientResponse
 {
+ protected $decodedBody;
+
+ public function json($key = null, $default = null)
+ {
+ if (! $this->decodedBody) {
+ $this->decodedBody = json_decode($this->body(), true);
+ }
+
+ if (is_null($key)) {
+ return $this->decodedBody;
+ }
+
+ return data_get($this->decodedBody, $key, $default);
+ }
+
  public function getPayload() : array
  {
  if (! $this->decoded) {

src/Mixins/JsonApiRequestMixin.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use Sidigi\LaravelRemoteModels\Pagination\PaginationStrategyInterface;
+use Sidigi\LaravelRemoteModels\Response;
 use Sidigi\LaravelRemoteModels\Services\JsonApiRequest\FilterService;
 use Sidigi\LaravelRemoteModels\Services\JsonApiRequest\IncludeService;
 use Sidigi\LaravelRemoteModels\Services\JsonApiRequest\PaginateService;
@@ -107,12 +108,15 @@ public function getPaginationStrategy()
  public function perPage()
  {
  return function ($method = 'get', $sleep = null, ...$arguments) {
+ /**
+ * @var PaginationStrategyInterface
+ */
  $strategy = $this->getPaginationStrategy();
 
  do {
- $response = $this->$method(...$arguments);
+ $response = $this->$method($this->options['path'] ?? '', $arguments);
 
- yield $response;
+ yield new Response($response, config('laravel-remote-models.defaults.response_key', 'data'));
 
  $strategy->prepareForNextRequest();
 

src/Response.php

@@ -19,25 +19,11 @@ public function __construct(HttpClientResponse $response, string $responseKey)
  $this->responseKey = $responseKey;
  }
 
- public function get(string $index = '')
- {
- if (! $index) {
- return $this->json();
- }
-
- return data_get($this->json(), $index, []);
- }
-
- public function errors(string $key = 'errors')
- {
- return $this->get($key);
- }
-
  public function mapModel(string $model, Closure $callback = null, string $responseKey = null)
  {
  $responseKey = ! is_null($responseKey) ? $responseKey : $this->responseKey;
 
- $items = $this->get($responseKey) ?? [];
+ $items = $this->json($responseKey) ?? [];
 
  return (new DataModelConverter($model))->convert($items, $callback);
  }