Add cocktail varieties

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v5.6.0
+## New
+- Added cocktail recipe parent ID tracking
+    - Allows for 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
+
 # v5.5.1
 ## Fixes
 - Fixed missing cocktail recipes with duplicated names in datapack export

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/Resources/CocktailResource.php

@@ -59,6 +59,8 @@
             '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'),
     ],
     required: [
         'id',
@@ -139,6 +141,10 @@ 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')),
         ];
     }
 }

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/CocktailRequest.php

@@ -41,6 +41,8 @@ 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,
     ) {
     }
 
@@ -68,6 +70,7 @@ 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,
         );
     }
 }

app/Services/CocktailService.php

@@ -42,6 +42,7 @@ public function createCocktail(CocktailDTO $cocktailDTO): Cocktail
             $cocktail->glass_id = $cocktailDTO->glassId;
             $cocktail->cocktail_method_id = $cocktailDTO->methodId;
             $cocktail->bar_id = $cocktailDTO->barId;
+            $cocktail->parent_cocktail_id = $cocktailDTO->parentCocktailId;
             $cocktail->save();
 
             foreach ($cocktailDTO->ingredients as $ingredient) {
@@ -125,6 +126,16 @@ public function updateCocktail(int $id, CocktailDTO $cocktailDTO): Cocktail
             $cocktail->updated_user_id = $cocktailDTO->userId;
             $cocktail->glass_id = $cocktailDTO->glassId;
             $cocktail->cocktail_method_id = $cocktailDTO->methodId;
+
+            if ($cocktailDTO->parentCocktailId !== $cocktail->id) {
+                $cocktail->parent_cocktail_id = $cocktailDTO->parentCocktailId;
+            } else {
+                $this->log->warning('[COCKTAIL_SERVICE] Attempted to set parent cocktail to itself', [
+                    'cocktail_id' => $cocktail->id,
+                    'parent_cocktail_id' => $cocktailDTO->parentCocktailId,
+                ]);
+            }
+
             $cocktail->updated_at = now();
             $cocktail->save();