klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'test' (#370) from test into main

Browse Source 
Reviewed-on: #370
This commit is contained in:
klaus
2025-12-31 11:01:28 +00:00
parent 68197de095 267a8f43d6
commit fd5c794480
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
View File

@@ -70,6 +70,7 @@ import java.time.LocalDateTime
import java.time.ZoneId import java.time.ZoneId
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
import java.util.Date import java.util.Date
import java.util.Locale
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.write import kotlin.concurrent.write
@@ -181,16 +182,13 @@ class LiveRoomService(
} }
} }
val beginDateTimeFormat = messageSource
.getMessage("live.room.datetime_format", langContext.lang)
.orEmpty()
val beginDateTime = it.beginDateTime val beginDateTime = it.beginDateTime
.atZone(ZoneId.of("UTC")) .atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of(timezone)) .withZoneSameInstant(ZoneId.of(timezone))
.format( .format(
DateTimeFormatter DateTimeFormatter
.ofPattern(beginDateTimeFormat) .ofPattern("yyyy년 MM월 dd일 (E) a hh시 mm분")
.withLocale(langContext.lang.locale) .withLocale(Locale.KOREAN)
) )
val beginDateTimeUtc = it.beginDateTime val beginDateTimeUtc = it.beginDateTime
@@ -450,17 +448,13 @@ class LiveRoomService(
throw SodaException(messageKey = "live.room.adult_verification_required") throw SodaException(messageKey = "live.room.adult_verification_required")
} }
val detailDateTimeFormat = messageSource
.getMessage("live.room.datetime_format_detail", langContext.lang)
.orEmpty()
val beginDateTime = room.beginDateTime val beginDateTime = room.beginDateTime
.atZone(ZoneId.of("UTC")) .atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of(timezone)) .withZoneSameInstant(ZoneId.of(timezone))
.format( .format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a"))
DateTimeFormatter
.ofPattern(detailDateTimeFormat) val beginDateTimeUtc = room.beginDateTime
.withLocale(langContext.lang.locale) .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
)
val response = GetRoomDetailResponse( val response = GetRoomDetailResponse(
roomId = roomId, roomId = roomId,
@@ -472,6 +466,7 @@ class LiveRoomService(
numberOfParticipants = 0, numberOfParticipants = 0,
channelName = room.channelName, channelName = room.channelName,
beginDateTime = beginDateTime, beginDateTime = beginDateTime,
beginDateTimeUtc = beginDateTimeUtc,
isPaid = false, isPaid = false,
isAdult = room.isAdult, isAdult = room.isAdult,
isPrivateRoom = room.type == LiveRoomType.PRIVATE, isPrivateRoom = room.type == LiveRoomType.PRIVATE,

1
src/main/kotlin/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt
View File

@@ -15,6 +15,7 @@ data class GetRoomDetailResponse(
val tags: List<String>, val tags: List<String>,
val channelName: String?, val channelName: String?,
val beginDateTime: String, val beginDateTime: String,
val beginDateTimeUtc: String,
var numberOfParticipants: Int, var numberOfParticipants: Int,
val numberOfParticipantsTotal: Int val numberOfParticipantsTotal: Int
) { ) {