test #386

Merged
klaus merged 5 commits from test into main 2026-02-08 07:42:31 +00:00
2 changed files with 9 additions and 2 deletions
Showing only changes of commit d1512f418f - Show all commits

View File

@@ -522,10 +522,9 @@ class LiveRoomService(
title = room.title, title = room.title,
notice = room.notice, notice = room.notice,
price = room.price, price = room.price,
tags = room.tags.asSequence() tags = room.tags
.filter { it.tag.isActive } .filter { it.tag.isActive }
.map { it.tag.tag } .map { it.tag.tag }
.toList()
.let { tags -> applyLanguageTagToRoomTags(room.member?.id, tags, languageTagByMemberId) }, .let { tags -> applyLanguageTagToRoomTags(room.member?.id, tags, languageTagByMemberId) },
numberOfParticipantsTotal = room.numberOfPeople, numberOfParticipantsTotal = room.numberOfPeople,
numberOfParticipants = 0, numberOfParticipants = 0,
@@ -956,6 +955,12 @@ class LiveRoomService(
} }
val menuPan = menuService.getLiveMenu(creatorId = room.member!!.id!!) val menuPan = menuService.getLiveMenu(creatorId = room.member!!.id!!)
val languageTagByMemberId = buildLanguageTagMap(listOfNotNull(room.member?.id))
val tags = room.tags
.filter { it.tag.isActive }
.map { it.tag.tag }
.let { tags -> applyLanguageTagToRoomTags(room.member?.id, tags, languageTagByMemberId) }
return GetRoomInfoResponse( return GetRoomInfoResponse(
roomId = roomId, roomId = roomId,
@@ -993,6 +998,7 @@ class LiveRoomService(
managerList = roomInfo.managerList, managerList = roomInfo.managerList,
donationRankingTop3UserIds = donationRankingTop3UserIds, donationRankingTop3UserIds = donationRankingTop3UserIds,
menuPan = menuPan?.menu ?: "", menuPan = menuPan?.menu ?: "",
tags = tags,
isPrivateRoom = room.type == LiveRoomType.PRIVATE, isPrivateRoom = room.type == LiveRoomType.PRIVATE,
password = room.password, password = room.password,
isActiveRoulette = isActiveRoulette isActiveRoulette = isActiveRoulette

View File

@@ -20,6 +20,7 @@ data class GetRoomInfoResponse(
val managerList: List<LiveRoomMember>, val managerList: List<LiveRoomMember>,
val donationRankingTop3UserIds: List<Long>, val donationRankingTop3UserIds: List<Long>,
val menuPan: String, val menuPan: String,
val tags: List<String>,
val isPrivateRoom: Boolean = false, val isPrivateRoom: Boolean = false,
val password: String? = null, val password: String? = null,
val isActiveRoulette: Boolean = false val isActiveRoulette: Boolean = false