Skip to content

Commit a359ec4

Browse files
committed
fix(article): fix API Responses and paths
fixed the api responses for article API
1 parent fa3831e commit a359ec4

File tree

5 files changed

+45
-7
lines changed

5 files changed

+45
-7
lines changed

app/Http/Controllers/Api/V1/Article/GetArticlesController.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
namespace App\Http\Controllers\Api\V1\Article;
66

77
use App\Http\Controllers\Controller;
8-
use App\Http\Requests\Api\V1\Article\GetArticlesRequest;
9-
use App\Http\Resources\Api\V1\Article\ArticleResource;
8+
use App\Http\Requests\V1\Article\GetArticlesRequest;
9+
use App\Http\Resources\MetaResource;
10+
use App\Http\Resources\V1\Article\ArticleResource;
1011
use App\Services\ArticleService;
1112
use Dedoc\Scramble\Attributes\Group;
1213
use Illuminate\Http\JsonResponse;
@@ -26,7 +27,7 @@ public function __construct(
2627
*
2728
* @unauthenticated
2829
*
29-
* @response array{status: true, message: string, data: array{data: ArticleResource[], links: array, meta: array}}
30+
* @response array{status: true, message: string, data: array{articles: ArticleResource[], meta: MetaResource}}
3031
*/
3132
public function __invoke(GetArticlesRequest $request): JsonResponse
3233
{
@@ -50,7 +51,7 @@ public function __invoke(GetArticlesRequest $request): JsonResponse
5051
return response()->apiSuccess(
5152
[
5253
'articles' => $articleCollectionData['data'],
53-
'meta' => $articleCollectionData['meta'],
54+
'meta' => MetaResource::make($articleCollectionData['meta']),
5455
],
5556
__('common.success')
5657
);

app/Http/Controllers/Api/V1/Article/ShowArticleController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace App\Http\Controllers\Api\V1\Article;
66

77
use App\Http\Controllers\Controller;
8-
use App\Http\Resources\Api\V1\Article\ArticleResource;
8+
use App\Http\Resources\V1\Article\ArticleResource;
99
use App\Services\ArticleService;
1010
use Dedoc\Scramble\Attributes\Group;
1111
use Illuminate\Database\Eloquent\ModelNotFoundException;

app/Http/Requests/Api/V1/Article/GetArticlesRequest.php renamed to app/Http/Requests/V1/Article/GetArticlesRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace App\Http\Requests\Api\V1\Article;
5+
namespace App\Http\Requests\V1\Article;
66

77
use App\Enums\ArticleStatus;
88
use Illuminate\Foundation\Http\FormRequest;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
namespace App\Http\Resources;
4+
5+
use Illuminate\Http\Resources\Json\JsonResource;
6+
7+
class MetaResource extends JsonResource
8+
{
9+
/**
10+
* Transform the resource into an array.
11+
*
12+
* @param \Illuminate\Http\Request $request
13+
* @return array<string, mixed>
14+
*/
15+
public function toArray($request): array
16+
{
17+
/** @var array<int, array<string, mixed>> $links */
18+
$links = $this['links'] ?? [];
19+
20+
return [
21+
'current_page' => $this['current_page'] ?? null,
22+
'from' => $this['from'] ?? null,
23+
'last_page' => $this['last_page'] ?? null,
24+
'links' => collect($links)->map(function (array $link): array {
25+
return [
26+
'url' => $link['url'] ?? null,
27+
'label' => $link['label'] ?? null,
28+
'active' => $link['active'] ?? false,
29+
];
30+
})->values(),
31+
'path' => $this['path'] ?? null,
32+
'per_page' => $this['per_page'] ?? null,
33+
'to' => $this['to'] ?? null,
34+
'total' => $this['total'] ?? null,
35+
];
36+
}
37+
}

app/Http/Resources/Api/V1/Article/ArticleResource.php renamed to app/Http/Resources/V1/Article/ArticleResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace App\Http\Resources\Api\V1\Article;
5+
namespace App\Http\Resources\V1\Article;
66

77
use Illuminate\Http\Request;
88
use Illuminate\Http\Resources\Json\JsonResource;

0 commit comments

Comments
 (0)