diff --git a/app/Http/Controllers/Api/LotController.php b/app/Http/Controllers/Api/LotController.php index 98c1778..4ba69c6 100644 --- a/app/Http/Controllers/Api/LotController.php +++ b/app/Http/Controllers/Api/LotController.php @@ -16,7 +16,8 @@ class LotController extends Controller 'size.packing', 'recipe.spices', 'origins.spice', - 'origins.supplier', + 'origins.entries.supplier', + 'origins.entries.farmer', ])->where('lot_number', $lotNumber)->first(); if (! $batch) { diff --git a/app/Http/Resources/LotResource.php b/app/Http/Resources/LotResource.php index 78a2b22..461792b 100644 --- a/app/Http/Resources/LotResource.php +++ b/app/Http/Resources/LotResource.php @@ -35,12 +35,14 @@ class LotResource extends JsonResource return [ 'name' => $spice->name, 'percentage' => (float) $spice->pivot->amount_in_percent, - 'origin' => $origin ? [ - 'country' => $origin->origin_country, - 'farmer' => $origin->farmer, - 'supplier' => $origin->supplier?->name, - 'notes' => $origin->notes, - ] : null, + 'origins' => $origin + ? $origin->entries->map(fn ($e) => [ + 'country' => $e->origin_country, + 'supplier' => $e->supplier?->name, + 'farmer' => $e->farmer?->name, + 'notes' => $e->notes, + ])->values() + : [], ]; })->values(), ];