From 8e887d1ebe474165cffcc9cab651b6435968b80b Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 29 Jun 2021 18:26:37 +0200 Subject: [PATCH] app/Jobs/ImportProfession.php: should not use firstOrFail() when searching for items. as this will do an abort(404), that is very confusing. --- app/Jobs/ImportProfession.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Jobs/ImportProfession.php b/app/Jobs/ImportProfession.php index de3b1d1..947140b 100644 --- a/app/Jobs/ImportProfession.php +++ b/app/Jobs/ImportProfession.php @@ -79,7 +79,10 @@ class ImportProfession implements ShouldQueue // Create recipes for character foreach($this->recipes as $data) { - $item = Item::where('name', $data->name)->firstOrFail(); + $item = Item::where('name', $data->name)->first(); + if (!$item) { + throw new Exception("Could not find item '{$data->name}'"); + } $recipes[] = $this->getRecipe($item, $profession, $data)->id; } @@ -129,7 +132,10 @@ class ImportProfession implements ShouldQueue // Reagents foreach($data->items as $reagent) { - $item = Item::where('name', $reagent->name)->firstOrFail(); + $item = Item::where('name', $reagent->name)->first(); + if (!$item) { + throw new Exception("Could not find item '{$reagent->name}'"); + } $recipe->reagents()->attach($item, [ 'quantity' => $reagent->num ]); }