csfix

Author: karlomikus

app/Http/Controllers/Public/MenuController.php

@@ -5,16 +5,26 @@
 namespace Kami\Cocktail\Http\Controllers\Public;
 
 use Kami\Cocktail\Models\Menu;
+use OpenApi\Attributes as OAT;
+use Kami\Cocktail\OpenAPI as BAO;
 use Kami\Cocktail\Http\Controllers\Controller;
 use Kami\Cocktail\Http\Resources\MenuPublicResource;
 
 class MenuController extends Controller
 {
-    public function show(string $barId): MenuPublicResource
+    #[OAT\Get(path: '/public/{slugOrId}/menu', tags: ['Public'], operationId: 'showPublicBarMenu', description: 'Show a public bar menu details', summary: 'Show public menu', parameters: [
+    new OAT\Parameter(name: 'slugOrId', in: 'path', required: true, description: 'Database id or slug of bar', schema: new OAT\Schema(type: 'string')),
+    ], security: [])]
+    #[BAO\SuccessfulResponse(content: [
+        new BAO\WrapObjectWithData(MenuPublicResource::class),
+    ])]
+    #[BAO\NotFoundResponse]
+    public function show(string $barSlugOrId): MenuPublicResource
     {
         $menu = Menu::select('menus.*')
-            ->where('bars.id', $barId)
             ->where('menus.is_enabled', true)
+            ->where('bars.id', $barSlugOrId)
+            ->orWhere('bars.slug', $barSlugOrId)
             ->join('bars', 'bars.id', '=', 'menus.bar_id')
             ->join('menu_cocktails', 'menu_cocktails.menu_id', '=', 'menus.id')
             ->orderBy('menu_cocktails.sort', 'asc')

app/Http/Resources/Public/BarResource.php

@@ -41,7 +41,7 @@ public function toArray($request)
             'subtitle' => $this->subtitle,
             'description' => $this->description,
             'images' => ImageResource::collection($this->images),
-            'is_menu_enabled' => $this->menu?->is_enabled ?? false,
+            'is_menu_enabled' => $this->menu->is_enabled ?? false,
         ];
     }
 }

app/Models/Ingredient.php

@@ -252,7 +252,7 @@ public function getIngredientsUsedAsSubstituteFor(): Collection
     /**
      * Return all ingredients that can be substituted with this ingredient
      *
-     * @return Collection<int, $this>
+     * @return Collection<int, Ingredient>
      */
     public function getCanBeSubstitutedWithIngredients(): Collection
     {

docs/openapi-generated.yaml

@@ -6043,6 +6043,59 @@ paths:
                   data: { $ref: '#/components/schemas/APIError' }
                 type: object
       security: []
+  '/public/{slugOrId}/menu':
+    get:
+      tags:
+        - Public
+      summary: 'Show public menu'
+      description: 'Show a public bar menu details'
+      operationId: showPublicBarMenu
+      parameters:
+        -
+          name: slugOrId
+          in: path
+          description: 'Database id or slug of bar'
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: 'Successful response'
+          headers:
+            x-ratelimit-limit:
+              description: 'Max number of attempts.'
+              schema:
+                type: integer
+            x-ratelimit-remaining:
+              description: 'Remaining number of attempts.'
+              schema:
+                type: integer
+          content:
+            application/json:
+              schema:
+                required:
+                  - data
+                properties:
+                  data: { $ref: '#/components/schemas/MenuPublic' }
+                type: object
+        '404':
+          description: 'Resource record not found.'
+          headers:
+            x-ratelimit-limit:
+              description: 'Max number of attempts.'
+              schema:
+                type: integer
+            x-ratelimit-remaining:
+              description: 'Remaining number of attempts.'
+              schema:
+                type: integer
+          content:
+            application/json:
+              schema:
+                properties:
+                  data: { $ref: '#/components/schemas/APIError' }
+                type: object
+      security: []
   '/cocktails/{id}/ratings':
     post:
       tags: