From a39a9dcd1f205df2f07ec25ce5aecb0e9738e181 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 03:14:58 +0530
Subject: [PATCH] Require roomTypeCode for room upsert

---
 .../android/trisolarisserver/controller/Rooms.kt  | 15 +++++----------
 .../trisolarisserver/controller/dto/RoomDtos.kt   |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
index 8a6284c..0d8389c 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/Rooms.kt
@@ -247,17 +247,12 @@ class Rooms(
     }
 
     private fun resolveRoomType(propertyId: UUID, request: RoomUpsertRequest): com.android.trisolarisserver.models.room.RoomType {
-        request.roomTypeId?.let { id ->
-            roomTypeRepo.findByIdAndPropertyId(id, propertyId)?.let { return it }
+        val code = request.roomTypeCode.trim()
+        if (code.isBlank()) {
+            throw ResponseStatusException(HttpStatus.BAD_REQUEST, "roomTypeCode required")
         }
-        val code = request.roomTypeCode?.trim()
-        if (!code.isNullOrBlank()) {
-            roomTypeRepo.findByPropertyIdAndCodeIgnoreCase(propertyId, code)?.let { return it }
-        }
-        if (request.roomTypeId == null && code.isNullOrBlank()) {
-            throw ResponseStatusException(HttpStatus.BAD_REQUEST, "roomTypeId or roomTypeCode required")
-        }
-        throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room type not found")
+        return roomTypeRepo.findByPropertyIdAndCodeIgnoreCase(propertyId, code)
+            ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room type not found")
     }
 }
 
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 16f7995..6d2b47f 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
@@ -52,8 +52,7 @@ enum class RoomBoardStatus {
 data class RoomUpsertRequest(
     val roomNumber: Int,
     val floor: Int?,
-    val roomTypeId: UUID? = null,
-    val roomTypeCode: String? = null,
+    val roomTypeCode: String,
     val hasNfc: Boolean,
     val active: Boolean,
     val maintenance: Boolean,