From b2da69b676db7fe99b25b8f6137a2bd32fd08cba Mon Sep 17 00:00:00 2001 From: Wouter Koppenol Date: Mon, 27 Jan 2025 23:31:51 +0100 Subject: [PATCH] #2662 Fixed Zolramus and removed pagination from the dungeon list API endpoint --- .../V1/Public/Dungeon/APIDungeonController.php | 2 +- .../Dungeon/DungeonEnvelopeResource.php | 2 -- database/seeders/dungeondata/dungeons.json | 18 +++++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Api/V1/Public/Dungeon/APIDungeonController.php b/app/Http/Controllers/Api/V1/Public/Dungeon/APIDungeonController.php index 4e77ae90d..2ba4566c0 100644 --- a/app/Http/Controllers/Api/V1/Public/Dungeon/APIDungeonController.php +++ b/app/Http/Controllers/Api/V1/Public/Dungeon/APIDungeonController.php @@ -27,7 +27,7 @@ class APIDungeonController extends Controller public function get(Request $request): DungeonEnvelopeResource { return new DungeonEnvelopeResource( - Dungeon::active()->paginate(50) + Dungeon::active()->get() ); } /** diff --git a/app/Http/Resources/Dungeon/DungeonEnvelopeResource.php b/app/Http/Resources/Dungeon/DungeonEnvelopeResource.php index 3e26bef0e..0430d21f9 100644 --- a/app/Http/Resources/Dungeon/DungeonEnvelopeResource.php +++ b/app/Http/Resources/Dungeon/DungeonEnvelopeResource.php @@ -9,8 +9,6 @@ /** * @OA\Schema(schema="DungeonEnvelope") * @OA\Property(type="array",property="data",@OA\Items(ref="#/components/schemas/Dungeon")) - * @OA\Property(ref="#/components/schemas/PaginationLinks",property="links") - * @OA\Property(ref="#/components/schemas/PaginationMeta",property="meta") * * @author Wouter * diff --git a/database/seeders/dungeondata/dungeons.json b/database/seeders/dungeondata/dungeons.json index 07bd67846..6c2f374e0 100644 --- a/database/seeders/dungeondata/dungeons.json +++ b/database/seeders/dungeondata/dungeons.json @@ -3694,10 +3694,10 @@ "max_enemy_size": null, "enemy_engagement_max_range": null, "enemy_engagement_max_range_patrols": null, - "ingame_min_x": 3336.3, - "ingame_min_y": -3080, - "ingame_max_x": 3400, - "ingame_max_y": -3309, + "ingame_min_x": 3286.3, + "ingame_min_y": -3100, + "ingame_max_x": 3450, + "ingame_max_y": -3329, "percentage_display_zoom": 1, "zoom_max": null, "active": 1, @@ -3731,10 +3731,10 @@ "max_enemy_size": null, "enemy_engagement_max_range": null, "enemy_engagement_max_range_patrols": null, - "ingame_min_x": 3336.3, - "ingame_min_y": -3080, - "ingame_max_x": 3400, - "ingame_max_y": -3309, + "ingame_min_x": 3286.3, + "ingame_min_y": -3100, + "ingame_max_x": 3450, + "ingame_max_y": -3329, "percentage_display_zoom": 1, "zoom_max": null, "active": 1, @@ -15625,4 +15625,4 @@ } ] } -] \ No newline at end of file +]