Merge pull request #536 from karlomikus/develop

Fix public menu handling

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v5.9.1
+## Fixes
+- Public menu can be enabled independently of `is_public` bar setting
+
 # v5.9.0
 # New
 - Documented `public/{slugOrId}` endpoints

app/BarContext.php

@@ -11,9 +11,9 @@
  * Combined with bar() helper method you can always get the current requested Bar model.
  * @see \Kami\Cocktail\Http\Middleware\EnsureRequestHasBarQuery
  */
-final class BarContext
+final readonly class BarContext
 {
-    public function __construct(private readonly Bar $currentBar)
+    public function __construct(private Bar $currentBar)
     {
     }
 

app/Console/Commands/BarFullBackup.php

@@ -23,7 +23,7 @@ class BarFullBackup extends Command
      */
     protected $description = 'Create a .zip file with the full backup of your Bar Assistant instance data';
 
-    public function __construct(private ToFullBackup $exporter)
+    public function __construct(private readonly ToFullBackup $exporter)
     {
         parent::__construct();
     }

app/Console/Commands/BarMaintenance.php

@@ -29,7 +29,7 @@ class BarMaintenance extends Command
      */
     protected $description = 'This will remove unused images, update missing ABVs, fix ingredient sort and refresh cache';
 
-    private Filesystem $disk;
+    private readonly Filesystem $disk;
 
     public function __construct()
     {

app/Exceptions/Handler.php

@@ -60,18 +60,14 @@ public function register()
             }
         });
 
-        $this->renderable(function (NotFoundHttpException $e, $request) {
-            return response()->json([
-                'type' => 'api_error',
-                'message' => 'Resource not found.',
-            ], 404);
-        });
+        $this->renderable(fn (NotFoundHttpException $e, $request) => response()->json([
+            'type' => 'api_error',
+            'message' => 'Resource not found.',
+        ], 404));
 
-        $this->renderable(function (MethodNotAllowedHttpException $e, $request) {
-            return response()->json([
-                'type' => 'api_error',
-                'message' => $e->getMessage(),
-            ], 405);
-        });
+        $this->renderable(fn (MethodNotAllowedHttpException $e, $request) => response()->json([
+            'type' => 'api_error',
+            'message' => $e->getMessage(),
+        ], 405));
     }
 }

app/External/Export/ToDataPack.php

@@ -48,7 +48,7 @@ public function process(int $barId, ?string $filename = null, ForceUnitConvertEn
         $meta = [
             'version' => $version,
             'date' => Carbon::now()->toAtomString(),
-            'called_from' => __CLASS__,
+            'called_from' => self::class,
         ];
 
         File::ensureDirectoryExists($this->file->disk('exports')->path((string) $barId));

app/External/Export/ToFullBackup.php

@@ -23,7 +23,7 @@ public function process(?string $exportPath = null): string
         $meta = [
             'version' => $version,
             'date' => Carbon::now()->toAtomString(),
-            'called_from' => __CLASS__,
+            'called_from' => self::class,
         ];
 
         $zip = new ZipArchive();

app/External/Export/ToRecipeType.php

@@ -38,7 +38,7 @@ public function process(int $barId, ?string $filename = null, ExportTypeEnum $ty
         $meta = [
             'version' => $version,
             'date' => Carbon::now()->toAtomString(),
-            'called_from' => __CLASS__,
+            'called_from' => self::class,
             'type' => $type->value,
             'bar_id' => $barId,
             'schema' => $type === ExportTypeEnum::Schema ? 'https://barassistant.app/cocktail-02.schema.json' : null,

app/External/Import/FromDataPack.php

@@ -25,7 +25,7 @@
 
 class FromDataPack
 {
-    private Filesystem $uploadsDisk;
+    private readonly Filesystem $uploadsDisk;
 
     /** @var array<string> */
     private array $barShelf = [];
@@ -107,9 +107,9 @@ private function importBaseData(string $tableName, string $filepath, int $barId)
         }, $data);
 
         // Skip duplicates
-        $existing = DB::table($tableName)->select('name')->where('bar_id', $barId)->get()->keyBy(fn ($row) => strtolower($row->name))->toArray();
+        $existing = DB::table($tableName)->select('name')->where('bar_id', $barId)->get()->keyBy(fn ($row) => strtolower((string) $row->name))->toArray();
         $importData = array_filter($importData, function ($item) use ($existing) {
-            if (array_key_exists(strtolower($item['name']), $existing)) {
+            if (array_key_exists(strtolower((string) $item['name']), $existing)) {
                 return false;
             }
 
@@ -127,9 +127,9 @@ private function importCalculators(string $filepath, int $barId): void
             $data = [];
         }
 
-        $existing = DB::table('calculators')->select('name')->where('bar_id', $barId)->get()->keyBy(fn ($row) => strtolower($row->name))->toArray();
+        $existing = DB::table('calculators')->select('name')->where('bar_id', $barId)->get()->keyBy(fn ($row) => strtolower((string) $row->name))->toArray();
         $data = array_filter($data, function ($item) use ($existing) {
-            if (array_key_exists(strtolower($item['name']), $existing)) {
+            if (array_key_exists(strtolower((string) $item['name']), $existing)) {
                 return false;
             }
 
@@ -175,9 +175,7 @@ private function importIngredients(Filesystem $dataDisk, Bar $bar, User $user):
     {
         $timerStart = microtime(true);
 
-        $existingIngredients = DB::table('ingredients')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(function ($ingredient) {
-            return Str::slug($ingredient->name);
-        });
+        $existingIngredients = DB::table('ingredients')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn ($ingredient) => Str::slug($ingredient->name));
 
         $ingredientsToInsert = [];
         $parentIngredientsToInsert = [];
@@ -322,9 +320,7 @@ private function importBaseCocktails(Filesystem $dataDisk, Bar $bar, User $user)
         $dbIngredients = DB::table('ingredients')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
         $dbGlasses = DB::table('glasses')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
         $dbMethods = DB::table('cocktail_methods')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
-        $existingCocktails = DB::table('cocktails')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(function ($cocktail) {
-            return Str::slug($cocktail->name);
-        });
+        $existingCocktails = DB::table('cocktails')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn ($cocktail) => Str::slug($cocktail->name));
 
         $cocktailImages = [];
         $uniqueTags = [];

app/External/Import/FromJsonSchema.php

@@ -20,7 +20,7 @@
 
 class FromJsonSchema
 {
-    private Matcher $matcher;
+    private readonly Matcher $matcher;
 
     public function __construct(
         private readonly CocktailService $cocktailService,