Merge branch 'master' into develop

Author: karlomikus

app/External/Model/Ingredient.php

@@ -150,19 +150,19 @@ public static function fromCSV(array $sourceArray): self
             name: $sourceArray['name'],
             parentId: null,
             strength: isset($sourceArray['strength']) ? floatval($sourceArray['strength']) : 0.0,
-            description: blank($sourceArray['description']) ? null : $sourceArray['description'],
-            origin: blank($sourceArray['origin']) ? null : $sourceArray['origin'],
-            color: blank($sourceArray['color']) ? null : $sourceArray['color'],
+            description: blank($sourceArray['description'] ?? null) ? null : $sourceArray['description'],
+            origin: blank($sourceArray['origin'] ?? null) ? null : $sourceArray['origin'],
+            color: blank($sourceArray['color'] ?? null) ? null : $sourceArray['color'],
             createdAt: null,
             updatedAt: null,
             images: [],
             ingredientParts: [],
             prices: [],
             calculatorId: null,
-            sugarContent: blank($sourceArray['sugar_g_per_ml']) ? null : $sourceArray['sugar_g_per_ml'],
-            acidity: blank($sourceArray['acidity']) ? null : $sourceArray['acidity'],
-            distillery: blank($sourceArray['distillery']) ? null : $sourceArray['distillery'],
-            units: blank($sourceArray['units']) ? null : new UnitValueObject($sourceArray['units']),
+            sugarContent: blank($sourceArray['sugar_g_per_ml'] ?? null) ? null : $sourceArray['sugar_g_per_ml'],
+            acidity: blank($sourceArray['acidity'] ?? null) ? null : $sourceArray['acidity'],
+            distillery: blank($sourceArray['distillery'] ?? null) ? null : $sourceArray['distillery'],
+            units: blank($sourceArray['units'] ?? null) ? null : new UnitValueObject($sourceArray['units']),
         );
     }
 

routes/api.php

@@ -223,7 +223,7 @@
 
     Route::prefix('import')->middleware(['throttle:importing'])->group(function () {
         Route::post('/scrape', [ImportController::class, 'scrape'])->middleware([EnsureRequestHasBarQuery::class, 'ability:cocktails.import'])->name('import.scrape');
-        Route::post('/cocktail', [ImportController::class, 'cocktail'])->middleware([EnsureRequestHasBarQuery::class, 'ability:*'])->name('import.cocktail');
+        Route::post('/cocktail', [ImportController::class, 'cocktail'])->middleware([EnsureRequestHasBarQuery::class, 'ability:cocktails.import'])->name('import.cocktail');
         Route::post('/file', [ImportController::class, 'file'])->middleware([EnsureRequestHasBarQuery::class, 'ability:*'])->name('import.file');
         Route::post('/ingredients', [ImportController::class, 'ingredients'])->middleware([EnsureRequestHasBarQuery::class, 'ability:*'])->name('import.ingredients');
     });