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

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

@@ -7,8 +7,8 @@ use App\Models\PractitionerRole;
use Illuminate\Routing\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Modules\Linksehat\Transformers\Dashboard\DoctorResource as DoctorResourceDashboard;
use Modules\Linksehat\Transformers\Dashboard\ArticleResource as ArticleResourceDashboard;
use Modules\Linksehat\Transformers\Article\ArticleResource;
use Modules\Linksehat\Transformers\Doctor\DoctorResource;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
use Symfony\Component\HttpFoundation\Response;
@@ -31,9 +31,7 @@ class DashboardController extends Controller
->get(['id', 'practitioner_id', 'speciality_id'])
->random($limit);
return $queryDoctors;
$data = DoctorResourceDashboard::collection($queryDoctors);
$data = DoctorResource::collection($queryDoctors);
} elseif ($query === 'hospitals') {
$queryHospitals = Organization::query()
->leftJoin('addresses', function ($query) {
@@ -43,8 +41,8 @@ class DashboardController extends Controller
$query->on('addresses.city_id', '=', 'cities.id');
})
->where('addresses.addressable_type', '=', Organization::class)
->where('organizations.type', 'hospital')
->where('organizations.status', 'active')
->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->orderBy('distance', 'ASC');
@@ -57,7 +55,7 @@ class DashboardController extends Controller
$data = HospitalResource::collection($queryHospitals);
} elseif ($query === 'articles') {
$data = ArticleResourceDashboard::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
$data = ArticleResource::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
}
return response()->json([