From 62a5456f9d4eb47cd2fc2c51d2b8a513e063e145 Mon Sep 17 00:00:00 2001 From: "fauzgabriel@gmail.com" Date: Tue, 10 Mar 2026 16:10:44 +0700 Subject: [PATCH] field name change --- .../Controllers/Api/InspeksiController.php | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/Api/InspeksiController.php b/app/Http/Controllers/Api/InspeksiController.php index ee61fc5..296781a 100644 --- a/app/Http/Controllers/Api/InspeksiController.php +++ b/app/Http/Controllers/Api/InspeksiController.php @@ -13,12 +13,12 @@ public function index(Request $request): JsonResponse { $size = +$request->get('size') ?: 10; - $master = Inspeksi::query(); + $inspeksi = Inspeksi::query(); if ($request->has('search')) { $s = $request->get('search'); $s = strtolower($s); - $master->where(function($query) use ($s) { + $inspeksi->where(function($query) use ($s) { $query->whereRaw('lower(kode) like (?)',["%{$s}%"]) ->orWhereRaw('lower(nama) like (?)',["%{$s}%"]); }); @@ -28,15 +28,12 @@ public function index(Request $request): JsonResponse $d = substr($order, 0, 1); $dir = $d === '-' ? 'desc' : 'asc'; $order = $d === '-' ? substr($order, 1) : $order; - $master->orderBy($order, $dir); - } - if ($request->has('kecamatan_id')) { - $master->where('kecamatan_id', $request->get('kecamatan_id')); + $inspeksi->orderBy($order, $dir); } - $masterList = $master->paginate($size); + $data = $inspeksi->paginate($size); - return response()->json($masterList); + return response()->json($data); } public function show(string $id) { @@ -54,17 +51,16 @@ public function store(Request $request): JsonResponse $profile = $user->profile; $validated = $request->validate([ - 'plant_id' => ['required', 'numeric'], - 'land_id' => ['required', 'numeric'], - 'farmer_id' => ['numeric'], + 'tanaman_id' => ['required'], + 'lahan_id' => ['required'], + 'petani_id' => ['required'], 'health_status' => ['string'], 'productivity_status' => ['string'], ]); - // dd($validated); $lahan = Inspeksi::create([ - "tanaman_id" => $validated["plant_id"], - "lahan_id" => $validated['land_id'], - "petani_id"=> $validated['farmer_id'], + "tanaman_id" => $validated["tanaman_id"], + "lahan_id" => $validated['lahan_id'], + "petani_id"=> $validated['petani_id'], "inspection_date"=> $request['inspection_date'], "health_status"=> $request['health_status'], "productivity_status"=> $validated['productivity_status'], @@ -85,11 +81,11 @@ public function update(Request $request, string $id) $lahan = Inspeksi::findOrFail($id); $validated = $request->validate([ - 'tanaman_id' => ['required', 'string', 'max:255'], - 'lahan_id' => ['required', 'string'], - 'petani_id' => ['numeric'], + 'petani_id' => ['required'], + 'lahan_id' => ['required'], + 'petani_id' => ['required'], 'health_status' => ['string'], - 'productivity_status' => ['numeric'], + 'productivity_status' => ['string'], ]); $lahan->update($validated); @@ -112,19 +108,19 @@ public function batchUpsert(Request $request): JsonResponse $profile = $user->profile; $validated = $request->validate([ - 'tanaman_id' => ['required', 'string', 'max:255'], - 'lahan_id' => ['required', 'string'], - 'petani_id' => ['numeric'], + 'tanaman_id' => ['required'], + 'lahan_id' => ['required'], + 'petani_id' => ['required'], 'health_status' => ['string'], - 'productivity_status' => ['numeric'], + 'productivity_status' => ['string'], ]); $inspections = []; foreach ($validated['inspections'] as $insoection) { $inspection[] = [ - "plant_id" => $insoection["plant_id"], - "land_id" => $insoection['land_id'], - "farmer_id"=> $insoection['farmer_id'], + "tanaman_id" => $insoection["tanaman_id"], + "lahan_id" => $insoection['lahan_id'], + "petani_id"=> $insoection['petani_id'], "inspection_date"=> $insoection['inspection_date'], "health_status"=> $insoection['health_status'], "productivity_status"=> $insoection['productivity_status'], @@ -140,9 +136,9 @@ public function batchUpsert(Request $request): JsonResponse Inspeksi::upsert($inspections, ['id'], [ - "plant_id", - "land_id", - "farmer_id", + "tanaman_id", + "lahan_id", + "petani_id", "inspection_date", "health_status", "productivity_status",