Merge pull request #504 from karlomikus/develop

Minor release

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v5.6.0
+## New
+- Added cocktail recipe parent ID tracking
+    - Enables recipe varieties/riffs
+    - Copying recipe will automatically reference the copied recipe as a parent cocktail
+    - Added `parent_cocktail_id` to `Cocktail` schema
+    - Added `varieties` to `Cocktail` schema
+- Added cocktail recipe year
+
+## Fixes
+- Fixed missing detailed error message when scraping failes
+- Fixed calculator import error on null values
+
 # v5.5.1
 ## Fixes
 - Fixed missing cocktail recipes with duplicated names in datapack export

app/External/Model/Cocktail.php

@@ -38,6 +38,8 @@ private function __construct(
         public array $utensils = [],
         public array $images = [],
         public array $ingredients = [],
+        public ?int $parentCocktailId = null,
+        public ?int $year = null,
     ) {
     }
 
@@ -67,6 +69,8 @@ public static function fromModel(CocktailModel $model, bool $useFileURI = false,
             $model->utensils->pluck('name')->toArray(),
             $images,
             $ingredients,
+            $model->parent_cocktail_id,
+            $model->year,
         );
     }
 
@@ -98,6 +102,8 @@ public static function fromDataPackArray(array $sourceArray): self
             $sourceArray['utensils'] ?? [],
             $images,
             $ingredients,
+            $sourceArray['parent_cocktail_id'] ?? null,
+            $sourceArray['year'] ?? null,
         );
     }
 
@@ -119,6 +125,8 @@ public function toDataPackArray(): array
             'utensils' => $this->utensils,
             'images' => array_map(fn ($model) => $model->toDataPackArray(), $this->images),
             'ingredients' => array_map(fn ($model) => $model->toDataPackArray(), $this->ingredients),
+            'parent_cocktail_id' => $this->parentCocktailId,
+            'year' => $this->year,
         ];
     }
 

app/Http/Controllers/CocktailController.php

@@ -453,6 +453,7 @@ public function copy(string $idOrSlug, CocktailService $cocktailService, ImageSe
             $ingredients,
             $images,
             $cocktail->utensils->pluck('id')->toArray(),
+            $cocktail->id,
         );
 
         try {

app/Http/Controllers/ImportController.php

@@ -102,12 +102,11 @@ public function scrape(ScrapeRequest $request): JsonResponse
 
         try {
             $scraper = Manager::scrape($request->input('source'));
+            $dataToImport = $scraper->toArray();
         } catch (Throwable $e) {
             abort(400, $e->getMessage());
         }
 
-        $dataToImport = $scraper->toArray();
-
         return response()->json([
             'data' => $dataToImport,
         ]);

app/Http/Filters/CocktailQueryFilter.php

@@ -175,6 +175,7 @@ public function __construct(CocktailService $cocktailRepo)
                             ->whereIn('cocktail_ingredients.ingredient_id', $value);
                     });
                 }),
+                AllowedFilter::exact('parent_cocktail_id'),
             ])
             ->defaultSort('name')
             ->allowedSorts([

app/Http/Resources/CocktailResource.php

@@ -59,6 +59,9 @@
             'can_rate',
             'can_add_note',
         ]),
+        new OAT\Property(property: 'parent_cocktail', type: CocktailBasicResource::class, description: 'If this cocktail is a variety of existing cocktail, this will reference the original cocktail', nullable: true),
+        new OAT\Property(property: 'varieties', type: 'array', items: new OAT\Items(type: CocktailBasicResource::class), description: 'List of varieties of this cocktail'),
+        new OAT\Property(property: 'year', type: 'number', example: 2023, description: 'Cocktail recipe year', nullable: true),
     ],
     required: [
         'id',
@@ -139,6 +142,11 @@ public function toArray($request)
                     'can_add_note' => $request->user()->can('addNote', $this->resource),
                 ];
             }),
+            'parent_cocktail' => $this->whenLoaded('parentCocktail', function () {
+                return new CocktailBasicResource($this->parentCocktail);
+            }),
+            'varieties' => CocktailBasicResource::collection($this->whenLoaded('cocktailVarieties')),
+            'year' => $this->year,
         ];
     }
 }

app/Models/Cocktail.php

@@ -129,6 +129,22 @@ public function menuCocktails(): HasMany
         return $this->hasMany(MenuCocktail::class);
     }
 
+    /**
+     * @return HasMany<Cocktail, $this>
+     */
+    public function cocktailVarieties(): HasMany
+    {
+        return $this->hasMany(Cocktail::class, 'parent_cocktail_id');
+    }
+
+    /**
+     * @return BelongsTo<Cocktail, $this>
+     */
+    public function parentCocktail(): BelongsTo
+    {
+        return $this->belongsTo(Cocktail::class, 'parent_cocktail_id');
+    }
+
     public function deleteFromMenu(): void
     {
         $this->menuCocktails()->delete();
@@ -434,6 +450,8 @@ public function loadDefaultRelations(): self
             'ratings',
             'ingredients.ingredient.bar.shelfIngredients',
             'ingredients.ingredient.descendants',
+            'parentCocktail.images',
+            'cocktailVarieties.images',
         ]);
 
         return $this;

app/OpenAPI/Schemas/CalculatorBlockRequest.php

@@ -44,7 +44,7 @@ public static function fromArray(array $source): self
         return new self(
             $source['label'],
             $source['variable_name'],
-            $source['value'],
+            $source['value'] ?? '',
             CalculatorBlockTypeEnum::from($source['type']),
             $settings,
             $source['description'] ?? null,

app/OpenAPI/Schemas/CocktailRequest.php

@@ -41,6 +41,10 @@ public function __construct(
         public array $images = [],
         #[OAT\Property(items: new OAT\Items(type: 'integer'), description: 'List of existing utensil ids')]
         public array $utensils = [],
+        #[OAT\Property(example: 1, property: 'parent_cocktail_id')]
+        public ?int $parentCocktailId = null,
+        #[OAT\Property(example: 2023, property: 'year')]
+        public ?int $year = null,
     ) {
     }
 
@@ -68,6 +72,8 @@ public static function fromIlluminateRequest(Request $request, ?int $barId = nul
             $ingredients,
             $request->input('images', []),
             $request->input('utensils', []),
+            $request->filled('parent_cocktail_id') ? $request->integer('parent_cocktail_id') : null,
+            $request->filled('year') ? $request->integer('year') : null,
         );
     }
 }

app/Scraper/AbstractSiteExtractor.php

@@ -27,8 +27,11 @@ abstract class AbstractSiteExtractor implements SiteExtractorContract
     public function __construct(
         protected readonly string $url,
     ) {
+        $saf = mt_rand(531, 536) . mt_rand(0, 2);
+        $userAgent = "(X11; Linux x86_64) AppleWebKit/$saf (KHTML, like Gecko) Chrome/" . mt_rand(36, 40) . '.0.' . mt_rand(800, 899) . ".0 Mobile Safari/$saf";
         $cachingMiddleware = new CacheMiddleware(new GreedyCacheStrategy(new LaravelCacheStorage(Cache::store()), 60 * 15));
         $response = Http::withMiddleware($cachingMiddleware)
+            ->withUserAgent($userAgent)
             ->timeout(10)
             ->get($url);