From 236c885954d557fbfbbc9fadc65ac18f3436919e Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 03:17:35 +0530
Subject: [PATCH] Remove roomTypeId from room responses

---
 .../kotlin/com/android/trisolarisserver/controller/RoomStays.kt | 1 -
 .../kotlin/com/android/trisolarisserver/controller/Rooms.kt     | 2 --
 .../com/android/trisolarisserver/controller/dto/RoomDtos.kt     | 1 -
 .../com/android/trisolarisserver/controller/dto/RoomStayDtos.kt | 1 -
 4 files changed, 5 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt
index 53e3e8d..e078e5f 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RoomStays.kt
@@ -49,7 +49,6 @@ class RoomStays(
                 guestPhone = guest?.phoneE164,
                 roomId = room.id!!,
                 roomNumber = room.roomNumber,
-                roomTypeId = roomType.id!!,
                 roomTypeName = roomType.name,
                 fromAt = stay.fromAt.toString(),
                 checkinAt = booking.checkinAt?.toString(),
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
index 0d8389c..8c51ce6 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
@@ -258,12 +258,10 @@ class Rooms(
 
 private fun Room.toRoomResponse(): RoomResponse {
     val roomId = id ?: throw IllegalStateException("Room id is null")
-    val roomTypeId = roomType.id ?: throw IllegalStateException("Room type id is null")
     return RoomResponse(
         id = roomId,
         roomNumber = roomNumber,
         floor = floor,
-        roomTypeId = roomTypeId,
         roomTypeName = roomType.name,
         hasNfc = hasNfc,
         active = active,
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
index 6d2b47f..627e25f 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
@@ -6,7 +6,6 @@ data class RoomResponse(
     val id: UUID,
     val roomNumber: Int,
     val floor: Int?,
-    val roomTypeId: UUID,
     val roomTypeName: String,
     val hasNfc: Boolean,
     val active: Boolean,
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt
index 2dbc56a..d6dbcd3 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomStayDtos.kt
@@ -10,7 +10,6 @@ data class ActiveRoomStayResponse(
     val guestPhone: String?,
     val roomId: UUID,
     val roomNumber: Int,
-    val roomTypeId: UUID,
     val roomTypeName: String,
     val fromAt: String,
     val checkinAt: String?,