From f9c31a4d5962a4e06b353a6b39857f4bbfce79b4 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 03:21:38 +0530
Subject: [PATCH] Avoid lazy roomType access in room create/update responses

---
 .../trisolarisserver/controller/Rooms.kt      | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
index 8c51ce6..0ff0584 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
@@ -189,9 +189,19 @@ class Rooms(
             notes = request.notes
         )
 
-        val saved = roomRepo.save(room).toRoomResponse()
+        val saved = roomRepo.save(room)
+        val response = RoomResponse(
+            id = saved.id ?: throw IllegalStateException("Room id is null"),
+            roomNumber = saved.roomNumber,
+            floor = saved.floor,
+            roomTypeName = roomType.name,
+            hasNfc = saved.hasNfc,
+            active = saved.active,
+            maintenance = saved.maintenance,
+            notes = saved.notes
+        )
         roomBoardEvents.emit(propertyId)
-        return saved
+        return response
     }
 
     @PutMapping("/{roomId}")
@@ -221,9 +231,19 @@ class Rooms(
         room.maintenance = request.maintenance
         room.notes = request.notes
 
-        val saved = roomRepo.save(room).toRoomResponse()
+        val saved = roomRepo.save(room)
+        val response = RoomResponse(
+            id = saved.id ?: throw IllegalStateException("Room id is null"),
+            roomNumber = saved.roomNumber,
+            floor = saved.floor,
+            roomTypeName = roomType.name,
+            hasNfc = saved.hasNfc,
+            active = saved.active,
+            maintenance = saved.maintenance,
+            notes = saved.notes
+        )
         roomBoardEvents.emit(propertyId)
-        return saved
+        return response
     }
 
     private fun requirePrincipal(principal: MyPrincipal?) {