From 67ff5bd04ba30527e4d2fdd5bfc2741a5777d007 Mon Sep 17 00:00:00 2001 From: kshitige Date: Thu, 24 Apr 2025 13:32:49 +0530 Subject: [PATCH] changes in device and asset fetch by customer id --- app/Http/Controllers/APIS/AdminApi/DeviceController.php | 4 ++-- app/Http/Controllers/APIS/AdminApi/UsersController.php | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/APIS/AdminApi/DeviceController.php b/app/Http/Controllers/APIS/AdminApi/DeviceController.php index db70861..678e176 100644 --- a/app/Http/Controllers/APIS/AdminApi/DeviceController.php +++ b/app/Http/Controllers/APIS/AdminApi/DeviceController.php @@ -181,7 +181,7 @@ class DeviceController extends Controller public function devicelistCustomer($customerId) - { + { try { $devices = Device::with('deviceProfile:id,name', 'customer:id,name') ->where('customer_id', $customerId) @@ -198,7 +198,7 @@ class DeviceController extends Controller }); if ($devices->isEmpty()) { - return response()->json(['message' => 'No devices found for this customer ID'], 404); + return response()->json(['message' => 'No devices found for this customer ID'], 200); } return jsonResponseWithSuccessMessage('Devices fetched successfully', [ diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php index d3a3823..6d93973 100644 --- a/app/Http/Controllers/APIS/AdminApi/UsersController.php +++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php @@ -519,7 +519,6 @@ class UsersController extends Controller 'real_email' => $user->email, // 'tb_email' => $dummyEmail ], 200); - } catch (\Exception $e) { Log::error("ThingsBoard activation failed: " . $e->getMessage()); @@ -539,7 +538,6 @@ class UsersController extends Controller 'error' => $e->getMessage() ], 500); } - } catch (\Exception $e) { Log::error("Error activating user ID: {$id}. Exception: " . $e->getMessage()); return response()->json([ @@ -743,7 +741,7 @@ class UsersController extends Controller }); if ($users->isEmpty()) { - return response()->json(['message' => 'No users found for this customer ID'], 404); + return response()->json(['message' => 'No users found for this customer ID'], 200); } return jsonResponseWithSuccessMessage('Users fetched successfully', [ @@ -754,5 +752,4 @@ class UsersController extends Controller return jsonResponseWithErrorMessage($e->getMessage(), 500); } } - -} +} \ No newline at end of file -- 2.34.1