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

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

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

3
Modules/Linksehat/Http/Controllers/Api/PersonController.php
View File

@@ -125,6 +125,9 @@ class PersonController extends Controller
'main_address_id', 'main_address_id',
'domicile_address_id', 'domicile_address_id',
]); ]);
return Person::query()->with('families')->find(auth()->user()->person_id);
$person->update($personData); $person->update($personData);
if ($request->hasFile('user_avatar')) { if ($request->hasFile('user_avatar')) {

2
Modules/Linksehat/Transformers/Dashboard/ArticleResource.php → Modules/Linksehat/Transformers/Article/ArticleResource.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace Modules\Linksehat\Transformers\Dashboard; namespace Modules\Linksehat\Transformers\Article;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;

2
Modules/Linksehat/Transformers/Dashboard/DoctorResource.php → Modules/Linksehat/Transformers/Doctor/DoctorResource.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace Modules\Linksehat\Transformers\Dashboard; namespace Modules\Linksehat\Transformers\Doctor;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;

23
Modules/Linksehat/Transformers/Hospital/HospitalResource.php
View File

@@ -2,6 +2,7 @@
namespace Modules\Linksehat\Transformers\Hospital; namespace Modules\Linksehat\Transformers\Hospital;
use App\Models\PractitionerRole;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
class HospitalResource extends JsonResource class HospitalResource extends JsonResource
@@ -14,13 +15,33 @@ class HospitalResource extends JsonResource
*/ */
public function toArray($request) public function toArray($request)
{ {
$querySpecialitys = PractitionerRole::query()
->with(['speciality'])
->where('organization_id', $this->id)
->whereNotNull('speciality_id')
->orderBy('speciality_id')
->groupBy('speciality_id')
->get(['speciality_id']);
foreach ($querySpecialitys as $indexSpeciality => $speciality) {
$specialitys[$indexSpeciality]['id'] = $speciality->speciality->id;
$specialitys[$indexSpeciality]['name'] = $speciality->speciality->name;
$specialitys[$indexSpeciality]['avatar'] = asset('images/default-specialisasi-image.png');
}
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'code' => $this->code,
'description' => $this->description,
'address' => $this->address ?? null, 'address' => $this->address ?? null,
'distance' => $this->distance ? ($this->distance < 1 ? round($this->distance * 1000, 2) . " m" : round($this->distance, 2) . " km") : null, 'lat' => $this->lat,
'lng' => $this->lng,
'distance' => $this->distance ? ($this->distance < 1 ? round($this->distance * 1000, 2) . ' m' : round($this->distance, 2) . ' km') : null,
'city_name' => $this->city_name ?? null, 'city_name' => $this->city_name ?? null,
'rating' => rand(1, 100),
'phone' => $this->meta->phone, 'phone' => $this->meta->phone,
'photo_url' => url('images/default-hospital-image.png'),
'photos' => [ 'photos' => [
'title' => $this->name, 'title' => $this->name,
'photo_url' => url('images/default-hospital-image.png'), 'photo_url' => url('images/default-hospital-image.png'),

8
Modules/Linksehat/Transformers/Hospital/HospitalResourceDetail.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace Modules\Linksehat\Transformers\Hospitals; namespace Modules\Linksehat\Transformers\Hospital;
use App\Models\PractitionerRole; use App\Models\PractitionerRole;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -30,12 +30,6 @@ class HospitalResourceDetail extends JsonResource
$specialitys[$indexSpeciality]['avatar'] = asset('images/default-specialisasi-image.png'); $specialitys[$indexSpeciality]['avatar'] = asset('images/default-specialisasi-image.png');
} }
if (empty($this->distance)) {
$address = $this->currentAddress->text;
} else {
$address = $this->currentAddress;
}
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,