From 713bd9ffe3b06c90360098a269258e533e6db71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Pocrnji=C4=8D?= <simon.pocrnjic@lume-solutions.si>
Date: Tue, 19 Nov 2024 21:29:53 +0100
Subject: [PATCH] fix 6

---
 app/Models/Client.php        | 12 ++++--------
 app/Models/ClientCase.php    |  6 +++---
 app/Models/Person/Person.php |  1 +
 routes/web.php               | 17 ++++++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Models/Client.php b/app/Models/Client.php
index 36c27c8..fb5e6e5 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -34,17 +34,13 @@ protected function makeAllSearchableUsing(Builder $query): Builder
 
     public function toSearchableArray(): array
     {
-        
-        /*$person = [
-            'full_name' => $this->person->full_name,
-            'addresses' => $this->person->addresses,
-            'phones' => $this->person->phones
-        ];*/
-        $this->loadMissing('person');
 
         $array = $this->toArray();
 
-        $array['person_full_name'] = $this->person ? $this->person->full_name: null;
+        $array['person'] = $this->person ? $this->person->only(['full_name', 'tax_number', 'social_security_number']): null;
+        $array['person_addresses'] = $this->person->addresses ? $this->person->addresses->only(['adddress'])->toArray() : [];
+        $array['person_phones'] = $this->person->phones ? $this->person->phones->only(['nu'])->toArray() : [];
+
 
         return $array;
     }
diff --git a/app/Models/ClientCase.php b/app/Models/ClientCase.php
index 2cf9610..22252f1 100644
--- a/app/Models/ClientCase.php
+++ b/app/Models/ClientCase.php
@@ -34,11 +34,11 @@ protected function makeAllSearchableUsing(Builder $query): Builder
 
     public function toSearchableArray(): array
     {
-        $this->loadMissing('person');
-        
         $array = $this->toArray();
 
-        $array['person_full_name'] = $this->person ? $this->person->full_name: null;
+        $array['person'] = $this->person ? $this->person->only(['full_name', 'tax_number', 'social_security_number']): null;
+        $array['person_addresses'] = $this->person->addresses ? $this->person->addresses->only(['adddress'])->toArray() : [];
+        $array['person_phones'] = $this->person->phones ? $this->person->phones->only(['nu'])->toArray() : [];
 
         return $array;
     }
diff --git a/app/Models/Person/Person.php b/app/Models/Person/Person.php
index cf57ed7..ea93797 100644
--- a/app/Models/Person/Person.php
+++ b/app/Models/Person/Person.php
@@ -42,6 +42,7 @@ class Person extends Model
     ];
 
     protected $hidden = [
+        'id',
         'deleted',
         'user_id'
     ];
diff --git a/routes/web.php b/routes/web.php
index e772551..dcb799b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,7 @@
 use App\Http\Controllers\ContractController;
 use App\Http\Controllers\SettingController;
 use App\Models\Person\Person;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use ArielMejiaDev\LarapexCharts\LarapexChart;
 use Illuminate\Support\Facades\Route;
@@ -50,15 +51,17 @@
                 })
                 ->get();*/
             $clients = App\Models\Client::search($request->input('query'))
-                ->get()
-                ->load('person:id,full_name')
-                ->take(5);
+                ->query( fn(Builder $builder) => 
+                    $builder->with('person:id,full_name')->limit($request->input('limit')) 
+                )
+                ->get();
 
             $clientCases = App\Models\ClientCase::search($request->input('query'))
-                ->get()
-                ->load('person:id,full_name')
-                ->take(5);
-
+                ->query( fn(Builder $builder) => 
+                    $builder->with('person:id,full_name')->limit($request->input('limit')) 
+                )
+                ->get();
+                
             
             return [
                 'clients' => $clients,