diff --git a/app/Models/Client.php b/app/Models/Client.php index c4e7ce6..dea767a 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -41,9 +41,12 @@ public function toSearchableArray(): array 'phones' => $this->person->phones ];*/ - return [ - 'person' => $this->person->toArray() - ]; + $this->loadMissing('person'); + $array = $this->toArray(); + + $array['person'] = $this->person ? $this->person->toArray() : []; + + return $array; } diff --git a/app/Models/ClientCase.php b/app/Models/ClientCase.php index adc9aae..58cbb7b 100644 --- a/app/Models/ClientCase.php +++ b/app/Models/ClientCase.php @@ -34,11 +34,12 @@ protected function makeAllSearchableUsing(Builder $query): Builder public function toSearchableArray(): array { - return [ - 'person' => $this->person, - 'addresses' => $this->person->addresses, - 'phones' => $this->person->phones - ]; + $this->loadMissing('person'); + $array = $this->toArray(); + + $array['person'] = $this->person ? $this->person->toArray() : []; + + return $array; } public function client(): BelongsTo