tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix resources hospital

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-03 15:52:51 +07:00
parent 5f8515feac
commit 6a57b8179a
6 changed files with 62 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Linksehat/Http/Controllers/Api/DashboardController.php
View File

@@ -45,10 +45,10 @@ class DashboardController extends Controller
->active()
->hospital()
->when($request->lat && $request->lng, function ($query) use ($request) {
$query->selectRaw("organizations.id, organizations.name, addresses.text AS address, cities.name AS city_name, 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");
$query->selectRaw("organizations.*, addresses.text AS address, addresses.lat, addresses.lng, cities.name AS city_name, 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");
$query->orderBy('distance', 'ASC');
}, function ($query) {
$query->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name']);
$query->select(['organizations.*', 'addresses.text AS address', 'addresses.lat', 'addresses.lng', 'cities.name AS city_name']);
$query->orderBy('organizations.name', 'asc');
})
->limit($limit)

41
Modules/Linksehat/Http/Controllers/Api/HospitalController.php
View File

@@ -4,6 +4,7 @@ namespace Modules\Linksehat\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Models\Organization;
use App\Models\Speciality;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
@@ -100,23 +101,41 @@ class HospitalController extends Controller
public function show(Request $request, $id)
{
$queryHospitals = Organization::query()
->with(['practitionerRoles' => function ($query) {
$query->select(['organization_id', 'speciality_id'])
->whereNot('speciality_id')
->groupBy(['speciality_id'])
->orderBy('speciality_id');
}])
->when($request->lat && $request->lng, function (Builder $query) use ($request) {
$query->selectRaw("organizations*, addresses.text AS address, cities.name AS city_name, 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");
$query->orderBy('distance', 'ASC');
}, function ($query) {
$query->select(['organizations.*', 'addresses.text AS address', 'cities.name AS city_name']);
$query->orderBy('organizations.name', 'asc');
$query->getQuery()
->selectRaw("organizations.*, addresses.text AS address, addresses.lat, addresses.lng, cities.name AS city_name, 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")
->orderBy('distance', 'ASC');
}, function (Builder $query) {
$query->getQuery()
->select(['organizations.*', 'addresses.text AS address', 'addresses.lat', 'addresses.lng', 'cities.name AS city_name'])
->groupBy(['organizations.id'])
->orderBy('organizations.name');
})
->leftJoin('addresses', function ($q) {
$q->on('organizations.main_address_id', '=', 'addresses.id');
$q->where('addresses.addressable_type', '=', Organization::class);
->leftJoin('addresses', function ($query) {
$query->on('organizations.main_address_id', '=', 'addresses.id');
})
->leftJoin('cities', function ($query) {
$query->on('addresses.city_id', '=', 'cities.id');
});
$queryHospitals = $queryHospitals->orderBy('organizations.name', 'asc')->findOrFail($id);
})
->where('organizations.id', $id)
->where('addresses.addressable_type', '=', Organization::class)
->findOrFail($id);
return Helper::responseJson(new HospitalResource($queryHospitals));
foreach ($queryHospitals->practitionerRoles as $practitionerRole) {
$specialitiesId[] = $practitionerRole->speciality_id;
}
$queryHospitals['specialities'] = Speciality::query()
->whereIn('id', $specialitiesId)
->get();
return Helper::responseJson(['hospitals' => new HospitalResource($queryHospitals)]);
}
/**