Match complex ingredients in the filter

karlomikus · karlomikus · commit 41898b8df1aa · 2025-12-13T11:58:49.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.3', '8.4']
+        php-version: ['8.4']
 
     steps:
     - name: Install libvips
@@ -54,4 +54,4 @@ jobs:
 
     - uses: stoplightio/spectral-action@latest
       with:
-        file_glob: 'docs/*.yaml'
+        file_glob: 'docs/*.yaml'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
     - This will show cocktails that are locked for the bar (not all ingredients are in bar's shelf)
 - Added `potential_bar_shelf_cocktails` sort to ingredients endpoint
     - This will sort ingredients by how many new cocktails would be unlocked for the bar if the ingredient is added to bar shelf
+    
+## Changes
+- Docker image is now built on top of PHP 8.4 base image
 
 # v5.9.3
 ## Fixes
diff --git a/app/External/Export/ToRecipeType.php b/app/External/Export/ToRecipeType.php
@@ -9,8 +9,8 @@
 use Kami\Cocktail\Models\Cocktail;
 use Illuminate\Support\Facades\Log;
 use Kami\RecipeUtils\UnitConverter\Units;
-use Kami\Cocktail\External\ExportTypeEnum;
 use Illuminate\Contracts\Filesystem\Cloud;
+use Kami\Cocktail\External\ExportTypeEnum;
 use Illuminate\Container\Attributes\Storage;
 use Kami\Cocktail\External\ForceUnitConvertEnum;
 use Kami\Cocktail\Exceptions\ImageFileNotFoundException;
diff --git a/app/Http/Filters/IngredientQueryFilter.php b/app/Http/Filters/IngredientQueryFilter.php
@@ -4,6 +4,7 @@
 
 namespace Kami\Cocktail\Http\Filters;
 
+use Illuminate\Support\Facades\DB;
 use Kami\Cocktail\Models\Ingredient;
 use Spatie\QueryBuilder\AllowedSort;
 use Spatie\QueryBuilder\QueryBuilder;
@@ -96,17 +97,21 @@ public function __construct(IngredientService $ingredientQuery)
                 'name',
                 'created_at',
                 'strength',
-                AllowedSort::callback('potential_bar_shelf_cocktails', function ($query, bool $descending) use ($barMembership) {
+                AllowedSort::callback('potential_bar_shelf_cocktails', function ($query, bool $descending) use ($barMembership, $ingredientQuery) {
                     $direction = $descending ? 'DESC' : 'ASC';
 
+                    $barIngredientIds = DB::table('bar_ingredients')
+                        ->where('bar_id', $barMembership->bar_id)
+                        ->pluck('ingredient_id')
+                        ->toArray();
+                    $complexIngredientIds = $ingredientQuery->resolveComplexIngredients($barIngredientIds);
+
+                    $ingredientIds = array_merge($barIngredientIds, $complexIngredientIds);
+
                     $query->selectRaw('ingredients.*, COUNT(DISTINCT ci.cocktail_id) AS potential_cocktails_count')
-                        ->leftJoin('cocktail_ingredients AS ci', function ($join) use ($barMembership) {
+                        ->leftJoin('cocktail_ingredients AS ci', function ($join) use ($ingredientIds) {
                             $join->on('ci.ingredient_id', '=', 'ingredients.id')
-                                ->whereNotIn('ci.ingredient_id', function ($subquery) use ($barMembership) {
-                                    $subquery->select('ingredient_id')
-                                        ->from('bar_ingredients')
-                                        ->where('bar_id', $barMembership->bar_id);
-                                });
+                                ->whereNotIn('ci.ingredient_id', $ingredientIds);
                         })
                         ->groupBy('ingredients.id')
                         ->orderBy('potential_cocktails_count', $direction);
diff --git a/app/Scraper/Sites/CocktailsDistilled.php b/app/Scraper/Sites/CocktailsDistilled.php
@@ -48,7 +48,7 @@ public function ingredients(): array
 
         $this->crawler->filter('.ingredients ul li')->each(function ($listNode) use (&$result) {
             $ingredientName = $listNode->innerText();
-            if (!isset($ingredientName) || (string) $ingredientName === '') {
+            if ((string) $ingredientName === '') {
                 $ingredientName = $listNode->filter('a')->text();
             }
 
diff --git a/app/Services/CocktailService.php b/app/Services/CocktailService.php
@@ -25,6 +25,7 @@
     public function __construct(
         private DatabaseManager $db,
         private LogManager $log,
+        private IngredientService $ingredientService,
     ) {
     }
 
@@ -261,23 +262,7 @@ 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) {
-            $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();
+            $additionalIngredients = $this->ingredientService->resolveComplexIngredients($ingredientIds);
 
             $ingredientIds = array_merge($ingredientIds, $additionalIngredients);
             $ingredientIds = array_unique($ingredientIds);
diff --git a/app/Services/IngredientService.php b/app/Services/IngredientService.php
@@ -331,6 +331,33 @@ public function rebuildMaterializedPath(int $barId): void
         $this->log->info('[INGREDIENT_SERVICE] Rebuilt materialized path for ingredients for bar ' . $barId . ' in ' . round($endTime - $startTime, 6) . ' seconds.');
     }
 
+    /**
+     * Resolve complex ingredients that can be made with the given ingredient IDs.
+     *
+     * @param array<int> $ingredientIds
+     * @return array<int>
+     */
+    public function resolveComplexIngredients(array $ingredientIds): array
+    {
+        return $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();
+    }
+
     /**
      * Return array of all ingredients that are part of the user's shelf
      * and can be used to create cocktails.
@@ -366,23 +393,7 @@ public function getMemberIngredients(int $userId, int $barId): array
             ->pluck('id')
             ->toArray();
 
-        $complexIngredients = $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 ($userIngredientIds) {
-                $query->select('ci_inner.id')
-                    ->from('complex_ingredients AS ci_inner')
-                    ->whereNotExists(function ($query) use ($userIngredientIds) {
-                        $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', $userIngredientIds);
-                    });
-            })
-            ->pluck('main_ingredient_id')
-            ->toArray();
+        $complexIngredients = $this->resolveComplexIngredients($userIngredientIds);
 
         return array_unique(array_merge(
             $descendantIngredientIds,

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function ingredients(): array`
`48`	`48`
`49`	`49`	`$this->crawler->filter('.ingredients ul li')->each(function ($listNode) use (&$result) {`
`50`	`50`	`$ingredientName = $listNode->innerText();`
`51`		`- if (!isset($ingredientName) \|\| (string) $ingredientName === '') {`
	`51`	`+ if ((string) $ingredientName === '') {`
`52`	`52`	`$ingredientName = $listNode->filter('a')->text();`
`53`	`53`	`}`
`54`	`54`