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

Merge pull request 'fix query hospital dashboard and search' (#2) from mhmfajar into master

Browse Source 
Reviewed-on: http://itcorp.primaya.id:3000/rajif/aso/pulls/2
This commit is contained in:
fajar
2022-11-03 05:54:04 +07:00
parent ba3b6a583d 0115d3fbb3
commit 167a3ce45c
4 changed files with 17 additions and 10 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\Http\Request;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Modules\Linksehat\Transformers\Dashboard\DoctorResource as DoctorResourceDashboard; 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\Dashboard\ArticleResource as ArticleResourceDashboard;
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
class DashboardController extends Controller class DashboardController extends Controller
@@ -38,21 +38,24 @@ class DashboardController extends Controller
$queryHospitals = Organization::query() $queryHospitals = Organization::query()
->leftJoin('addresses', function ($query) { ->leftJoin('addresses', function ($query) {
$query->on('organizations.main_address_id', '=', 'addresses.id'); $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.type', 'hospital')
->where('organizations.status', 'active') ->where('organizations.status', 'active')
->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 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'); $query->orderBy('distance', 'ASC');
}, function ($query) { }, 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'); $query->orderBy('organizations.name', 'asc');
}) })
->limit($limit) ->limit($limit)
->get(); ->get();
$data = HospitalResourceDashboard::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 = ArticleResourceDashboard::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
} }

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

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

@@ -49,11 +49,11 @@ class SearchController extends Controller
$queryHospitals = Organization::query() $queryHospitals = Organization::query()
->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) { ->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) {
$query->getQuery() $query->getQuery()
->selectRaw("organizations.id, organizations.name, addresses.text AS address, 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") ->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'); ->orderBy('distance', 'ASC');
}, function (EloquentBuilder $query) { }, function (EloquentBuilder $query) {
$query->getQuery() $query->getQuery()
->select(['organizations.id', 'organizations.name', 'addresses.text AS address']) ->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name'])
->orderBy('organizations.name'); ->orderBy('organizations.name');
}) })
->leftJoin('addresses', function (Builder $query) { ->leftJoin('addresses', function (Builder $query) {
@@ -65,6 +65,9 @@ class SearchController extends Controller
->leftJoin('specialities', function (Builder $query) { ->leftJoin('specialities', function (Builder $query) {
$query->on('practitioner_roles.speciality_id', '=', 'specialities.id'); $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('specialities.name', 'LIKE', "{$request->value}%")
->where('addresses.addressable_type', '=', Organization::class) ->where('addresses.addressable_type', '=', Organization::class)
->whereNot('practitioner_roles.speciality_id') ->whereNot('practitioner_roles.speciality_id')

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

@@ -18,8 +18,8 @@ class HospitalResource extends JsonResource
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'address' => $this->address ?? null, 'address' => $this->address ?? null,
'distance' => isset($this->distance_km) ? round($this->distance_km) . ' km' : null, 'distance' => $this->distance ? ($this->distance < 1 ? round($this->distance * 1000, 2) . " m" : round($this->distance, 2) . " km") : null,
'city_name' => $this->currentAddress->city->name ?? null, 'city_name' => $this->city_name ?? null,
'phone' => $this->meta->phone, 'phone' => $this->meta->phone,
'photos' => [ 'photos' => [
'title' => $this->name, 'title' => $this->name,