From 3eebcf27567239eb0ee3f7fd6f0a56ef45a83686 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Fri, 2 Apr 2021 20:29:13 -0700 Subject: [PATCH] Add default pagination to all API routes --- app/JsonApi/Adapters/AdapterBase.php | 15 +++++++++++++++ app/JsonApi/Adapters/FoodAdapter.php | 5 ++--- app/JsonApi/Adapters/GoalAdapter.php | 3 +-- app/JsonApi/Adapters/IngredientAmountAdapter.php | 3 +-- app/JsonApi/Adapters/JournalEntryAdapter.php | 3 +-- app/JsonApi/Adapters/MediumAdapter.php | 3 +-- app/JsonApi/Adapters/RecipeAdapter.php | 3 +-- app/JsonApi/Adapters/RecipeSeparatorAdapter.php | 3 +-- app/JsonApi/Adapters/RecipeStepAdapter.php | 3 +-- app/JsonApi/Adapters/TagAdapter.php | 3 +-- app/JsonApi/Adapters/UserAdapter.php | 3 +-- 11 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 app/JsonApi/Adapters/AdapterBase.php diff --git a/app/JsonApi/Adapters/AdapterBase.php b/app/JsonApi/Adapters/AdapterBase.php new file mode 100644 index 0000000..5814450 --- /dev/null +++ b/app/JsonApi/Adapters/AdapterBase.php @@ -0,0 +1,15 @@ + 1, 'size' => 25]; + +} diff --git a/app/JsonApi/Adapters/FoodAdapter.php b/app/JsonApi/Adapters/FoodAdapter.php index c3973c0..dbc19ff 100644 --- a/app/JsonApi/Adapters/FoodAdapter.php +++ b/app/JsonApi/Adapters/FoodAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\Food; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\HasMany; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class FoodAdapter extends AbstractAdapter +class FoodAdapter extends AdapterBase { /** @@ -52,7 +51,7 @@ class FoodAdapter extends AbstractAdapter }); } } - + protected function tags(): HasMany { return $this->hasMany(); diff --git a/app/JsonApi/Adapters/GoalAdapter.php b/app/JsonApi/Adapters/GoalAdapter.php index e8984d4..bf3d2bb 100644 --- a/app/JsonApi/Adapters/GoalAdapter.php +++ b/app/JsonApi/Adapters/GoalAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\Goal; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class GoalAdapter extends AbstractAdapter +class GoalAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/IngredientAmountAdapter.php b/app/JsonApi/Adapters/IngredientAmountAdapter.php index 5c4a8e0..21155c6 100644 --- a/app/JsonApi/Adapters/IngredientAmountAdapter.php +++ b/app/JsonApi/Adapters/IngredientAmountAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\IngredientAmount; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class IngredientAmountAdapter extends AbstractAdapter +class IngredientAmountAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/JournalEntryAdapter.php b/app/JsonApi/Adapters/JournalEntryAdapter.php index 0dacde3..57a00d6 100644 --- a/app/JsonApi/Adapters/JournalEntryAdapter.php +++ b/app/JsonApi/Adapters/JournalEntryAdapter.php @@ -3,13 +3,12 @@ namespace App\JsonApi\Adapters; use App\Models\JournalEntry; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Eloquent\MorphHasMany; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class JournalEntryAdapter extends AbstractAdapter +class JournalEntryAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/MediumAdapter.php b/app/JsonApi/Adapters/MediumAdapter.php index cc14c04..e10dc72 100644 --- a/app/JsonApi/Adapters/MediumAdapter.php +++ b/app/JsonApi/Adapters/MediumAdapter.php @@ -2,7 +2,6 @@ namespace App\JsonApi\Adapters; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; @@ -16,7 +15,7 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media; * * @package App\JsonApi\Adapters */ -class MediumAdapter extends AbstractAdapter +class MediumAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/RecipeAdapter.php b/app/JsonApi/Adapters/RecipeAdapter.php index 758312a..e5e6a5a 100644 --- a/app/JsonApi/Adapters/RecipeAdapter.php +++ b/app/JsonApi/Adapters/RecipeAdapter.php @@ -3,13 +3,12 @@ namespace App\JsonApi\Adapters; use App\Models\Recipe; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\HasMany; use CloudCreativity\LaravelJsonApi\Eloquent\MorphHasMany; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class RecipeAdapter extends AbstractAdapter +class RecipeAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/RecipeSeparatorAdapter.php b/app/JsonApi/Adapters/RecipeSeparatorAdapter.php index fff99e6..11daa7f 100644 --- a/app/JsonApi/Adapters/RecipeSeparatorAdapter.php +++ b/app/JsonApi/Adapters/RecipeSeparatorAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\RecipeSeparator; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class RecipeSeparatorAdapter extends AbstractAdapter +class RecipeSeparatorAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/RecipeStepAdapter.php b/app/JsonApi/Adapters/RecipeStepAdapter.php index baedbf5..e228d5a 100644 --- a/app/JsonApi/Adapters/RecipeStepAdapter.php +++ b/app/JsonApi/Adapters/RecipeStepAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\RecipeStep; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\BelongsTo; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class RecipeStepAdapter extends AbstractAdapter +class RecipeStepAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/TagAdapter.php b/app/JsonApi/Adapters/TagAdapter.php index 31d0c21..71e3611 100644 --- a/app/JsonApi/Adapters/TagAdapter.php +++ b/app/JsonApi/Adapters/TagAdapter.php @@ -3,11 +3,10 @@ namespace App\JsonApi\Adapters; use App\Models\Tag; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class TagAdapter extends AbstractAdapter +class TagAdapter extends AdapterBase { /** diff --git a/app/JsonApi/Adapters/UserAdapter.php b/app/JsonApi/Adapters/UserAdapter.php index b0e5e03..68d6714 100644 --- a/app/JsonApi/Adapters/UserAdapter.php +++ b/app/JsonApi/Adapters/UserAdapter.php @@ -3,12 +3,11 @@ namespace App\JsonApi\Adapters; use App\Models\User; -use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter; use CloudCreativity\LaravelJsonApi\Eloquent\HasMany; use CloudCreativity\LaravelJsonApi\Pagination\StandardStrategy; use Illuminate\Support\Collection; -class UserAdapter extends AbstractAdapter +class UserAdapter extends AdapterBase { /**