Merge pull request #565 from HRAshton/dev0413

Fix documentation of watch_promos and pagination_plus

Author: irfan-dahir

app/Http/Controllers/V4DB/WatchController.php

@@ -144,39 +144,26 @@ public function popularEpisodes(QueryPopularEpisodesCommand $command)
      *      allOf={
      *          @OA\Schema(ref="#/components/schemas/pagination"),
      *          @OA\Schema(
-     *
-     *              allOf={
-     *                  @OA\Schema(
+     *              @OA\Property(
+     *                  property="data",
+     *                  type="array",
+     *                  @OA\Items(
+     *                      type="object",
      *                      @OA\Property(
      *                          property="title",
      *                          type="string",
      *                          description="Promo Title"
      *                      ),
-     *                  ),
-     *                  @OA\Schema (
      *                      @OA\Property(
-     *                           property="data",
-     *                           type="array",
-     *
-     *                           @OA\Items(
-     *                              type="object",
-     *                               @OA\Property(
-     *                                   property="entry",
-     *                                   type="object",
-     *                                   ref="#/components/schemas/anime_meta"
-     *                               ),
-     *                              @OA\Property(
-     *                                  property="trailer",
-     *                                  type="array",
-     *                                  @OA\Items(
-     *                                      type="object",
-     *                                      ref="#/components/schemas/trailer",
-     *                                  ),
-     *                              ),
-     *                          ),
+     *                          property="entry",
+     *                          ref="#/components/schemas/anime_meta"
+     *                      ),
+     *                      @OA\Property(
+     *                          property="trailer",
+     *                          ref="#/components/schemas/trailer",
      *                      ),
      *                  ),
-     *              },
+     *              ),
      *          ),
      *     },
      *  ),

app/Http/Resources/V4/CommonResource.php

@@ -326,6 +326,10 @@ class CommonResource extends JsonResource
      *               property="has_next_page",
      *               type="boolean"
      *          ),
+     *          @OA\Property(
+     *               property="current_page",
+     *               type="integer"
+     *          ),
      *
      *          @OA\Property (
      *              property="items",

storage/api-docs/api-docs.json

@@ -4913,39 +4913,27 @@
                         "$ref": "#/components/schemas/pagination"
                     },
                     {
-                        "allOf": [
-                            {
-                                "properties": {
-                                    "title": {
-                                        "description": "Promo Title",
-                                        "type": "string"
-                                    }
-                                },
-                                "type": "object"
-                            },
-                            {
-                                "properties": {
-                                    "data": {
-                                        "type": "array",
-                                        "items": {
-                                            "properties": {
-                                                "entry": {
-                                                    "$ref": "#/components/schemas/anime_meta"
-                                                },
-                                                "trailer": {
-                                                    "type": "array",
-                                                    "items": {
-                                                        "$ref": "#/components/schemas/trailer"
-                                                    }
-                                                }
-                                            },
-                                            "type": "object"
+                        "type": "object",
+                        "properties": {
+                            "data": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "title": {
+                                            "description": "Promo Title",
+                                            "type": "string"
+                                        },
+                                        "entry": {
+                                            "$ref": "#/components/schemas/anime_meta"
+                                        },
+                                        "trailer": {
+                                            "$ref": "#/components/schemas/trailer"
                                         }
                                     }
-                                },
-                                "type": "object"
+                                }
                             }
-                        ]
+                        }
                     }
                 ]
             },
@@ -6417,6 +6405,9 @@
                             "has_next_page": {
                                 "type": "boolean"
                             },
+                            "current_page": {
+                                "type": "integer"
+                            },
                             "items": {
                                 "properties": {
                                     "count": {