From 8a6185e3292492000081583e24a1497cd290b847 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Mon, 20 Jul 2020 13:08:17 +0200 Subject: [PATCH] Clean Up --- app/api/RoomsApi.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/api/RoomsApi.php b/app/api/RoomsApi.php index b4c27a4..96b58a1 100644 --- a/app/api/RoomsApi.php +++ b/app/api/RoomsApi.php @@ -1,34 +1,33 @@ requireAuth(); $response = []; $roomIds = []; $roomsData = RoomManager::getRoomsDefault(); - + foreach ($roomsData as $roomKey => $room) { $roomIds[] = $room['room_id']; } - + $subDevicesData = SubDeviceManager::getSubdevicesByRoomIds($roomIds); - + foreach ($roomsData as $roomKey => $roomData) { - if ($roomData['device_count'] != 0){ - $response[] = [ - 'room_id' => $roomData['room_id'], - 'name' => $roomData['name'], - 'widgets' => isset($subDevicesData[$roomData['room_id']]) ? $subDevicesData[$roomData['room_id']] : [], - ]; - } + if ($roomData['device_count'] == 0) continue; + $response[] = [ + 'room_id' => $roomData['room_id'], + 'name' => $roomData['name'], + 'widgets' => isset($subDevicesData[$roomData['room_id']]) ? $subDevicesData[$roomData['room_id']] : [], + ]; } $this->response($response); } - + public function update($roomId){ //$this->requireAuth(); - + $subDevicesData = SubDeviceManager::getSubdevicesByRoomIds([$roomId]); $this->response($subDevicesData); }