Enable image uploads for glasses

Author: karlomikus

app/Http/Controllers/GlassController.php

@@ -4,10 +4,12 @@
 
 namespace Kami\Cocktail\Http\Controllers;
 
+use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use OpenApi\Attributes as OAT;
 use Kami\Cocktail\Models\Glass;
+use Kami\Cocktail\Models\Image;
 use Illuminate\Http\JsonResponse;
 use Kami\Cocktail\OpenAPI as BAO;
 use Kami\Cocktail\Http\Requests\GlassRequest;
@@ -44,7 +46,7 @@ public function index(): JsonResource
     #[BAO\NotFoundResponse]
     public function show(Request $request, int $id): JsonResource
     {
-        $glass = Glass::withCount('cocktails')->findOrFail($id);
+        $glass = Glass::withCount('cocktails')->with('images')->findOrFail($id);
 
         if ($request->user()->cannot('show', $glass)) {
             abort(403);
@@ -73,10 +75,21 @@ public function store(GlassRequest $request): JsonResponse
             abort(403);
         }
 
-        $glass = BAO\Schemas\GlassRequest::fromLaravelRequest($request)->toLaravelModel();
+        $glassRequest = BAO\Schemas\GlassRequest::fromLaravelRequest($request);
+
+        $glass = $glassRequest->toLaravelModel();
         $glass->bar_id = bar()->id;
         $glass->save();
 
+        if (count($glassRequest->images) > 0) {
+            try {
+                $imageModels = Image::findOrFail($glassRequest->images);
+                $glass->attachImages($imageModels);
+            } catch (Throwable $e) {
+                abort(500, $e->getMessage());
+            }
+        }
+
         return (new GlassResource($glass))
             ->response()
             ->setStatusCode(201)
@@ -104,10 +117,21 @@ public function update(int $id, GlassRequest $request): JsonResource
             abort(403);
         }
 
-        $glass = BAO\Schemas\GlassRequest::fromLaravelRequest($request)->toLaravelModel($glass);
+        $glassRequest = BAO\Schemas\GlassRequest::fromLaravelRequest($request);
+
+        $glass = $glassRequest->toLaravelModel($glass);
         $glass->updated_at = now();
         $glass->save();
 
+        if (count($glassRequest->images) > 0) {
+            try {
+                $imageModels = Image::findOrFail($glassRequest->images);
+                $glass->attachImages($imageModels);
+            } catch (Throwable $e) {
+                abort(500, $e->getMessage());
+            }
+        }
+
         $glass->cocktails->each(fn ($cocktail) => $cocktail->searchable());
 
         return new GlassResource($glass);

app/Http/Filters/GlassQueryFilter.php

@@ -24,6 +24,7 @@ public function __construct()
             ->defaultSort('name')
             ->allowedSorts('name', 'created_at')
             ->withCount('cocktails')
+            ->with('images')
             ->filterByBar();
     }
 }

app/Http/Resources/GlassResource.php

@@ -20,6 +20,7 @@
         new OAT\Property(property: 'cocktails_count', type: 'integer', example: 32, description: 'The number of cocktails that use this glassware'),
         new OAT\Property(property: 'volume', type: 'number', format: 'float', nullable: true, example: 120.0, description: 'The volume of the glassware'),
         new OAT\Property(property: 'volume_units', type: 'string', nullable: true, example: 'ml', description: 'The volume units of the glassware'),
+        new OAT\Property(property: 'images', type: 'array', items: new OAT\Items(type: ImageResource::class), description: 'Glassware images'),
     ],
     required: ['id', 'name', 'description', 'cocktails_count', 'volume', 'volume_units']
 )]
@@ -40,6 +41,10 @@ public function toArray($request)
             'volume' => $this->volume,
             'volume_units' => $this->volume_units,
             'cocktails_count' => $this->whenCounted('cocktails'),
+            'images' => $this->when(
+                $this->relationLoaded('images'),
+                fn () => ImageResource::collection($this->images)
+            ),
         ];
     }
 }

app/Models/Concerns/HasImages.php

@@ -60,7 +60,7 @@ public function attachImages(Collection $images): void
         $disk = Storage::disk('uploads');
 
         foreach ($images as $image) {
-            if (!$image->isTemp()) { // Dont attach already attached images
+            if (!$image->isTemporaryImage()) { // Dont attach already attached images
                 continue;
             }
 

app/Models/Glass.php

@@ -4,7 +4,9 @@
 
 namespace Kami\Cocktail\Models;
 
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
+use Kami\Cocktail\Models\Concerns\HasImages;
 use Kami\Cocktail\Models\Concerns\HasAuthors;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -18,6 +20,17 @@ class Glass extends Model
     use HasFactory;
     use HasBarAwareScope;
     use HasAuthors;
+    use HasImages;
+
+    public function getUploadPath(): string
+    {
+        return 'glasses/';
+    }
+
+    public function getSlugAttribute(): string
+    {
+        return Str::slug($this->name);
+    }
 
     /**
      * @return Attribute<?float, ?float>

app/Models/Image.php

@@ -107,7 +107,7 @@ public function getAllBarImages(int $barId): Collection
         return $cocktailImages->merge($ingredientImages);
     }
 
-    public function isTemp(): bool
+    public function isTemporaryImage(): bool
     {
         return str_starts_with($this->file_path, 'temp/') || $this->imageable_id === null;
     }

app/OpenAPI/Schemas/GlassRequest.php

@@ -19,6 +19,9 @@ class GlassRequest
     public ?float $volume = null;
     #[OAT\Property(property: 'volume_units', example: 'ml')]
     public ?string $volumeUnits = null;
+    /** @var array<int> */
+    #[OAT\Property(items: new OAT\Items(type: 'integer'), description: 'Existing image ids')]
+    public array $images = [];
 
     public static function fromLaravelRequest(Request $request): self
     {
@@ -28,6 +31,7 @@ public static function fromLaravelRequest(Request $request): self
         $result->description = $request->input('description');
         $result->volume = $request->float('volume');
         $result->volumeUnits = $request->input('volume_units');
+        $result->images = array_map('intval', $request->input('images', []));
 
         return $result;
     }

docs/openapi-generated.yaml

@@ -9088,6 +9088,11 @@ components:
             - string
             - 'null'
           example: ml
+        images:
+          description: 'Glassware images'
+          type: array
+          items:
+            $ref: '#/components/schemas/Image'
       type: object
     Image:
       description: 'Image attached to a specific resource'
@@ -10439,6 +10444,11 @@ components:
             - string
             - 'null'
           example: ml
+        images:
+          description: 'Existing image ids'
+          type: array
+          items:
+            type: integer
       type: object
     ImageRequest:
       required: