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

fix code resources

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-03 09:54:00 +07:00
parent 71a3b98915
commit 0bb82dc66a
7 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,12 @@
namespace Modules\Linksehat\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Models\Organization;
use DB;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Modules\Linksehat\Transformers\HospitalResource;
use Modules\Linksehat\Transformers\Hospitals\HospitalResourceDetail;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
class HospitalController extends Controller
{
@@ -19,7 +17,7 @@ class HospitalController extends Controller
*/
public function index(Request $request)
{
$hospitals = Organization::query()
/**$hospitals = Organization::query()
->with(['currentAddress'])
->where('organizations.type', 'hospital')
->when($request->search ?? null, function ($query, $search) {
@@ -41,23 +39,23 @@ class HospitalController extends Controller
$hospitals->orderBy('organizations.name', 'asc');
}
// if ($request->has('order_by')) {
// switch($request->order_by) {
// case 'distance_asc':
// if ($request->order_by == 'distance_asc' && $request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
// $hospitals->orderBy('distance_km', 'asc');
// break;
// }
// case 'distance_desc':
// if ($request->order_by == 'distance_desc' && $request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
// $hospitals->orderBy('distance_km', 'desc');
// break;
// }
// default:
// $hospitals->orderBy('organizations.name', 'asc');
// break;
// }
// }
if ($request->has('order_by')) {
switch($request->order_by) {
case 'distance_asc':
if ($request->order_by == 'distance_asc' && $request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
$hospitals->orderBy('distance_km', 'asc');
break;
}
case 'distance_desc':
if ($request->order_by == 'distance_desc' && $request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
$hospitals->orderBy('distance_km', 'desc');
break;
}
default:
$hospitals->orderBy('organizations.name', 'asc');
break;
}
}
$limit = $request->limit ?? 6;
if ($limit > 20) {
@@ -71,7 +69,7 @@ class HospitalController extends Controller
return response()->json([
'message' => 'Sukses mengambil data Rumah Sakit',
'hospitals' => Helper::paginateResources(HospitalResource::collection($hospitals))
]);
]);*/
}
/**
@@ -101,16 +99,23 @@ class HospitalController extends Controller
public function show(Request $request, $id)
{
$queryHospitals = Organization::query()
->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');
})
->leftJoin('addresses', function ($q) {
$q->on('organizations.main_address_id', '=', 'addresses.id');
$q->where('addresses.addressable_type', '=', Organization::class);
})
->leftJoin('cities', function ($query) {
$query->on('addresses.city_id', '=', 'cities.id');
});
if ($request->has('lat') && !empty($request->lat) && $request->has('lng') && !empty($request->lng)) {
$queryHospitals = $queryHospitals->selectRaw("organizations.*, addresses.text AS currentAddress, 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');
}
$queryHospitals = $queryHospitals->orderBy('organizations.name', 'asc')->findOrFail($id);
return HospitalResourceDetail::make($queryHospitals);
return HospitalResource::make($queryHospitals);
}
/**