Fix Rating
This commit is contained in:
@@ -5,6 +5,7 @@ namespace Modules\Linksehat\Http\Controllers\Api;
|
||||
use App\Helpers\Helper;
|
||||
use App\Models\Practitioner;
|
||||
use App\Models\PractitionerRole;
|
||||
use DB;
|
||||
use Illuminate\Contracts\Support\Renderable;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
@@ -21,7 +22,23 @@ class DoctorController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
$doctors = PractitionerRole::query()
|
||||
->with(['practitioner.person', 'speciality', 'practitioner.metas', 'metas', 'organization'])
|
||||
->with(['practitioner.person', 'speciality', 'practitioner.metas', 'metas',
|
||||
'organization' => function ($query) use ($request) {
|
||||
if ($request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
|
||||
return $query->leftJoin('addresses', function($q) {
|
||||
$q->on('organizations.main_address_id', '=', 'addresses.id');
|
||||
$q->where('addresses.addressable_type', '=', Organization::class);
|
||||
})
|
||||
->select([
|
||||
"organizations.*",
|
||||
"addresses.lat",
|
||||
"addresses.lng",
|
||||
// DB::raw("ST_Distance_Sphere(point(addresses.lng,addresses.lat), point(".$request->lng.",".$request->lat.")) /1000 as distance_km"),
|
||||
DB::raw("6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance_km")
|
||||
]);
|
||||
}
|
||||
},
|
||||
])
|
||||
->when($request->search ?? null, function($query, $search) {
|
||||
$query->whereHas('practitioner.person', function($person) use ($search) {
|
||||
$person->where('name', 'LIKE', '%'.$search.'%');
|
||||
@@ -40,7 +57,7 @@ class DoctorController extends Controller
|
||||
$limit = 20;
|
||||
}
|
||||
|
||||
$doctors = $doctors->paginate($limit);
|
||||
$doctors = $doctors->paginate($limit);
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Sukses mengambil data Dokter',
|
||||
@@ -72,14 +89,26 @@ class DoctorController extends Controller
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function show($id)
|
||||
public function show(Request $request, $id)
|
||||
{
|
||||
$doctor = Practitioner::query()
|
||||
->with([
|
||||
'practitionerRoles',
|
||||
'practitionerRoles.metas',
|
||||
'practitionerRoles.speciality',
|
||||
'practitionerRoles.organization',
|
||||
'practitionerRoles.organization' => function ($query) use ($request) {
|
||||
if ($request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
|
||||
$query->leftJoin('addresses', function($q) {
|
||||
$q->on('organizations.main_address_id', '=', 'addresses.id');
|
||||
$q->where('addresses.addressable_type', '=', Organization::class);
|
||||
});
|
||||
$query->select([
|
||||
"organizations.*",
|
||||
// DB::raw("ST_Distance_Sphere(point(addresses.lng,addresses.lat), point(".$request->lng.",".$request->lat.")) /1000 as distance_km"),
|
||||
DB::raw("6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance_km")
|
||||
]);
|
||||
}
|
||||
},
|
||||
'practitionerRoles.practices',
|
||||
'practitionerRoles.availabilities',
|
||||
'person',
|
||||
|
||||
Reference in New Issue
Block a user