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

Modules/Linksehat/Http/Controllers/Api/DashboardController.php

@@ -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')));
         }

Modules/Linksehat/Http/Controllers/Api/DoctorController.php

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

Modules/Linksehat/Http/Controllers/Api/PersonController.php

@@ -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;

Modules/Linksehat/Http/Controllers/Api/SearchController.php

@@ -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)
+        ]);
+    }
+}

Modules/Linksehat/Http/Controllers/Api/SpecialityController.php

@@ -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)
-    {
-        //
-    }
 }

Modules/Linksehat/Routes/api.php

@@ -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 () {

Modules/Linksehat/Transformers/Hospital/HospitalResource.php

@@ -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 ?? '',
+            'name' => $this->name,
-            'address' => $this->currentAddress ?? '',
+            '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),
+                'title' => $this->name,
-                'url' => asset('images/default-hospital-image.png'),
+                'photo_url' => url('images/default-hospital-image.png'),
             ]
         ];
     }

app/Helpers/Helper.php

@@ -147,4 +147,13 @@ class Helper
     {
         return "Rp. " . number_format($price, 0, ',', '.');
     }
+
+    public static function makeJsonResponse($data, $statusCode = 200, $message = "Data berhasil diambil")
+    {
+        return response()->json([
+            'statusCode' => $statusCode,
+            'message' => $message,
+            'data' => $data
+        ], $statusCode);
+    }
 }

app/Models/Organization.php

@@ -20,13 +20,35 @@ class Organization extends Model
         'main_address_id',
     ];
 
-    public $with = [
+    // public $with = [
-        'metas'
+    //     'metas'
-    ];
+    // ];
 
-    public $appends = [
+    // public $appends = [
-        'meta'
+    //     'meta'
-    ];
+    // ];
+
+    /**
+     * Scope a query to only include active data.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @return void
+     */
+    public function scopeActive($query)
+    {
+        $query->where('status', 'active');
+    }
+
+    /**
+     * Scope a query to only include hospital data.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @return void
+     */
+    public function scopeHospital($query)
+    {
+        $query->where('organizations.type', 'hospital');
+    }
 
     public function setCodeAttribute($value)
     {

app/Models/PractitionerRole.php

@@ -19,6 +19,17 @@ class PractitionerRole extends Model
         'active',
     ];
 
+    /**
+     * Scope a query to only include active data.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @return void
+     */
+    public function scopeActive($query)
+    {
+        $query->where('active', 1);
+    }
+
     public function getIsChatAvailableAttribute()
     {
         return $this->practices->where('service_code', 'chat')->where('active', 1)->count() >= 1;

app/Models/User.php

@@ -79,4 +79,9 @@ class User extends Authenticatable
     {
         return $this->belongsTo(Person::class, 'person_id');
     }
+
+    public function ownedPersons()
+    {
+        return $this->hasMany(Person::class, 'owner_user_id');
+    }
 }