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

Merge remote-tracking branch 'origin/mhmfajar'

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-04 05:39:29 +07:00
parent ccc3f8e67f 975f6cec35
commit 08c20373fb
51 changed files with 103 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Http;
use Modules\Linksehat\Transformers\Article\ArticleResource;
use Modules\Linksehat\Transformers\Doctor\DoctorResource;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
use Symfony\Component\HttpFoundation\Response;
class DashboardController extends Controller
{
@@ -32,7 +31,7 @@ class DashboardController extends Controller
->get(['id', 'practitioner_id', 'speciality_id'])
->random($limit);
$data = DoctorResource::collection($queryDoctors);
$data = ['doctors' => DoctorResource::collection($queryDoctors)];
} elseif ($query === 'hospitals') {
$queryHospitals = Organization::query()
->leftJoin('addresses', function ($query) {
@@ -45,18 +44,18 @@ 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)
->get();
$data = HospitalResource::collection($queryHospitals);
$data = ['hospitals' => HospitalResource::collection($queryHospitals)];
} elseif ($query === 'articles') {
$data = ArticleResource::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
$data = ['articles' => ArticleResource::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')))];
}
return Helper::responseJson($data);

36
Modules/Linksehat/Http/Controllers/Api/DoctorController.php
View File

@@ -3,14 +3,14 @@
namespace Modules\Linksehat\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Models\Organization;
use App\Models\Practitioner;
use App\Models\PractitionerRole;
use App\Models\PractitionerRoleAvailability;
use DB;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Modules\Linksehat\Transformers\Doctor\DoctorResourceDetail;
use Illuminate\Support\Facades\DB;
use Modules\Linksehat\Transformers\DoctorResource;
use Modules\Linksehat\Transformers\PractitionerRoleToDoctorResource;
class DoctorController extends Controller
@@ -60,7 +60,7 @@ class DoctorController extends Controller
$doctors = $doctors->paginate($limit);
return Helper::responseJson(Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors)));
return Helper::responseJson(['doctors' => Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors))]);
}
/**
@@ -89,23 +89,25 @@ class DoctorController extends Controller
*/
public function show(Request $request, $id)
{
$queryDoctor = PractitionerRole::query()
$doctor = Practitioner::query()
->with([
'practitioner',
'speciality',
'practices.prices'
'practitionerRoles',
'practitionerRoles.metas',
'practitionerRoles.speciality',
'practitionerRoles.organization' => function ($query) {
$query->leftJoin('addresses', function ($q) {
$q->on('organizations.main_address_id', '=', 'addresses.id');
$q->where('addresses.addressable_type', Organization::class);
});
},
'practitionerRoles.practices',
'practitionerRoles.availabilities',
'person',
'metas',
])
->findOrFail($id);
$queryAvailables = PractitionerRoleAvailability::query()->with(['days' => function ($query) {
$query->select(['availability_id', 'day']);
}])->where('practitioner_role_id', $id)->get(['id', 'start_time']);
$doctor = DoctorResourceDetail::make($queryDoctor);
$doctor['day_available'] = Helper::dailyAvailabilities($queryAvailables);
// return Helper::responseJson();
return response()->json(compact('doctor'));
return response()->json(DoctorResource::make($doctor));
}
/**

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

@@ -4,10 +4,12 @@ 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;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\DB;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
class HospitalController extends Controller
@@ -18,7 +20,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) {
@@ -31,7 +33,6 @@ class HospitalController extends Controller
});
$hospitals->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")
]);
@@ -41,7 +42,7 @@ class HospitalController extends Controller
}
if ($request->has('order_by')) {
switch($request->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');
@@ -52,7 +53,7 @@ class HospitalController extends Controller
$hospitals->orderBy('distance_km', 'desc');
break;
}
default:
default:
$hospitals->orderBy('organizations.name', 'asc');
break;
}
@@ -64,13 +65,11 @@ class HospitalController extends Controller
}
$hospitals = $hospitals->paginate($limit);
// dd($hospitals->toArray());
return response()->json([
'message' => 'Sukses mengambil data Rumah Sakit',
'hospitals' => Helper::paginateResources(HospitalResource::collection($hospitals))
]);*/
]);
}
/**
@@ -100,23 +99,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)]);
}
/**

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

@@ -69,7 +69,7 @@ class PersonController extends Controller
$personModel = Person::query()->create($personData);
return Helper::responseJson(['person' => $personModel], Response::HTTP_CREATED, 'Data berhasil di buat');
return Helper::responseJson(['persons' => $personModel], Response::HTTP_CREATED, 'Data berhasil di buat');
}
/**
@@ -152,7 +152,7 @@ class PersonController extends Controller
]);
}
return Helper::responseJson(data: $person, message: 'Data Berhasil di update');
return Helper::responseJson(data: ['persons' => $person], message: 'Data Berhasil di update');
}
/**

2
Modules/Linksehat/Http/Controllers/Api/ProfileController.php
View File

@@ -121,7 +121,7 @@ class ProfileController extends Controller
}
$user = User::find($user->id); // ReLoad User Data
return Helper::responseJson(new UserProfileResource($user));
return Helper::responseJson(['users' => new UserProfileResource($user)]);
}
/**

5
Modules/Linksehat/Http/Controllers/Api/SearchController.php
View File

@@ -12,7 +12,6 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
use Modules\Linksehat\Transformers\Speciality\SpecialityResource;
use Symfony\Component\HttpFoundation\Response;
class SearchController extends Controller
{
@@ -33,7 +32,7 @@ class SearchController extends Controller
->where('organization_id', $request->organization_id)
->get(['persons.name AS person_name', 'specialities.name AS speciality_name', 'practitioner_id', 'practitioner_roles.id']);
return Helper::responseJson(SpecialityResource::collection($doctors));
return Helper::responseJson(['doctors' => SpecialityResource::collection($doctors)]);
}
public function searchHospital(Request $request)
@@ -68,6 +67,6 @@ class SearchController extends Controller
->groupBy(['practitioner_roles.organization_id', 'practitioner_roles.speciality_id'])
->get();
return Helper::responseJson(data: HospitalResource::collection($queryHospitals), message: 'Data rumah sakit berhasil di ambil');
return Helper::responseJson(data: ['hospitals' => HospitalResource::collection($queryHospitals)], message: 'Data rumah sakit berhasil di ambil');
}
}

2
Modules/Linksehat/Http/Controllers/Api/SpecialityController.php
View File

@@ -53,6 +53,6 @@ class SpecialityController extends Controller
{
$querySpecialities = Speciality::query()->get(['name']);
return Helper::responseJson(SpecialityResource::collection($querySpecialities));
return Helper::responseJson(['specialities' => SpecialityResource::collection($querySpecialities)]);
}
}

6
Modules/Linksehat/Transformers/DoctorResource.php
View File

@@ -3,7 +3,7 @@
namespace Modules\Linksehat\Transformers;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Route;
use Modules\Linksehat\Transformers\Speciality\SpecialityResource;
class DoctorResource extends JsonResource
{
@@ -112,8 +112,8 @@ class DoctorResource extends JsonResource
'is_online' => false,
'is_insurance_covered' => rand(0, 1) == 1,
'price_range' => 'Rp 100.000 - Rp 350.000',
'price_start' => '100000',
'price_end' => '350000',
'price_start' => '100000', // min
'price_end' => '350000', // max
'currency' => 'IDR',
'avatar_url' => asset('images/default-doctor-avatar.png'),
'education' => $this->meta->education ?? '',

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

@@ -2,8 +2,8 @@
namespace Modules\Linksehat\Transformers\Hospital;
use App\Models\PractitionerRole;
use Illuminate\Http\Resources\Json\JsonResource;
use Modules\Linksehat\Transformers\Speciality\SpecialityForHospitalDetailResource;
class HospitalResource extends JsonResource
{
@@ -15,18 +15,10 @@ class HospitalResource extends JsonResource
*/
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');
if ($this->specialities) {
$specialities = SpecialityForHospitalDetailResource::collection($this->specialities);
} else {
$specialities = [];
}
return [
@@ -45,7 +37,10 @@ class HospitalResource extends JsonResource
'photos' => [
'title' => $this->name,
'photo_url' => url('images/default-hospital-image.png'),
]
],
$this->mergeWhen($this->specialities, [
'specialities' => $specialities
])
];
}
}

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

@@ -1,45 +0,0 @@
<?php
namespace Modules\Linksehat\Transformers\Hospital;
use App\Models\PractitionerRole;
use Illuminate\Http\Resources\Json\JsonResource;
use Str;
class HospitalResourceDetail extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request
* @return array
*/
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 [
'id' => $this->id,
'name' => $this->name,
'address' => $address ?? null,
'distance' => $this->distance ? ($this->distance < 1 ? round($this->distance * 1000, 2) . " m" : round($this->distance, 2) . " km") : null,
'photos' => [
'title' => Str::slug($this->name),
'url' => asset('images/default-hospital-image.png'),
],
'specialitys' => $specialitys
];
}
}

24
Modules/Linksehat/Transformers/Speciality/SpecialityForHospitalDetailResource.php Executable file
View File

@@ -0,0 +1,24 @@
<?php
namespace Modules\Linksehat\Transformers\Speciality;
use App\Helpers\Helper;
use Illuminate\Http\Resources\Json\JsonResource;
class SpecialityForHospitalDetailResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'name' => 'Spesialis ' . $this->name,
'avatar' => url('images/default-hospital-image.png'),
];
}
}

4
Modules/Linksehat/Transformers/Speciality/SpecialityResource.php
View File

@@ -30,13 +30,13 @@ class SpecialityResource extends JsonResource
}
return [
$this->mergeWhen($this->practitioner && $prices, [
$this->mergeWhen($this->practitioner && $this->prices, [
'id' => isset($this->practitioner->person->id) ? $this->practitioner->person->id : $this->practitioner_id,
'name' => isset($this->practitioner->person->name) ? $this->practitioner->person->name : $this->person_name,
'specialis' => 'Spesialis ' . (isset($this->speciality->name) ? $this->speciality->name : $this->speciality_name),
'experience' => rand(5, 12),
'rating' => rand(20, 100),
'price' => Helper::currencyIdrFormat($prices) ?? null,
'price' => isset($prices) ? Helper::currencyIdrFormat($prices) : null,
]),
$this->mergeWhen($this->name, [
'title' => 'Spesialis ' . $this->name,