Merge pull request #99 from Rudey-ua/development

Added pagination & filters to premium recipes

Author: Rudey-ua

app/Http/Controllers/API/RecipeController.php

@@ -32,30 +32,8 @@ public function index(RecipeFilterRequest $request)
     {
         $members = User::role(config('permission.user_roles.member'))->pluck('id');
 
-        $recipes = Recipe::whereIn('user_id', $members)
-            ->where('is_published', true)
-
-            ->when($request->title, function ($query, $title) {
-                return $query->where('title', 'like', '%' . $title . '%');
-            })
-            ->when($request->tags, function ($query, $tags) {
-                return $query->whereHas('tags', function ($query) use ($tags) {
-                    $query->whereIn('tag_id', $tags);
-                });
-            })->get();
-
-        switch ($request->sort) {
-            case 'rating_asc':
-                $recipes = $recipes->sortBy(function ($recipe) {
-                    return $recipe->countAverageRatingForRecipe();
-                });
-                break;
-            case 'rating_desc':
-                $recipes = $recipes->sortByDesc(function ($recipe) {
-                    return $recipe->countAverageRatingForRecipe();
-                });
-                break;
-        }
+        $recipes = $this->recipeRepository->getPublishedRecipesFromMembers($members, $request);
+        $recipes = $this->recipeRepository->applySorting($request, $recipes);
 
         return ShortRecipeResource::collection($recipes);
     }
@@ -94,22 +72,22 @@ public function update(RecipeRequest $recipeRequest, int $id)
         return new RecipeResource($recipe);
     }
 
-    public function destroy(int $id)
-    {
-        Recipe::findOrFail($id)->delete();
-        return $this->respondNoContent();
-    }
-
-    public function getPremiumRecipes()
+    public function getPremiumRecipes(RecipeFilterRequest $request)
     {
         if (is_null($this->subscriptionRepository->getActiveSubscription(Auth::id()))) {
             return $this->respondError(__("You don't have an active subscription!"));
         }
         $chiefs = User::role(config('permission.user_roles.chief'))->pluck('id');
-        $recipes = Recipe::whereIn('user_id', $chiefs)
-            ->where('is_published', true)
-            ->get();
+
+        $recipes = $this->recipeRepository->getPublishedRecipesFromMembers($chiefs, $request);
+        $recipes = $this->recipeRepository->applySorting($request, $recipes);
 
         return PremiumRecipeResource::collection($recipes);
     }
+
+    public function destroy(int $id)
+    {
+        Recipe::findOrFail($id)->delete();
+        return $this->respondNoContent();
+    }
 }

app/Repositories/RecipeRepository.php

@@ -7,6 +7,8 @@
 use App\Models\Recipe;
 use App\Models\Step;
 use App\Traits\FIleTrait;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class RecipeRepository
@@ -24,7 +26,6 @@ public function createRecipeWithDetails(RecipeData $recipeData): Recipe
             $recipe = $this->createRecipe($recipeData);
             $this->createIngredients($recipe->id, $recipeData->ingredients);
             $this->createSteps($recipe->id, $recipeData->steps);
-            //!empty($recipeData->tags) ? $this->syncTags($recipe, $recipeData->tags) : null;
 
             if (!empty($recipeData->tags)) {
                 $this->updateTags($recipe, $recipeData->tags);
@@ -66,11 +67,6 @@ protected function createSteps(int $recipeId, array $steps): void
         }
     }
 
-    /*protected function syncTags(Recipe $recipe, array $tagIds): void
-    {
-        $recipe->tags()->sync($tagIds);
-    }*/
-
     protected function updateTags(Recipe $recipe, array $tagIds): void
     {
         $recipe->tags()->detach();
@@ -86,7 +82,6 @@ public function updateRecipeWithDetails(int $recipeId, RecipeData $recipeData):
             $recipe = $this->updateRecipe($recipeId, $recipeData);
             $this->updateIngredients($recipeId, $recipeData->ingredients);
             $this->updateSteps($recipeId, $recipeData->steps);
-            //!empty($recipeData->tags) ? $this->syncTags($recipe, $recipeData->tags) : null;
 
             if (!empty($recipeData->tags)) {
                 $this->updateTags($recipe, $recipeData->tags);
@@ -144,4 +139,35 @@ protected function updateSteps(int $recipeId, array $steps): void
             $this->stepModel->create(array_merge($stepDataArray, ['recipe_id' => $recipeId]));
         }
     }
+
+    public function getPublishedRecipesFromMembers(Collection $users, Request $request)
+    {
+        return Recipe::whereIn('user_id', $users)
+            ->where('is_published', true)
+
+            ->when($request->title, function ($query, $title) {
+                return $query->where('title', 'like', '%' . $title . '%');
+            })
+            ->when($request->tags, function ($query, $tags) {
+                return $query->whereHas('tags', function ($query) use ($tags) {
+                    $query->whereIn('tag_id', $tags);
+                });
+            })->paginate(2);
+    }
+
+    public function applySorting(Request $request, $recipes) {
+        switch ($request->sort) {
+            case 'rating_asc':
+                $recipes = $recipes->sortBy(function ($recipe) {
+                    return $recipe->countAverageRatingForRecipe();
+                });
+                break;
+            case 'rating_desc':
+                $recipes = $recipes->sortByDesc(function ($recipe) {
+                    return $recipe->countAverageRatingForRecipe();
+                });
+                break;
+        }
+        return $recipes;
+    }
 }