From abe7dfeb4e229fa584522054a68ebdf611dab411 Mon Sep 17 00:00:00 2001 From: Nikhil Date: Thu, 19 Jun 2025 17:17:12 +0530 Subject: [PATCH] Changing status code for error messages --- app/Http/Controllers/APIS/AdminApi/AssetadmintController.php | 4 ++-- app/Http/Controllers/APIS/AdminApi/CustomerController.php | 5 +++-- app/Http/Controllers/APIS/AdminApi/DeviceController.php | 4 ++-- app/Http/Controllers/APIS/AdminApi/UsersController.php | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php index 787b4ed..5c5fa2a 100644 --- a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php +++ b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php @@ -105,7 +105,7 @@ class AssetadmintController extends Controller $assetNameExists = Asset::where('name', $request->name)->where('id','!=',$request->id)->first(); if ($assetNameExists) { - return jsonResponseWithErrorMessage('Asset name already exists', 400); + return response()->json(['status' => 'error','message' => 'Asset name already exists'],400); } // Update local database record @@ -122,7 +122,7 @@ class AssetadmintController extends Controller $assetNameExists = Asset::where('name', $request->name)->first(); if ($assetNameExists) { - return jsonResponseWithErrorMessage('Asset name already exists', 400); + return response()->json(['status' => 'error','message' => 'Asset name already exists'],400); } // Create new asset via admin service diff --git a/app/Http/Controllers/APIS/AdminApi/CustomerController.php b/app/Http/Controllers/APIS/AdminApi/CustomerController.php index d98ce5a..ad8be4e 100644 --- a/app/Http/Controllers/APIS/AdminApi/CustomerController.php +++ b/app/Http/Controllers/APIS/AdminApi/CustomerController.php @@ -32,12 +32,13 @@ class CustomerController extends Controller $customerEmailExist = Customer::where('email', $request->email)->first(); if ($customerEmailExist) { - return jsonResponseWithErrorMessage('Email already exists', 400); + // return jsonResponseWithErrorMessage('Email already exists', 400); + return response()->json(['status' => 'error','message' => 'Email already exists'],400); } $customerNameExist = Customer::where('title', $request->title)->first(); if ($customerNameExist) { - return jsonResponseWithErrorMessage('Name already exists', 400); + return response()->json(['status' => 'error','message' => 'Email already exists'],400); } $userData = [ diff --git a/app/Http/Controllers/APIS/AdminApi/DeviceController.php b/app/Http/Controllers/APIS/AdminApi/DeviceController.php index b36631d..8dcaf64 100644 --- a/app/Http/Controllers/APIS/AdminApi/DeviceController.php +++ b/app/Http/Controllers/APIS/AdminApi/DeviceController.php @@ -32,7 +32,7 @@ class DeviceController extends Controller $deviceNameExists = Device::where('name', $request->name)->first(); if (empty($request->id) && $deviceNameExists) { - return jsonResponseWithErrorMessage('Device name already exists', 400); + return response()->json(['status' => 'error','message' => 'Device name already exists'],400); } $deviceData = [ @@ -67,7 +67,7 @@ class DeviceController extends Controller $deviceNameExists = Device::where('name', $request->name)->where('id','!=',$request->id)->first(); if ($deviceNameExists) { - return jsonResponseWithErrorMessage('Device name already exists', 400); + return response()->json(['status' => 'error','message' => 'Device name already exists'],400); } } if (!empty($request->firmwareId)) { diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php index 7f06c4a..3c4fbec 100644 --- a/app/Http/Controllers/APIS/AdminApi/UsersController.php +++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php @@ -216,7 +216,7 @@ class UsersController extends Controller $userEmailExist = User::where('email', $request->email)->first(); if ($userEmailExist) { - return jsonResponseWithErrorMessage('Email already exists', 400); + return response()->json(['status' => 'error','message' => 'Email already exists'],400); } // Generate UUID for the user