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

Merge branch 'master' of itcorp.primaya.id:rajif/aso

Browse Source
This commit is contained in:
Linksehat Dev
2022-11-03 09:52:53 +07:00
parent 0057b30129 ce8f4a0b34
commit eec877dda3
13 changed files with 161 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@ 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\HospitalResource as HospitalResourceDashboard;
use Modules\Linksehat\Transformers\Dashboard\ArticleResource as ArticleResourceDashboard;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
use Symfony\Component\HttpFoundation\Response;
class DashboardController extends Controller
@@ -38,21 +38,24 @@ class DashboardController extends Controller
$queryHospitals = Organization::query()
->leftJoin('addresses', function ($query) {
$query->on('organizations.main_address_id', '=', 'addresses.id');
$query->where('addresses.addressable_type', '=', Organization::class);
})
->leftJoin('cities', function ($query) {
$query->on('addresses.city_id', '=', 'cities.id');
})
->where('addresses.addressable_type', '=', Organization::class)
->where('organizations.type', 'hospital')
->where('organizations.status', 'active')
->when($request->lat && $request->lng, function ($query) use ($request) {
$query->selectRaw("organizations.id, organizations.name, 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");
$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');
}, function ($query) {
$query->select(['organizations.id', 'organizations.name', 'addresses.text AS currentAddress']);
$query->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name']);
$query->orderBy('organizations.name', 'asc');
})
->limit($limit)
->get();
$data = HospitalResourceDashboard::collection($queryHospitals);
$data = HospitalResource::collection($queryHospitals);
} elseif ($query === 'articles') {
$data = ArticleResourceDashboard::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
}

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

@@ -61,10 +61,7 @@ class DoctorController extends Controller
$doctors = $doctors->paginate($limit);
return response()->json([
'message' => 'Sukses mengambil data Dokter',
'doctors' => Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors))
]);
return Helper::makeJsonResponse(Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors)));
}
/**

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

@@ -4,6 +4,7 @@ namespace Modules\Linksehat\Http\Controllers\Api;
use App\Models\File;
use App\Models\Person;
use Auth;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
@@ -19,7 +20,7 @@ class PersonController extends Controller
*/
public function index()
{
$user = auth()->user();
$user = Auth::user();
$user->load(['person', 'person.families', 'person.avatar']);
$families = $user->person->families;

84
Modules/Linksehat/Http/Controllers/Api/SearchController.php Normal file
View File

@@ -0,0 +1,84 @@
<?php
namespace Modules\Linksehat\Http\Controllers\Api;
use App\Models\Organization;
use App\Models\Practice;
use App\Models\PractitionerRole;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Query\Builder;
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
{
public function searchSpecialityOrPerson(Request $request)
{
$doctors = PractitionerRole::query()
->with(['prices'])
->whereHas('prices', function ($query) {
$query->where('priceable_type', Practice::class);
})
->leftJoin('specialities', function ($query) {
$query->on('practitioner_roles.speciality_id', '=', 'specialities.id');
})
->leftJoin('persons', function ($query) {
$query->on('practitioner_roles.practitioner_id', '=', 'persons.id');
})
->whereRaw("(persons.name LIKE '%{$request->value}%' OR specialities.name LIKE '%{$request->value}%')")
->where('organization_id', $request->organization_id)
->get(['persons.name AS person_name', 'specialities.name AS speciality_name', 'practitioner_id', 'practitioner_roles.id']);
return response()->json([
'status' => 'success',
'statusCode' => Response::HTTP_OK,
'message' => 'Data Berhasil di ambil',
'data' => [
'doctors' => SpecialityResource::collection($doctors)
]
]);
}
public function searchHospital(Request $request)
{
abort_if($request->has('value') != true || empty($request->value), 400, 'Missing Parameter value');
$queryHospitals = Organization::query()
->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) {
$query->getQuery()
->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")
->orderBy('distance', 'ASC');
}, function (EloquentBuilder $query) {
$query->getQuery()
->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name'])
->orderBy('organizations.name');
})
->leftJoin('addresses', function (Builder $query) {
$query->on('organizations.main_address_id', '=', 'addresses.id');
})
->leftJoin('practitioner_roles', function (Builder $query) {
$query->on('organizations.id', '=', 'practitioner_roles.organization_id');
})
->leftJoin('specialities', function (Builder $query) {
$query->on('practitioner_roles.speciality_id', '=', 'specialities.id');
})
->leftJoin('cities', function ($query) {
$query->on('addresses.city_id', '=', 'cities.id');
})
->where('specialities.name', 'LIKE', "{$request->value}%")
->where('addresses.addressable_type', '=', Organization::class)
->whereNot('practitioner_roles.speciality_id')
->groupBy(['practitioner_roles.organization_id', 'practitioner_roles.speciality_id'])
->get();
return response()->json([
'status' => 'success',
'statusCode' => Response::HTTP_OK,
'message' => 'Data rumah sakit berhasil di ambil',
'data' => HospitalResource::collection($queryHospitals)
]);
}
}

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

@@ -51,91 +51,4 @@ class SpecialityController extends Controller
]
]);
}
public function searchSpecialityOrPerson(Request $request)
{
$doctors = PractitionerRole::query()
->with(['prices'])
->whereHas('prices', function ($query) {
$query->where('priceable_type', Practice::class);
})
->leftJoin('specialities', function ($query) {
$query->on('practitioner_roles.speciality_id', '=', 'specialities.id');
})
->leftJoin('persons', function ($query) {
$query->on('practitioner_roles.practitioner_id', '=', 'persons.id');
})
->whereRaw("(persons.name LIKE '%{$request->value}%' OR specialities.name LIKE '%{$request->value}%')")
->where('organization_id', $request->organization_id)
->get(['persons.name AS person_name', 'specialities.name AS speciality_name', 'practitioner_id', 'practitioner_roles.id']);
return response()->json([
'status' => 'success',
'statusCode' => Response::HTTP_OK,
'message' => 'Data Berhasil di ambil',
'data' => [
'doctors' => SpecialityResource::collection($doctors)
]
]);
}
/**
* Show the form for creating a new resource.
* @return Renderable
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
* @param Request $request
* @return Renderable
*/
public function store(Request $request)
{
//
}
/**
* Show the specified resource.
* @param int $id
* @return Renderable
*/
public function show(Request $request, $id)
{
//
}
/**
* Show the form for editing the specified resource.
* @param int $id
* @return Renderable
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
* @param Request $request
* @param int $id
* @return Renderable
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
* @param int $id
* @return Renderable
*/
public function destroy($id)
{
//
}
}

7
Modules/Linksehat/Routes/api.php
View File

@@ -6,6 +6,7 @@ use Modules\Linksehat\Http\Controllers\Api\DoctorController;
use Modules\Linksehat\Http\Controllers\Api\HospitalController;
use Modules\Linksehat\Http\Controllers\Api\PersonController;
use Modules\Linksehat\Http\Controllers\Api\ProfileController;
use Modules\Linksehat\Http\Controllers\Api\SearchController;
use Modules\Linksehat\Http\Controllers\Api\SpecialityController;
/*
@@ -23,6 +24,11 @@ Route::prefix('linksehat')->group(function () {
Route::get('dashboard/{query}/{limit?}', [DashboardController::class, 'index']);
Route::controller(SearchController::class)->group(function () {
Route::get('search-person-speciality', 'searchSpecialityOrPerson');
Route::get('search-hospital', 'searchHospital');
});
Route::controller(AuthController::class)->group(function () {
Route::post('otp-request', 'otpRequest');
Route::post('mock-otp', 'mockOtp');
@@ -34,7 +40,6 @@ Route::prefix('linksehat')->group(function () {
Route::controller(SpecialityController::class)->group(function () {
Route::get('specialities', 'index');
Route::get('search', 'searchSpecialityOrPerson');
});
Route::controller(HospitalController::class)->group(function () {

0
Modules/Linksehat/Transformers/Doctors/DoctorResourceDetail.php → Modules/Linksehat/Transformers/Doctor/DoctorResourceDetail.php
View File

13
Modules/Linksehat/Transformers/Dashboard/HospitalResource.php → Modules/Linksehat/Transformers/Hospital/HospitalResource.php
View File

@@ -1,9 +1,8 @@
<?php
namespace Modules\Linksehat\Transformers\Dashboard;
namespace Modules\Linksehat\Transformers\Hospital;
use Illuminate\Http\Resources\Json\JsonResource;
use Str;
class HospitalResource extends JsonResource
{
@@ -17,12 +16,14 @@ class HospitalResource extends JsonResource
{
return [
'id' => $this->id,
'name' => $this->name ?? '',
'address' => $this->currentAddress ?? '',
'name' => $this->name,
'address' => $this->address ?? null,
'distance' => $this->distance ? ($this->distance < 1 ? round($this->distance * 1000, 2) . " m" : round($this->distance, 2) . " km") : null,
'city_name' => $this->city_name ?? null,
'phone' => $this->meta->phone,
'photos' => [
'title' => Str::slug($this->name),
'url' => asset('images/default-hospital-image.png'),
'title' => $this->name,
'photo_url' => url('images/default-hospital-image.png'),
]
];
}

0
Modules/Linksehat/Transformers/Hospitals/HospitalResourceDetail.php → Modules/Linksehat/Transformers/Hospital/HospitalResourceDetail.php
View File