Delete amenities by unlinking from room types

src/main/kotlin/com/android/trisolarisserver/controller/RoomAmenities.kt

@@ -86,6 +86,7 @@ class RoomAmenities(
 
     @DeleteMapping("/{amenityId}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
+    @org.springframework.transaction.annotation.Transactional
     fun deleteAmenity(
         @PathVariable amenityId: UUID,
         @AuthenticationPrincipal principal: MyPrincipal?
@@ -95,8 +96,12 @@ class RoomAmenities(
         val amenity = roomAmenityRepo.findById(amenityId).orElse(null)
             ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Amenity not found")
 
-        if (roomTypeRepo.existsByAmenitiesId(amenityId)) {
-            throw ResponseStatusException(HttpStatus.CONFLICT, "Amenity is used by room types")
+        val roomTypes = roomTypeRepo.findAllByAmenitiesId(amenityId)
+        if (roomTypes.isNotEmpty()) {
+            for (roomType in roomTypes) {
+                roomType.amenities.removeIf { it.id == amenityId }
+            }
+            roomTypeRepo.saveAll(roomTypes)
         }
         roomAmenityRepo.delete(amenity)
     }