update wilayah dan pertanian

app/Http/Controllers/Api/ProvinsiController.php

@@ -6,37 +6,42 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use App\Models\Wilayah\Provinsi;
+use App\Http\Resources\Wilayah\ProvinsiResource;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class ProvinsiController extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index(Request $request): JsonResponse
+    public function index(Request $request): AnonymousResourceCollection
     {
-        $size = +$request->get('size') ?: 10;
+        $size = $request->integer('size') ?: 10;
 
-        $master = Provinsi::query();
-
-        if ($request->has('search')) {
-            $s = $request->get('search');
-            $s = strtolower($s);
-            $master->where(function($query) use ($s) {
-                $query->whereRaw('lower(kode) like (?)',["%{$s}%"])
-                    ->orWhereRaw('lower(nama) like (?)',["%{$s}%"]);
+        $master = Provinsi::when($request->search, function ($q, $search) {
+                $search = strtolower($search);
+                $q->where(function ($query) use ($search) {
+                    $query->whereRaw('lower(kode) like ?', ["%{$search}%"])
+                        ->orWhereRaw('lower(nama) like ?', ["%{$search}%"]);
+                });
             });
-        }
-        if ($request->has('sort')) {
-            $order = $request->get('sort');
-            $d = substr($order, 0, 1);
-            $dir = $d === '-' ? 'desc' : 'asc'; 
-            $order = $d === '-' ? substr($order, 1) : $order;
-            $master->orderBy($order, $dir);
+
+        if ($request->filled('sort')) {
+            $dir = str_starts_with($request->sort, '-') ? 'desc' : 'asc';
+            $column = ltrim($request->sort, '-');
+
+            $allowed = ['id', 'kode', 'nama'];
+
+            if (in_array($column, $allowed)) {
+                $master->orderBy($column, $dir);
+            }
+        } else {
+            $master->orderBy('kode', 'asc');
         }
 
         $masterList = $master->paginate($size);
 
-        return response()->json($masterList);
+        return ProvinsiResource::collection($masterList);
     }
 
     /**
@@ -60,7 +65,7 @@ class ProvinsiController extends Controller
      */
     public function show(string $id): JsonResponse
     {
-        return response()->json(Provinsi::findOrFail($id));
+        return response()->json(ProvinsiResource::make(Provinsi::findOrFail($id)));
     }
 
     /**