diff --git a/app/Http/Controllers/BranchControlController.php b/app/Http/Controllers/BranchControlController.php index 15871dc..9ee59de 100644 --- a/app/Http/Controllers/BranchControlController.php +++ b/app/Http/Controllers/BranchControlController.php @@ -58,13 +58,15 @@ class BranchControlController extends Controller 'enable' => $branch->enable, 'rooms' => $branch->rooms ->filter(fn($room) => $room->type === RoomType::PC) - ->map(function ($room) { + ->mapWithKeys(function ($room) { + $roomName = $room->type->value . $room->name; return [ - 'room_name' => $room->type->value.$room->name, - 'is_online' => $room->is_online, - 'status' => $room->status->value, - 'started_at' => $room->started_at, - 'ended_at' => $room->ended_at, + $roomName => [ + 'is_online' => $room->is_online, + 'status' => $room->status->value, + 'started_at' => $room->started_at, + 'ended_at' => $room->ended_at, + ] ]; }), ];