Merge branch 'main' into feature/add-form-resquest-and-optimize

Author: tanhongit

phpstan-baseline.neon

@@ -25,3 +25,6 @@ parameters:
 
         -
           identifier: method.notFound
+
+        - identifier: function.alreadyNarrowedType
+          path: src/Http/Resources/Post/ListPostResource.php

src/Http/Controllers/PostController.php

@@ -121,7 +121,7 @@ public function index(Request $request): BaseHttpResponse|JsonResponse|JsonResou
         $data = $this
             ->postRepository
             ->advancedGet([
-                'with' => ['tags', 'categories', 'author', 'slugable'],
+                'with' => ['tags', 'categories', 'author', 'likes', 'slugable'],
                 'condition' => ['status' => StatusEnum::PUBLISHED->value],
                 'paginate' => [
                     'per_page' => $request->integer('per_page', 10),
@@ -211,7 +211,7 @@ public function findBySlug(string $slug): BaseHttpResponse|JsonResponse|JsonReso
         }
 
         $post = Post::query()
-            ->with(['tags', 'categories', 'author'])
+            ->with(['tags', 'categories', 'author', 'likes'])
             ->where([
                 'id' => $slug->reference_id,
                 'status' => StatusEnum::PUBLISHED,

src/Http/Resources/Author/AuthorResource.php

@@ -22,6 +22,9 @@ public function toArray($request): array
             'id' => $this->id,
             'first_name' => $this->first_name,
             'last_name' => $this->last_name,
+            'full_name' => $this->first_name && $this->last_name
+                ? $this->first_name . ' ' . $this->last_name
+                : ($this->first_name ?? $this->last_name ?? 'Base Member'),
             'image' => $this->avatar_url,
             'role' => $this->roles?->first()->name ?? null,
         ];

src/Http/Resources/Category/CategoryResource.php

@@ -23,7 +23,7 @@ public function toArray($request): array
             'id' => $this->id,
             'name' => $this->name,
             'slug' => $this->slug instanceof Slug ? $this->slug->key : $this->slug,
-            'url' => $this->url,
+            // 'url' => $this->url,
             'icon' => $this->icon,
             'description' => $this->description,
         ];

src/Http/Resources/Post/ListPostResource.php

@@ -33,6 +33,7 @@ public function toArray($request): array
             'categories' => CategoryResource::collection($this->categories),
             'tags' => TagResource::collection($this->tags),
             'author' => AuthorResource::make($this->author),
+            'likes_count' => method_exists($this, 'likesCountDigital') ? $this->likesCountDigital() : 0,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];

src/Http/Resources/Post/PostResource.php

@@ -33,6 +33,7 @@ public function toArray($request): array
             'categories' => CategoryResource::collection($this->categories),
             'tags' => TagResource::collection($this->tags),
             'author' => AuthorResource::make($this->author),
+            'likes_count' => $this->likesCountDigital(),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];

src/OpenApi/Schemas/Resources/Author/AuthorModelResourceSchema.php

@@ -12,6 +12,7 @@
         new Property(property: "id", type: "integer", uniqueItems: true),
         new Property(property: "first_name", description: "Author first_name", type: "string", maxLength: 120, nullable: true),
         new Property(property: "last_name", description: "Author last_name", type: "string", maxLength: 120, nullable: true),
+        new Property(property: "full_name", description: "Author full_name", type: "string", maxLength: 255, nullable: true),
         new Property(property: "image", description: "Author image", type: "string", maxLength: 255, nullable: true),
         new Property(property: "role", description: "Author role", type: "string", maxLength: 120),
     ],

src/OpenApi/Schemas/Resources/Post/PostListResourceSchema.php

@@ -33,6 +33,7 @@
             ref: AuthorModelResourceSchema::class,
             type: "object",
         ),
+        new Property(property: "likes_count", description: "Likes count", type: "string", nullable: true),
         new Property(property: "created_at", description: "Post created at", type: "datetime", nullable: true),
         new Property(property: "updated_at", description: "Post updated at", type: "datetime", nullable: true),
     ],

src/OpenApi/Schemas/Resources/Post/PostModelResourceSchema.php

@@ -34,6 +34,7 @@
             ref: AuthorModelResourceSchema::class,
             type: "object",
         ),
+        new Property(property: "likes_count", description: "Likes count", type: "string", nullable: true),
         new Property(property: "created_at", description: "Post created at", type: "datetime", nullable: true),
         new Property(property: "updated_at", description: "Post updated at", type: "datetime", nullable: true),
     ],

src/Services/PostService.php

@@ -27,7 +27,7 @@ class PostService
      */
     public function getCustomFilters(array $filters): LengthAwarePaginator
     {
-        $data = Post::query();
+        $data = Post::query()->with(['likes']);
 
         if ($filters['tags'] !== null) {
             $tags = array_filter((array) $filters['tags']);