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
9 changes: 5 additions & 4 deletions app/Http/Controllers/Api/V1/Article/GetArticlesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
namespace App\Http\Controllers\Api\V1\Article;

use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Article\GetArticlesRequest;
use App\Http\Resources\Api\V1\Article\ArticleResource;
use App\Http\Requests\V1\Article\GetArticlesRequest;
use App\Http\Resources\MetaResource;
use App\Http\Resources\V1\Article\ArticleResource;
use App\Services\ArticleService;
use Dedoc\Scramble\Attributes\Group;
use Illuminate\Http\JsonResponse;
Expand All @@ -26,7 +27,7 @@ public function __construct(
*
* @unauthenticated
*
* @response array{status: true, message: string, data: array{data: ArticleResource[], links: array, meta: array}}
* @response array{status: true, message: string, data: array{articles: ArticleResource[], meta: MetaResource}}
*/
public function __invoke(GetArticlesRequest $request): JsonResponse
{
Expand All @@ -50,7 +51,7 @@ public function __invoke(GetArticlesRequest $request): JsonResponse
return response()->apiSuccess(
[
'articles' => $articleCollectionData['data'],
'meta' => $articleCollectionData['meta'],
'meta' => MetaResource::make($articleCollectionData['meta']),
],
__('common.success')
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace App\Http\Controllers\Api\V1\Article;

use App\Http\Controllers\Controller;
use App\Http\Resources\Api\V1\Article\ArticleResource;
use App\Http\Resources\V1\Article\ArticleResource;
use App\Services\ArticleService;
use Dedoc\Scramble\Attributes\Group;
use Illuminate\Database\Eloquent\ModelNotFoundException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace App\Http\Requests\Api\V1\Article;
namespace App\Http\Requests\V1\Article;

use App\Enums\ArticleStatus;
use Illuminate\Foundation\Http\FormRequest;
Expand Down
37 changes: 37 additions & 0 deletions app/Http/Resources/MetaResource.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace App\Http\Resources;

use Illuminate\Http\Resources\Json\JsonResource;

class MetaResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array<string, mixed>
*/
public function toArray($request): array
{
/** @var array<int, array<string, mixed>> $links */
$links = $this['links'] ?? [];

return [
'current_page' => $this['current_page'] ?? null,
'from' => $this['from'] ?? null,
'last_page' => $this['last_page'] ?? null,
'links' => collect($links)->map(function (array $link): array {
return [
'url' => $link['url'] ?? null,
'label' => $link['label'] ?? null,
'active' => $link['active'] ?? false,
];
})->values(),
'path' => $this['path'] ?? null,
'per_page' => $this['per_page'] ?? null,
'to' => $this['to'] ?? null,
'total' => $this['total'] ?? null,
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace App\Http\Resources\Api\V1\Article;
namespace App\Http\Resources\V1\Article;

use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
Expand Down