Merge pull request #375 from karlomikus/develop

Fix menu cocktail currency null check
karlomikus · Dec 8, 2024 · 715a2ad · 715a2ad
2 parents 0bbd43c + 1a7dfa1
commit 715a2ad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/app/Models/MenuCocktail.php b/app/Models/MenuCocktail.php
@@ -44,12 +44,16 @@ public function menu(): BelongsTo
 
     public function getMoney(): Money
     {
-        try {
-            $currency = Currency::of($this->currency);
-        } catch (UnknownCurrencyException) {
-            // Prior to inclusion of Money object, currency could be any string
-            // To handle migration cases, we'll fallback to EUR
+        if ($this->currency === null) {
             $currency = 'EUR';
+        } else {
+            try {
+                $currency = Currency::of($this->currency);
+            } catch (UnknownCurrencyException) {
+                // Prior to inclusion of Money object, currency could be any string
+                // To handle migration cases, we'll fallback to EUR
+                $currency = 'EUR';
+            }
         }
 
         return Money::ofMinor($this->price, $currency);

diff --git a/resources/docker/dist/init.sh b/resources/docker/dist/init.sh
@@ -27,6 +27,7 @@ fi
 # Enable WAL mode
 echo "[BAR-ASSISTANT] Enabling database WAL mode..."
 sqlite3 "$db_file" 'pragma journal_mode=wal;'
+sqlite3 "$db_file" 'pragma synchronous=NORMAL;'
 
 # Start running artisan commands
 cd "$APP_BASE_DIR"

diff --git a/tests/Feature/Http/MenuControllerTest.php b/tests/Feature/Http/MenuControllerTest.php
@@ -92,4 +92,16 @@ public function test_export_menu(): void
 
         $response->assertSuccessful();
     }
+
+    public function test_menu_has_null_currency(): void
+    {
+        $menu = Menu::factory()->for($this->barMembership->bar)->create(['is_enabled' => true]);
+        MenuCocktail::factory()->recycle($menu)->create([
+            'currency' => null,
+        ]);
+
+        $response = $this->getJson('/api/menu', ['Bar-Assistant-Bar-Id' => $this->barMembership->bar_id]);
+
+        $response->assertSuccessful();
+    }
 }