From 9b67ba420fa552390a4ad4faaa2a15aa06efae6d Mon Sep 17 00:00:00 2001 From: Muhammad Fajar Date: Mon, 31 Oct 2022 07:17:41 +0700 Subject: [PATCH] fix dashboardcontroller query & resources doctors --- .../Http/Controllers/Api/DashboardController.php | 4 +++- .../Linksehat/Transformers/Dashboard/DoctorResource.php | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/DashboardController.php b/Modules/Linksehat/Http/Controllers/Api/DashboardController.php index ac73399c..70adf454 100644 --- a/Modules/Linksehat/Http/Controllers/Api/DashboardController.php +++ b/Modules/Linksehat/Http/Controllers/Api/DashboardController.php @@ -28,9 +28,11 @@ class DashboardController extends Controller ]) ->where('active', 1) ->whereNot('speciality_id') - ->get(['id', 'speciality_id']) + ->get(['id', 'practitioner_id', 'speciality_id']) ->random($limit); + return $queryDoctors; + $data = DoctorResourceDashboard::collection($queryDoctors); } elseif ($query === 'hospitals') { $queryHospitals = Organization::query() diff --git a/Modules/Linksehat/Transformers/Dashboard/DoctorResource.php b/Modules/Linksehat/Transformers/Dashboard/DoctorResource.php index 92d81465..099f183a 100644 --- a/Modules/Linksehat/Transformers/Dashboard/DoctorResource.php +++ b/Modules/Linksehat/Transformers/Dashboard/DoctorResource.php @@ -15,11 +15,11 @@ class DoctorResource extends JsonResource public function toArray($request) { return [ - 'id' => $this->practitioner->person->id, - 'name' => $this->practitioner->person->name, - 'specialis' => "Spesialis " . $this->speciality->name, + 'id' => $this->practitioner_id, + 'name' => $this->person->name ?? '', + 'specialis' => "Spesialis " . $this->speciality->name ?? '', 'photos' => [ - 'title' => 'doctors-avatar-' . $this->id, + 'title' => 'doctors-avatar-' . $this->practitioner_id, 'url' => asset('images/default-doctor-avatar.png') ] ];