Skip to content
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"php": "^8.3",
"illuminate/contracts": "^11.0|^12.0",
"saloonphp/laravel-plugin": "^3.0",
"saloonphp/pagination-plugin": "^2.0",
"spatie/laravel-package-tools": "^1.16"
},
"require-dev": {
Expand Down
33 changes: 32 additions & 1 deletion src/FloatClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@

use Saloon\Http\Auth\TokenAuthenticator;
use Saloon\Http\Connector;
use Saloon\Http\Request;
use Saloon\Http\Response;
use Saloon\PaginationPlugin\Contracts\HasPagination;
use Saloon\PaginationPlugin\Paginator;
use Spatie\FloatSdk\Groups\AllocationsGroup;
use Spatie\FloatSdk\Groups\ClientsGroup;
use Spatie\FloatSdk\Groups\ProjectsGroup;
use Spatie\FloatSdk\Groups\TasksGroup;
use Spatie\FloatSdk\Groups\UsersGroup;

class FloatClient extends Connector
class FloatClient extends Connector implements HasPagination
{
public function __construct(
private string $apiKey,
Expand All @@ -36,6 +40,33 @@ protected function defaultAuth(): TokenAuthenticator
return new TokenAuthenticator($this->apiKey);
}

public function paginate(Request $request): Paginator
{
return new class(connector: $this, request: $request) extends Paginator
{
protected function isLastPage(Response $response): bool
{
return is_null($response->json('next_page_url'));
}

protected function getPageItems(Response $response, Request $request): array
{
return $response->json('items');
}

protected function applyPagination(Request $request): Request
{
$request->query()->add('page', $this->currentPage);

if (isset($this->perPageLimit)) {
$request->query()->add('per-page', $this->perPageLimit);
}

return $request;
}
};
}

public function users(): UsersGroup
{
return new UsersGroup($this);
Expand Down
9 changes: 7 additions & 2 deletions src/Groups/ProjectsGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Spatie\FloatSdk\Groups;

use Generator;
use Saloon\Http\BaseResource;
use Saloon\Http\Response;
use Spatie\FloatSdk\QueryParameters\GetProjectsParams;
Expand All @@ -15,8 +16,12 @@
return $this->connector->send(new GetProject($projectId));
}

public function all(?GetProjectsParams $parameters = null): Response
public function all(?GetProjectsParams $parameters = null): Generator
{
return $this->connector->send(new GetProjects($parameters));
$paginator = $this->connector->paginate(new GetProjects($parameters));

Check failure on line 21 in src/Groups/ProjectsGroup.php

View workflow job for this annotation

GitHub Actions / phpstan

Call to an undefined method Saloon\Http\Connector::paginate().

foreach ($paginator->paginate() as $response) {
yield $response;
}
}
}
3 changes: 2 additions & 1 deletion src/Requests/GetAllocations.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
use Saloon\Enums\Method;
use Saloon\Http\Request;
use Saloon\Http\Response;
use Saloon\PaginationPlugin\Contracts\Paginatable;
use Spatie\FloatSdk\QueryParameters\GetAllocationsParams;
use Spatie\FloatSdk\Resources\TaskResource;

class GetAllocations extends Request
class GetAllocations extends Request implements Paginatable
{
protected Method $method = Method::GET;

Expand Down
3 changes: 2 additions & 1 deletion src/Requests/GetProjects.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
use Saloon\Enums\Method;
use Saloon\Http\Request;
use Saloon\Http\Response;
use Saloon\PaginationPlugin\Contracts\Paginatable;
use Spatie\FloatSdk\QueryParameters\GetProjectsParams;
use Spatie\FloatSdk\Resources\ProjectResource;

class GetProjects extends Request
class GetProjects extends Request implements Paginatable
{
protected Method $method = Method::GET;

Expand Down
Loading