Merge pull request #474 from karlomikus/develop

karlomikus · web-flow · commit 2ffe3eb4162f · 2025-04-26T12:59:04.000+02:00
Fix wrong thumb url
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v5.2.4
+## Fixes
+- Fixed wrong thumbnail URL getting synced into search engine
+
+# v5.2.3
+## Changes
+- Query string `state` is always being sent when using Authelia as SSO provider
+
 # v5.2.2
 ## Changes
 - Automatic ingredient units filler function now tries to convert to default bar unit
diff --git a/app/Http/Controllers/CocktailController.php b/app/Http/Controllers/CocktailController.php
@@ -37,32 +37,32 @@ class CocktailController extends Controller
         new BAO\Parameters\PageParameter(),
         new BAO\Parameters\PerPageParameter(),
         new OAT\Parameter(name: 'filter', in: 'query', description: 'Filter by attributes', explode: true, style: 'deepObject', schema: new OAT\Schema(type: 'object', properties: [
-            new OAT\Property(property: 'id', type: 'string'),
-            new OAT\Property(property: 'name', type: 'string'),
-            new OAT\Property(property: 'ingredient_name', type: 'string'),
-            new OAT\Property(property: 'tag_id', type: 'string'),
-            new OAT\Property(property: 'created_user_id', type: 'string'),
-            new OAT\Property(property: 'glass_id', type: 'string'),
-            new OAT\Property(property: 'cocktail_method_id', type: 'string'),
-            new OAT\Property(property: 'collection_id', type: 'string'),
-            new OAT\Property(property: 'favorites', type: 'boolean'),
-            new OAT\Property(property: 'on_shelf', type: 'boolean'),
-            new OAT\Property(property: 'bar_shelf', type: 'boolean'),
-            new OAT\Property(property: 'user_shelves', type: 'string'),
-            new OAT\Property(property: 'shelf_ingredients', type: 'string'),
-            new OAT\Property(property: 'is_public', type: 'boolean'),
-            new OAT\Property(property: 'user_rating_min', type: 'string'),
-            new OAT\Property(property: 'user_rating_max', type: 'string'),
-            new OAT\Property(property: 'average_rating_min', type: 'string'),
-            new OAT\Property(property: 'average_rating_max', type: 'string'),
-            new OAT\Property(property: 'abv_min', type: 'string'),
-            new OAT\Property(property: 'abv_max', type: 'string'),
-            new OAT\Property(property: 'main_ingredient_id', type: 'string'),
-            new OAT\Property(property: 'total_ingredients', type: 'string'),
-            new OAT\Property(property: 'missing_ingredients', type: 'string'),
-            new OAT\Property(property: 'missing_bar_ingredients', type: 'string'),
-            new OAT\Property(property: 'specific_ingredients', type: 'string'),
-            new OAT\Property(property: 'ignore_ingredients', type: 'string'),
+            new OAT\Property(property: 'id', type: 'string', description: 'Filter by cocktail IDs'),
+            new OAT\Property(property: 'name', type: 'string', description: 'Filter by cocktail names (fuzzy search)'),
+            new OAT\Property(property: 'ingredient_name', type: 'string', description: 'Filter by cocktail ingredient names (fuzzy search)'),
+            new OAT\Property(property: 'tag_id', type: 'string', description: 'Filter by tag IDs'),
+            new OAT\Property(property: 'created_user_id', type: 'string', description: 'Filter by creator IDs'),
+            new OAT\Property(property: 'glass_id', type: 'string', description: 'Filter by glass IDs'),
+            new OAT\Property(property: 'cocktail_method_id', type: 'string', description: 'Filter by cocktail method IDs'),
+            new OAT\Property(property: 'collection_id', type: 'string', description: 'Filter by collection IDs'),
+            new OAT\Property(property: 'favorites', type: 'boolean', description: 'Show only user favorites'),
+            new OAT\Property(property: 'on_shelf', type: 'boolean', description: 'Show only cocktails on the user\'s shelf'),
+            new OAT\Property(property: 'bar_shelf', type: 'boolean', description: 'Show only cocktails on the bar shelf'),
+            new OAT\Property(property: 'user_shelves', type: 'string', description: 'Show only cocktails on the user\'s shelves. Comma separated list of user IDs'),
+            new OAT\Property(property: 'shelf_ingredients', type: 'string', description: 'Show only cocktails that can be made with the given ingredients. Used as on-the-fly custom shelf filter'),
+            new OAT\Property(property: 'is_public', type: 'boolean', description: 'Show only cocktails with public links'),
+            new OAT\Property(property: 'user_rating_min', type: 'string', description: 'Filter by greater than or equal user rating'),
+            new OAT\Property(property: 'user_rating_max', type: 'string', description: 'Filter by less than or equal user rating'),
+            new OAT\Property(property: 'average_rating_min', type: 'string', description: 'Filter by greater than or equal average rating'),
+            new OAT\Property(property: 'average_rating_max', type: 'string', description: 'Filter by less than or equal average rating'),
+            new OAT\Property(property: 'abv_min', type: 'string', description: 'Filter by greater than or equal ABV'),
+            new OAT\Property(property: 'abv_max', type: 'string', description: 'Filter by less than or equal ABV'),
+            new OAT\Property(property: 'main_ingredient_id', type: 'string', description: 'Show only cocktails whose main ingredient is in the given list. Comma separated list of ingredient IDs'),
+            new OAT\Property(property: 'total_ingredients', type: 'string', description: 'Filter by total number of ingredients'),
+            new OAT\Property(property: 'missing_ingredients', type: 'string', description: 'Filter by total number of missing ingredients'),
+            new OAT\Property(property: 'missing_bar_ingredients', type: 'string', description: 'Filter by total number of missing bar ingredients'),
+            new OAT\Property(property: 'specific_ingredients', type: 'string', description: 'Show cocktails that contain given ingredient IDs'),
+            new OAT\Property(property: 'ignore_ingredients', type: 'string', description: 'Show cocktails that do not contain given ingredient IDs'),
         ])),
         new OAT\Parameter(name: 'sort', in: 'query', description: 'Sort by attributes. Available attributes: `name`, `created_at`, `average_rating`, `user_rating`, `abv`, `total_ingredients`, `missing_ingredients`, `missing_bar_ingredients`, `favorited_at`, `random`.', schema: new OAT\Schema(type: 'string')),
         new OAT\Parameter(name: 'include', in: 'query', description: 'Include additional relationships. Available relations: `glass`, `method`, `user`, `navigation`, `utensils`, `createdUser`, `updatedUser`, `images`, `tags`, `ingredients.ingredient`, `ratings`.', schema: new OAT\Schema(type: 'string')),
diff --git a/app/Http/Controllers/IngredientController.php b/app/Http/Controllers/IngredientController.php
@@ -33,16 +33,16 @@ class IngredientController extends Controller
         new BAO\Parameters\PageParameter(),
         new BAO\Parameters\PerPageParameter(),
         new OAT\Parameter(name: 'filter', in: 'query', description: 'Filter by attributes', explode: true, style: 'deepObject', schema: new OAT\Schema(type: 'object', properties: [
-            new OAT\Property(property: 'id', type: 'integer'),
-            new OAT\Property(property: 'name', type: 'string'),
-            new OAT\Property(property: 'name_exact', type: 'string'),
-            new OAT\Property(property: 'origin', type: 'string'),
-            new OAT\Property(property: 'created_user_id', type: 'integer'),
-            new OAT\Property(property: 'on_shopping_list', type: 'boolean'),
-            new OAT\Property(property: 'on_shelf', type: 'boolean'),
-            new OAT\Property(property: 'bar_shelf', type: 'boolean'),
-            new OAT\Property(property: 'strength_min', type: 'float'),
-            new OAT\Property(property: 'strength_max', type: 'float'),
+            new OAT\Property(property: 'id', type: 'integer', description: 'Filter by ingredient id'),
+            new OAT\Property(property: 'name', type: 'string', description: 'Filter by ingredient name (fuzzy search)'),
+            new OAT\Property(property: 'name_exact', type: 'string', description: 'Filter by ingredient name (exact match)'),
+            new OAT\Property(property: 'origin', type: 'string', description: 'Filter by ingredient origin'),
+            new OAT\Property(property: 'created_user_id', type: 'integer', description: 'Filter by user id who created the ingredient'),
+            new OAT\Property(property: 'on_shopping_list', type: 'boolean', description: 'Show only ingredients that are on the shopping list'),
+            new OAT\Property(property: 'on_shelf', type: 'boolean', description: 'Show only ingredients that are on the shelf'),
+            new OAT\Property(property: 'bar_shelf', type: 'boolean', description: 'Show only ingredients that are on the bar shelf'),
+            new OAT\Property(property: 'strength_min', type: 'float', description: 'Show only ingredients with strength greater than or equal to given value'),
+            new OAT\Property(property: 'strength_max', type: 'float', description: 'Show only ingredients with strength less than or equal to given value'),
             new OAT\Property(property: 'main_ingredients', type: 'string', description: 'Show only ingredients that are used as main ingredients in cocktails'),
             new OAT\Property(property: 'complex', type: 'boolean', description: 'Show only ingredients that can be made with other ingredients'),
             new OAT\Property(property: 'parent_ingredient_id', type: 'integer', description: 'Show only direct children of given ingredient. Use null as value to get ingredients without parent ingredient'),
diff --git a/app/Http/Filters/CocktailMethodQueryFilter.php b/app/Http/Filters/CocktailMethodQueryFilter.php
@@ -9,7 +9,7 @@
 use Kami\Cocktail\Models\CocktailMethod;
 
 /**
- * @mixin \Kami\Cocktail\Models\CocktailMethod
+ * @extends \Spatie\QueryBuilder\QueryBuilder<CocktailMethod>
  */
 final class CocktailMethodQueryFilter extends QueryBuilder
 {
diff --git a/app/Http/Filters/CocktailQueryFilter.php b/app/Http/Filters/CocktailQueryFilter.php
@@ -13,7 +13,7 @@
 use Kami\Cocktail\Services\CocktailService;
 
 /**
- * @mixin \Kami\Cocktail\Models\Cocktail
+ * @extends \Spatie\QueryBuilder\QueryBuilder<Cocktail>
  */
 final class CocktailQueryFilter extends QueryBuilder
 {
diff --git a/app/Http/Filters/CollectionQueryFilter.php b/app/Http/Filters/CollectionQueryFilter.php
@@ -8,6 +8,9 @@
 use Spatie\QueryBuilder\AllowedFilter;
 use Kami\Cocktail\Models\Collection as ItemsCollection;
 
+/**
+ * @extends \Spatie\QueryBuilder\QueryBuilder<ItemsCollection>
+ */
 final class CollectionQueryFilter extends QueryBuilder
 {
     public function __construct()
diff --git a/app/Http/Filters/GlassQueryFilter.php b/app/Http/Filters/GlassQueryFilter.php
@@ -9,7 +9,7 @@
 use Spatie\QueryBuilder\AllowedFilter;
 
 /**
- * @mixin \Kami\Cocktail\Models\Glass
+ * @extends \Spatie\QueryBuilder\QueryBuilder<Glass>
  */
 final class GlassQueryFilter extends QueryBuilder
 {
diff --git a/app/Http/Filters/IngredientQueryFilter.php b/app/Http/Filters/IngredientQueryFilter.php
@@ -11,7 +11,7 @@
 use Kami\Cocktail\Services\IngredientService;
 
 /**
- * @mixin \Kami\Cocktail\Models\Ingredient
+ * @extends \Spatie\QueryBuilder\QueryBuilder<Ingredient>
  */
 final class IngredientQueryFilter extends QueryBuilder
 {
diff --git a/app/Http/Filters/NoteQueryFilter.php b/app/Http/Filters/NoteQueryFilter.php
@@ -8,6 +8,9 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\AllowedFilter;
 
+/**
+ * @extends \Spatie\QueryBuilder\QueryBuilder<Note>
+ */
 final class NoteQueryFilter extends QueryBuilder
 {
     public function __construct()
diff --git a/app/Models/Concerns/HasImages.php b/app/Models/Concerns/HasImages.php
@@ -36,6 +36,12 @@ public function getMainImageThumbUrl(bool $absolute = true): ?string
             return null;
         }
 
+        if (!empty(config('app.url'))) {
+            $path = route('images.thumb', ['id' => $this->getMainImage()->id], false);
+
+            return rtrim(config('app.url'), '/') . '/' . ltrim($path, '/');
+        }
+
         return route('images.thumb', ['id' => $this->getMainImage()->id], $absolute);
     }
 
diff --git a/app/Models/ValueObjects/UnitValueObject.php b/app/Models/ValueObjects/UnitValueObject.php
@@ -66,14 +66,14 @@ public function isTopup(): bool
 
     public function isDash(): bool
     {
-        $matches = $this->units['dash'] ?? [];
+        $matches = $this->units['dash'];
 
         return in_array($this->value, $matches, true);
     }
 
     public function isBarspoon(): bool
     {
-        $matches = $this->units['barspoon'] ?? [];
+        $matches = $this->units['barspoon'];
 
         return str_contains($this->value, 'spoon') || in_array($this->value, $matches, true);
     }
diff --git a/app/OpenAPI/Parameters/BarIdHeaderParameter.php b/app/OpenAPI/Parameters/BarIdHeaderParameter.php
@@ -11,6 +11,6 @@ class BarIdHeaderParameter extends OAT\Parameter
 {
     public function __construct()
     {
-        parent::__construct(name: 'Bar-Assistant-Bar-Id', in: 'header', required: false, description: 'Database id of a bar. Required if you are not using `bar_id` query string.', schema: new OAT\Schema(type: 'integer'));
+        parent::__construct(name: 'Bar-Assistant-Bar-Id', in: 'header', required: false, description: 'Database id of a bar.', schema: new OAT\Schema(type: 'integer'));
     }
 }
diff --git a/app/OpenAPI/Schemas/CocktailRequest.php b/app/OpenAPI/Schemas/CocktailRequest.php
@@ -46,13 +46,12 @@ public function __construct(
 
     public static function fromIlluminateRequest(Request $request, ?int $barId = null): self
     {
+        /** @var array<mixed> */
         $formIngredients = $request->post('ingredients', []);
 
         $ingredients = [];
-        if (is_array($formIngredients)) {
-            foreach ($formIngredients as $formIngredient) {
-                $ingredients[] = CocktailIngredientRequest::fromArray($formIngredient);
-            }
+        foreach ($formIngredients as $formIngredient) {
+            $ingredients[] = CocktailIngredientRequest::fromArray($formIngredient);
         }
 
         return new self(
diff --git a/app/Services/IngredientService.php b/app/Services/IngredientService.php
@@ -218,36 +218,6 @@ public function getMainIngredientsOfCocktails(int $barId): Collection
             ->get();
     }
 
-    /**
-     * @param array<int> $ingredientIds
-     * @return Collection<array-key, Ingredient>
-     */
-    public function getDescendants(array $ingredientIds, int $limit = 50): Collection
-    {
-        return Ingredient::select('ingredients.id AS _root_id', 'descendant.*')
-            ->join('ingredients AS descendant', DB::raw("('/' || descendant.materialized_path || '/')"), 'LIKE', DB::raw("'%/' || ingredients.id || '/%'"))
-            ->whereIn('ingredients.id', $ingredientIds)
-            ->limit($limit)
-            ->orderBy('ingredients.name')
-            ->get();
-    }
-
-    /**
-     * @param array<int> $ingredientIds
-     * @return Collection<array-key, Ingredient>
-     */
-    public function getAncestors(array $ingredientIds, int $limit = 50): Collection
-    {
-        return Ingredient::select('ingredients.id as _leaf_id', 'ancestor.*')
-            ->join('ingredients AS ancestor', DB::raw("instr('/' || ingredients.materialized_path || '/', '/' || ancestor.id || '/')"), '>', DB::raw('0'))
-            ->whereIn('ingredients.id', $ingredientIds)
-            ->whereNotNull('ingredients.materialized_path')
-            ->limit($limit)
-            ->orderBy('ingredients.name')
-            ->orderBy('_leaf_id')
-            ->get();
-    }
-
     /**
      * @param array<int> $ingredientIds
      * @return array<int, object>
diff --git a/composer.lock b/composer.lock
diff --git a/docs/openapi-generated.yaml b/docs/openapi-generated.yaml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Kami\Cocktail\Models\CocktailMethod;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * @mixin \Kami\Cocktail\Models\CocktailMethod`
	`12`	`+ * @extends \Spatie\QueryBuilder\QueryBuilder<CocktailMethod>`
`13`	`13`	`*/`
`14`	`14`	`final class CocktailMethodQueryFilter extends QueryBuilder`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Kami\Cocktail\Services\CocktailService;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * @mixin \Kami\Cocktail\Models\Cocktail`
	`16`	`+ * @extends \Spatie\QueryBuilder\QueryBuilder<Cocktail>`
`17`	`17`	`*/`
`18`	`18`	`final class CocktailQueryFilter extends QueryBuilder`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`use Spatie\QueryBuilder\AllowedFilter;`
`9`	`9`	`use Kami\Cocktail\Models\Collection as ItemsCollection;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * @extends \Spatie\QueryBuilder\QueryBuilder<ItemsCollection>`
	`13`	`+ */`
`11`	`14`	`final class CollectionQueryFilter extends QueryBuilder`
`12`	`15`	`{`
`13`	`16`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Kami\Cocktail\Services\IngredientService;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @mixin \Kami\Cocktail\Models\Ingredient`
	`14`	`+ * @extends \Spatie\QueryBuilder\QueryBuilder<Ingredient>`
`15`	`15`	`*/`
`16`	`16`	`final class IngredientQueryFilter extends QueryBuilder`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`use Spatie\QueryBuilder\QueryBuilder;`
`9`	`9`	`use Spatie\QueryBuilder\AllowedFilter;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * @extends \Spatie\QueryBuilder\QueryBuilder<Note>`
	`13`	`+ */`
`11`	`14`	`final class NoteQueryFilter extends QueryBuilder`
`12`	`15`	`{`
`13`	`16`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ public function getMainImageThumbUrl(bool $absolute = true): ?string`
`36`	`36`	`return null;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ if (!empty(config('app.url'))) {`
	`40`	`+ $path = route('images.thumb', ['id' => $this->getMainImage()->id], false);`
	`41`	`+`
	`42`	`+ return rtrim(config('app.url'), '/') . '/' . ltrim($path, '/');`
	`43`	`+ }`
	`44`	`+`
`39`	`45`	`return route('images.thumb', ['id' => $this->getMainImage()->id], $absolute);`
`40`	`46`	`}`
`41`	`47`