Fix ingredient matching when multiple complex ingredients match #481

Author: karlomikus

app/Services/CocktailService.php

@@ -243,21 +243,25 @@ public function getCocktailsByIngredients(array $ingredientIds, int $barId, ?int
         // Basically, goes through all ingredients to match ($ingredientIds) and check if they can create complex ingredients
         // If they can, that ingredient is added to the list of ingredients to match
         if ($matchComplexIngredients) {
-            $placeholders = str_repeat('?,', count($ingredientIds) - 1) . '?';
-            $rawQuery = "WITH RECURSIVE IngredientChain AS (
-                    SELECT id AS matched_ingredient
-                    FROM ingredients
-                    WHERE id IN (" . $placeholders . ")
-                    UNION
-                    SELECT ci.main_ingredient_id AS matched_ingredient
-                    FROM complex_ingredients ci
-                    INNER JOIN IngredientChain ic ON ci.ingredient_id = ic.matched_ingredient
-                )
-                SELECT DISTINCT matched_ingredient
-                FROM IngredientChain;";
-
-            $additionalIngredients = collect($this->db->select($rawQuery, $ingredientIds))->pluck('matched_ingredient');
-            $ingredientIds = array_merge($ingredientIds, $additionalIngredients->toArray());
+            $additionalIngredients = $this->db->table('complex_ingredients AS ci')
+                ->distinct()
+                ->select('ci.main_ingredient_id')
+                ->join('ingredients AS i_main', 'ci.main_ingredient_id', '=', 'i_main.id')
+                ->whereIn('ci.id', function ($query) use ($ingredientIds) {
+                    $query->select('ci_inner.id')
+                        ->from('complex_ingredients AS ci_inner')
+                        ->whereNotExists(function ($query) use ($ingredientIds) {
+                            $query->select('i_ingredient.id')
+                                ->from('complex_ingredients AS ci_sub')
+                                ->join('ingredients AS i_ingredient', 'ci_sub.ingredient_id', '=', 'i_ingredient.id')
+                                ->whereColumn('ci_sub.main_ingredient_id', 'ci_inner.main_ingredient_id')
+                                ->whereNotIn('i_ingredient.id', $ingredientIds);
+                        });
+                })
+                ->pluck('main_ingredient_id')
+                ->toArray();
+
+            $ingredientIds = array_merge($ingredientIds, $additionalIngredients);
             $ingredientIds = array_unique($ingredientIds);
         }
 

…re/Repository/CocktailRepositoryTest.php …Feature/Services/CocktailServiceTest.phptests/Feature/Repository/CocktailRepositoryTest.php renamed to tests/Feature/Services/CocktailServiceTest.php tests/Feature/Repository/CocktailRepositoryTest.php renamed to tests/Feature/Services/CocktailServiceTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Feature\Repository;
+namespace Tests\Feature\Services;
 
 use Tests\TestCase;
 use Kami\Cocktail\Models\Cocktail;
@@ -13,7 +13,7 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Kami\Cocktail\Models\CocktailIngredientSubstitute;
 
-class CocktailRepositoryTest extends TestCase
+class CocktailServiceTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -186,10 +186,14 @@ public function test_gets_cocktails_that_can_be_made_with_complex_ingredients():
 
         $whiskey = Ingredient::factory()->for($membership->bar)->create();
         $gin = Ingredient::factory()->for($membership->bar)->create();
-        $lemon = Ingredient::factory()->for($membership->bar)->create();
+        $lemonJuicePart1 = Ingredient::factory()->for($membership->bar)->create();
+        $lemonJuicePart2 = Ingredient::factory()->for($membership->bar)->create();
+        $lemonJuicePart3 = Ingredient::factory()->for($membership->bar)->create();
         $lemonJuice = Ingredient::factory()
             ->for($membership->bar)
-            ->has(ComplexIngredient::factory()->for($lemon), 'ingredientParts')
+            ->has(ComplexIngredient::factory()->for($lemonJuicePart1), 'ingredientParts')
+            ->has(ComplexIngredient::factory()->for($lemonJuicePart2), 'ingredientParts')
+            ->has(ComplexIngredient::factory()->for($lemonJuicePart3), 'ingredientParts')
             ->create();
 
         Cocktail::factory()
@@ -232,7 +236,7 @@ public function test_gets_cocktails_that_can_be_made_with_complex_ingredients():
         Cocktail::factory()->recycle($membership->bar)->count(10)->create();
 
         $repository = resolve(CocktailService::class);
-        $cocktails = $repository->getCocktailsByIngredients([$gin->id, $lemon->id], $membership->bar_id);
+        $cocktails = $repository->getCocktailsByIngredients([$gin->id, $lemonJuicePart1->id, $lemonJuicePart2->id, $lemonJuicePart3->id], $membership->bar_id);
 
         $this->assertSame([1], $cocktails->toArray());
     }