Updated public routes

Author: karlomikus

app/Http/Controllers/Public/BarController.php

@@ -4,12 +4,19 @@
 
 namespace Kami\Cocktail\Http\Controllers\Public;
 
+use Kami\Cocktail\Models\Bar;
 use Kami\Cocktail\Http\Controllers\Controller;
+use Kami\Cocktail\Http\Resources\Public\BarResource;
 
 class BarController extends Controller
 {
-    public function show(string $barSlug, string $id): null
+    public function show(int $barId): BarResource
     {
-        return null;
+        $bar = Bar::findOrFail($barId);
+        if (!$bar->is_public) {
+            abort(404);
+        }
+
+        return new BarResource($bar);
     }
 }

app/Http/Controllers/Public/CocktailController.php

@@ -12,16 +12,14 @@
 use Illuminate\Http\Resources\Json\JsonResource;
 use Spatie\QueryBuilder\Exceptions\InvalidFilterQuery;
 use Kami\Cocktail\Http\Filters\PublicCocktailQueryFilter;
-use Kami\Cocktail\Http\Resources\ExploreCocktailResource;
 use Kami\Cocktail\Http\Resources\Public\CocktailResource;
 
 class CocktailController extends Controller
 {
     public function index(Request $request, int $barId): JsonResource
     {
         $bar = Bar::findOrFail($barId);
-
-        if (!$bar->isPublic()) {
+        if (!$bar->is_public) {
             abort(404);
         }
 
@@ -62,10 +60,15 @@ public function index(Request $request, int $barId): JsonResource
         return CocktailResource::collection($cocktails->withQueryString());
     }
 
-    public function show(string $barSlug, string $id): ExploreCocktailResource
+    public function show(int $barId, string $slug): CocktailResource
     {
-        $cocktail = Cocktail::where('public_id', $id)->firstOrFail()->load('ingredients.ingredient');
+        $bar = Bar::findOrFail($barId);
+        if (!$bar->is_public) {
+            abort(404);
+        }
+
+        $cocktail = Cocktail::where('slug', $slug)->firstOrFail()->load('ingredients.ingredient');
 
-        return new ExploreCocktailResource($cocktail);
+        return new CocktailResource($cocktail);
     }
 }

app/Http/Controllers/Public/MenuController.php

@@ -12,13 +12,13 @@
 
 class MenuController extends Controller
 {
-    #[OAT\Get(path: '/public/{barId}/menu', tags: ['Public'], operationId: 'publicBarMenu', description: 'Show a public bar menu details', summary: 'Show public menu', parameters: [
-        new OAT\Parameter(name: 'barId', in: 'path', required: true, description: 'Bar database id', schema: new OAT\Schema(type: 'number')),
-    ], security: [])]
-    #[BAO\SuccessfulResponse(content: [
-        new BAO\WrapObjectWithData(MenuPublicResource::class),
-    ])]
-    #[BAO\NotFoundResponse]
+    // #[OAT\Get(path: '/public/{barId}/menu', tags: ['Public'], operationId: 'publicBarMenu', description: 'Show a public bar menu details', summary: 'Show public menu', parameters: [
+    //     new OAT\Parameter(name: 'barId', in: 'path', required: true, description: 'Bar database id', schema: new OAT\Schema(type: 'number')),
+    // ], security: [])]
+    // #[BAO\SuccessfulResponse(content: [
+    //     new BAO\WrapObjectWithData(MenuPublicResource::class),
+    // ])]
+    // #[BAO\NotFoundResponse]
     public function show(string $barId): MenuPublicResource
     {
         $menu = Menu::select('menus.*')

app/Http/Resources/BarResource.php

@@ -99,7 +99,7 @@ public function toArray($request)
                 $this->relationLoaded('images'),
                 fn () => ImageResource::collection($this->images)
             ),
-            'is_public' => $this->isPublic(),
+            'is_public' => (bool) $this->is_public,
         ];
     }
 }

app/Http/Resources/Public/BarResource.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kami\Cocktail\Http\Resources\Public;
+
+use Kami\Cocktail\Models\Image;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \Kami\Cocktail\Models\Bar
+ */
+class BarResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array<string, mixed>
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'slug' => $this->slug,
+            'name' => $this->name,
+            'subtitle' => $this->subtitle,
+            'description' => $this->description,
+            'images' => $this->images->map(function (Image $image) {
+                return [
+                    'sort' => $image->sort,
+                    'placeholder_hash' => $image->placeholder_hash,
+                    'url' => $image->getImageUrl(),
+                    'copyright' => $image->copyright,
+                ];
+            }),
+        ];
+    }
+}

app/Http/Resources/Public/CocktailResource.php

@@ -6,7 +6,6 @@
 
 use Kami\Cocktail\Models\Image;
 use Kami\Cocktail\Models\CocktailIngredient;
-use Kami\Cocktail\Http\Resources\AmountFormats;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Kami\Cocktail\Models\CocktailIngredientSubstitute;
 
@@ -24,8 +23,8 @@ class CocktailResource extends JsonResource
     public function toArray($request)
     {
         return [
-            'name' => $this->name,
             'slug' => $this->slug,
+            'name' => $this->name,
             'instructions' => e($this->instructions),
             'garnish' => e($this->garnish),
             'description' => e($this->description),

app/Models/Bar.php

@@ -29,6 +29,7 @@ class Bar extends Model implements UploadableInterface
 
     protected $casts = [
         'settings' => 'array',
+        'is_public' => 'boolean',
     ];
 
     public function getUploadPath(): string
@@ -199,9 +200,4 @@ public function getShelfCocktailsOnce(): array
             )->values()->toArray();
         });
     }
-
-    public function isPublic(): bool
-    {
-        return (bool) $this->is_public;
-    }
 }

routes/api.php

@@ -89,7 +89,7 @@
 Route::prefix('public')->group(function () {
     Route::get('/{barId}', [Public\BarController::class, 'show']);
     Route::get('/{barId}/cocktails', [Public\CocktailController::class, 'index']);
-    Route::get('/{barId}/cocktails/{id}', [Public\CocktailController::class, 'show']);
+    Route::get('/{barId}/cocktails/{slug}', [Public\CocktailController::class, 'show']);
     Route::get('/{barId}/menu', [Public\MenuController::class, 'show']);
 });