From 518a5bb35956b7229962a7cac14d25f31d3455f1 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 16:12:55 +0530
Subject: [PATCH] Split room image ordering for room and room type

---
 .../trisolarisserver/controller/RoomImages.kt        | 12 ++++++------
 .../trisolarisserver/controller/dto/RoomDtos.kt      |  4 ++--
 .../trisolarisserver/models/room/RoomImage.kt        |  6 +++---
 .../android/trisolarisserver/repo/RoomImageRepo.kt   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt
index 3bc91ae..e115651 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RoomImages.kt
@@ -58,8 +58,8 @@ class RoomImages(
         @PathVariable roomId: UUID,
         @AuthenticationPrincipal principal: MyPrincipal?,
         @RequestParam("file") file: MultipartFile,
-        @RequestParam(required = false) sortOrder: Int?,
-        @RequestParam(required = false) category: String?,
+        @RequestParam(required = false) roomSortOrder: Int?,
+        @RequestParam(required = false) roomTypeSortOrder: Int?,
         @RequestParam(required = false) tags: List<String>?
     ): RoomImageResponse {
         requirePrincipal(principal)
@@ -85,8 +85,8 @@ class RoomImages(
             sizeBytes = stored.sizeBytes,
             roomTypeCode = room.roomType.code,
             tags = tags?.toMutableSet() ?: mutableSetOf(),
-            sortOrder = sortOrder,
-            category = category
+            roomSortOrder = roomSortOrder,
+            roomTypeSortOrder = roomTypeSortOrder
         )
         return roomImageRepo.save(image).toResponse(publicBaseUrl)
     }
@@ -143,8 +143,8 @@ private fun RoomImage.toResponse(baseUrl: String): RoomImageResponse {
         contentType = contentType,
         sizeBytes = sizeBytes,
         tags = tags.toSet(),
-        sortOrder = sortOrder,
-        category = category,
+        roomSortOrder = roomSortOrder,
+        roomTypeSortOrder = roomTypeSortOrder,
         createdAt = createdAt.toString()
     )
 }
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 a977dd0..1b79961 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RoomDtos.kt
@@ -40,8 +40,8 @@ data class RoomImageResponse(
     val contentType: String,
     val sizeBytes: Long,
     val tags: Set<String>,
-    val sortOrder: Int?,
-    val category: String?,
+    val roomSortOrder: Int?,
+    val roomTypeSortOrder: Int?,
     val createdAt: String
 )
 
diff --git a/src/main/kotlin/com/android/trisolarisserver/models/room/RoomImage.kt b/src/main/kotlin/com/android/trisolarisserver/models/room/RoomImage.kt
index 4c1d363..43f2d81 100644
--- a/src/main/kotlin/com/android/trisolarisserver/models/room/RoomImage.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/models/room/RoomImage.kt
@@ -45,10 +45,10 @@ class RoomImage(
     var tags: MutableSet<String> = mutableSetOf(),
 
     @Column(name = "sort_order")
-    var sortOrder: Int? = null,
+    var roomSortOrder: Int? = null,
 
-    @Column
-    var category: String? = null,
+    @Column(name = "room_type_sort_order")
+    var roomTypeSortOrder: Int? = null,
 
     @Column(name = "created_at", nullable = false, columnDefinition = "timestamptz")
     val createdAt: OffsetDateTime = OffsetDateTime.now()
diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
index fab0373..0209ef1 100644
--- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
@@ -12,7 +12,7 @@ interface RoomImageRepo : JpaRepository<RoomImage, UUID> {
         select ri
         from RoomImage ri
         where ri.room.id = :roomId
-        order by (ri.sortOrder is null), ri.sortOrder asc, ri.createdAt desc
+        order by (ri.roomSortOrder is null), ri.roomSortOrder asc, ri.createdAt desc
         """
     )
     fun findByRoomIdOrdered(@Param("roomId") roomId: UUID): List<RoomImage>