diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php index 466eb884..6f7fb6da 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php @@ -68,10 +68,12 @@ class PanjareVahedController extends Controller ]); return response()->json([ + 'request_id' => $request->request_id, 'id' => $harim->id, 'city' => $city->edarateShahri()->first()->name_fa, 'province' => $city->province()->first()->name_fa, 'statusCode' => 200, + 'message' => 'successful', ]); } @@ -88,8 +90,10 @@ class PanjareVahedController extends Controller ]); return response()->json([ + 'request_id' => $request->request_id, 'id' => $harim->id, 'statusCode' => 200, + 'message' => 'successful', ]); } @@ -99,19 +103,19 @@ class PanjareVahedController extends Controller $harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id); - $harim->update([ 'state_id' => $state, 'state_name' => HarimStates::name($state), ]); return response()->json([ + 'request_id' => $request->request_id, 'id' => $harim->id, 'statusCode' => 200, + 'message' => 'successful', ]); } - public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse { $state = HarimStates::TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value; @@ -127,8 +131,10 @@ class PanjareVahedController extends Controller ]); return response()->json([ + 'request_id' => $request->request_id, 'id' => $harim->id, 'statusCode' => 200, + 'message' => 'successful', ]); } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php index 09758ca8..5147e6a1 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php @@ -3,7 +3,9 @@ namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed; use Illuminate\Contracts\Validation\ValidationRule; +use Illuminate\Contracts\Validation\Validator; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\Exceptions\HttpResponseException; class GetAccessRoadRequest extends FormRequest { @@ -29,4 +31,15 @@ class GetAccessRoadRequest extends FormRequest 'access_road.coordinates' => 'required|array', ]; } + + protected function failedValidation(Validator $validator) + { + $response = response()->json([ + 'statusCode' => 422, + 'message' => 'invalid inputs', + 'errors' => $validator->errors(), + ], 422); + + throw new HttpResponseException($response); + } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php index 0080dd86..a2884cd3 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php @@ -3,7 +3,9 @@ namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed; use Illuminate\Contracts\Validation\ValidationRule; +use Illuminate\Contracts\Validation\Validator; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\Exceptions\HttpResponseException; class GetFinalPolygonsRequest extends FormRequest { @@ -32,4 +34,15 @@ class GetFinalPolygonsRequest extends FormRequest 'final_plan.coordinates' => 'required|array', ]; } + + protected function failedValidation(Validator $validator) + { + $response = response()->json([ + 'statusCode' => 422, + 'message' => 'invalid inputs', + 'errors' => $validator->errors(), + ], 422); + + throw new HttpResponseException($response); + } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php index 701cf5b1..47df0130 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php @@ -3,7 +3,9 @@ namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed; use Illuminate\Contracts\Validation\ValidationRule; +use Illuminate\Contracts\Validation\Validator; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\Exceptions\HttpResponseException; class GetRejectRequest extends FormRequest { @@ -26,4 +28,15 @@ class GetRejectRequest extends FormRequest 'request_id' => 'required|exists:harims,panjare_vahed_id', ]; } + + protected function failedValidation(Validator $validator) + { + $response = response()->json([ + 'statusCode' => 422, + 'message' => 'invalid inputs', + 'errors' => $validator->errors(), + ], 422); + + throw new HttpResponseException($response); + } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php index f74449b8..d5bc528d 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php @@ -3,7 +3,9 @@ namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed; use Illuminate\Contracts\Validation\ValidationRule; +use Illuminate\Contracts\Validation\Validator; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\Exceptions\HttpResponseException; class ReceiveNewRequest extends FormRequest { @@ -39,4 +41,15 @@ class ReceiveNewRequest extends FormRequest 'data' => 'required|array', ]; } + + protected function failedValidation(Validator $validator) + { + $response = response()->json([ + 'statusCode' => 422, + 'message' => 'invalid inputs', + 'errors' => $validator->errors(), + ], 422); + + throw new HttpResponseException($response); + } }