Skip to content

Commit 6f26cad

Browse files
committed
refactor: rename pagination parameter 'page' to 'current_page'
1 parent 2aa3dfc commit 6f26cad

File tree

20 files changed

+28
-28
lines changed

20 files changed

+28
-28
lines changed

contexts/ArticlePublishing/Application/Coordinators/ArticlePublishingCoordinator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function getArticleList(GetArticleListDTO $data): LengthAwarePaginator
112112
{
113113
$viewer = $this->viewerGateway->getCurrentViewer();
114114

115-
$paginator = $this->repository->paginate($data->page, $data->perPage, $data->toCriteria());
115+
$paginator = $this->repository->paginate($data->currentPage, $data->perPage, $data->toCriteria());
116116

117117
$paginator->getCollection()->transform(function (Article $article) use ($viewer) {
118118
return (new VisibilityPolicy($viewer))->fromArticle($article);

contexts/ArticlePublishing/Application/DTOs/GetArticleListDTO.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function __construct(
1313
public readonly ?int $categoryId,
1414
public readonly ?int $authorId,
1515
public readonly ?array $createdAtRange,
16-
public readonly int $page,
16+
public readonly int $currentPage,
1717
public readonly int $perPage,
1818
) {}
1919

@@ -26,7 +26,7 @@ public static function fromRequest(array $data): self
2626
$data['category_id'] ?? null,
2727
$data['author_id'] ?? null,
2828
$data['created_at_range'] ?? null,
29-
$data['page'] ?? 1,
29+
$data['current_page'] ?? 1,
3030
$data['per_page'] ?? 10,
3131
);
3232
}

contexts/ArticlePublishing/Domain/Repositories/ArticleRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function getById(ArticleId $articleId): Article;
1616

1717
public function update(Article $article): Article;
1818

19-
public function paginate(int $page = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator;
19+
public function paginate(int $currentPage = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator;
2020

2121
public function delete(Article $article): void;
2222
}

contexts/ArticlePublishing/Infrastructure/Persistence/ArticlePersistence.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public function update(Article $article): Article
7171
return $record->toDomain($article->getEvents());
7272
}
7373

74-
public function paginate(int $page = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator
74+
public function paginate(int $currentPage = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator
7575
{
76-
$paginator = ArticleRecord::query()->search($criteria)->paginate($perPage, ['*'], 'page', $page);
76+
$paginator = ArticleRecord::query()->search($criteria)->paginate($perPage, ['*'], 'current_page', $currentPage);
7777

7878
$paginator->getCollection()->transform(function ($record) {
7979
return $record->toDomain();

contexts/ArticlePublishing/Presentation/Requests/GetArticleListRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function rules(): array
1818
'author_id' => ['integer', 'gt:0'],
1919
'created_at_range' => ['array', 'size:2'],
2020
'created_at_range.*' => ['date'],
21-
'page' => ['integer', 'gt:0'],
21+
'current_page' => ['integer', 'gt:0'],
2222
'per_page' => ['integer', 'gt:0'],
2323
];
2424
}

contexts/Authorization/Application/Coordinators/RoleCoordinator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getRole(int $id): Role
3939

4040
public function getRoleList(GetRoleListDTO $data): LengthAwarePaginator
4141
{
42-
return $this->repository->paginate($data->page, $data->perPage, $data->toCriteria());
42+
return $this->repository->paginate($data->currentPage, $data->perPage, $data->toCriteria());
4343
}
4444

4545
public function updateRole(int $id, UpdateRoleDTO $data): Role

contexts/Authorization/Application/Coordinators/UserIdentityCoordinator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getUser(int $id): UserIdentity
4545

4646
public function getUserList(GetUserListDTO $data): LengthAwarePaginator
4747
{
48-
return $this->repository->paginate($data->page, $data->perPage, $data->toCriteria());
48+
return $this->repository->paginate($data->currentPage, $data->perPage, $data->toCriteria());
4949
}
5050

5151
public function updateUser(int $id, UpdateUserDTO $data): UserIdentity

contexts/Authorization/Application/DTOs/Role/GetRoleListDTO.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function __construct(
1111
public readonly ?string $label,
1212
public readonly ?string $status,
1313
public readonly ?array $createdAtRange,
14-
public readonly int $page,
14+
public readonly int $currentPage,
1515
public readonly int $perPage,
1616
) {}
1717

@@ -22,7 +22,7 @@ public static function fromRequest(array $data): self
2222
$data['label'] ?? null,
2323
$data['status'] ?? null,
2424
$data['created_at_range'] ?? null,
25-
$data['page'] ?? 1,
25+
$data['current_page'] ?? 1,
2626
$data['per_page'] ?? 10,
2727
);
2828
}

contexts/Authorization/Application/DTOs/User/GetUserListDTO.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function __construct(
1212
public readonly ?string $display_name,
1313
public readonly ?string $status,
1414
public readonly ?array $createdAtRange,
15-
public readonly int $page,
15+
public readonly int $currentPage,
1616
public readonly int $perPage,
1717
) {}
1818

@@ -24,7 +24,7 @@ public static function fromRequest(array $data): self
2424
$data['display_name'] ?? null,
2525
$data['status'] ?? null,
2626
$data['created_at_range'] ?? null,
27-
$data['page'] ?? 1,
27+
$data['current_page'] ?? 1,
2828
$data['per_page'] ?? 10,
2929
);
3030
}

contexts/Authorization/Domain/Repositories/RoleRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function getByIds(array $roleIds): Collection;
1919

2020
public function update(Role $role): Role;
2121

22-
public function paginate(int $page = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator;
22+
public function paginate(int $currentPage = 1, int $perPage = 10, array $criteria = []): LengthAwarePaginator;
2323

2424
public function delete(Role $role): void;
2525

0 commit comments

Comments
 (0)