From c3ec6e8d4a3ea1c4d3017b9d04ce69e9882aaf58 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 04:21:20 +0530
Subject: [PATCH] Add amenity category and icon fields

---
 .../trisolarisserver/controller/RoomAmenities.kt    | 13 +++++++++++--
 .../trisolarisserver/controller/RoomTypes.kt        |  5 ++++-
 .../trisolarisserver/controller/dto/RoomTypeDtos.kt | 10 ++++++++--
 .../trisolarisserver/models/room/RoomAmenity.kt     |  9 +++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt
index 86f37d8..717325f 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt
@@ -60,7 +60,10 @@ class RoomAmenities(
         }
         val amenity = RoomAmenity(
             property = property,
-            name = request.name
+            name = request.name,
+            category = request.category,
+            iconKey = request.iconKey,
+            description = request.description
         )
         return roomAmenityRepo.save(amenity).toResponse()
     }
@@ -84,6 +87,9 @@ class RoomAmenities(
         }
 
         amenity.name = request.name
+        amenity.category = request.category ?: amenity.category
+        amenity.iconKey = request.iconKey ?: amenity.iconKey
+        amenity.description = request.description ?: amenity.description
         return roomAmenityRepo.save(amenity).toResponse()
     }
 
@@ -117,6 +123,9 @@ private fun RoomAmenity.toResponse(): AmenityResponse {
     return AmenityResponse(
         id = id,
         propertyId = propertyId,
-        name = name
+        name = name,
+        category = category,
+        iconKey = iconKey,
+        description = description
     )
 }
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt
index bd69b7a..148cd83 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RoomTypes.kt
@@ -173,6 +173,9 @@ private fun RoomAmenity.toResponse(): com.android.trisolarisserver.controller.dt
     return com.android.trisolarisserver.controller.dto.AmenityResponse(
         id = id,
         propertyId = propertyId,
-        name = name
+        name = name,
+        category = category,
+        iconKey = iconKey,
+        description = description
     )
 }
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt
index b31259c..101236c 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomTypeDtos.kt
@@ -27,11 +27,17 @@ data class RoomTypeResponse(
 )
 
 data class AmenityUpsertRequest(
-    val name: String
+    val name: String,
+    val category: String? = null,
+    val iconKey: String? = null,
+    val description: String? = null
 )
 
 data class AmenityResponse(
     val id: UUID,
     val propertyId: UUID,
-    val name: String
+    val name: String,
+    val category: String?,
+    val iconKey: String?,
+    val description: String?
 )
diff --git a/src/main/kotlin/com/android/trisolarisserver/models/room/RoomAmenity.kt b/src/main/kotlin/com/android/trisolarisserver/models/room/RoomAmenity.kt
index f2a8385..9d38229 100644
--- a/src/main/kotlin/com/android/trisolarisserver/models/room/RoomAmenity.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/models/room/RoomAmenity.kt
@@ -31,6 +31,15 @@ class RoomAmenity(
     @Column(nullable = false)
     var name: String,
 
+    @Column
+    var category: String? = null,
+
+    @Column(name = "icon_key")
+    var iconKey: String? = null,
+
+    @Column
+    var description: String? = null,
+
     @Column(name = "created_at", nullable = false, columnDefinition = "timestamptz")
     val createdAt: OffsetDateTime = OffsetDateTime.now()
 )