test #1

Merged
klaus merged 94 commits from test into main 2023-08-16 02:30:37 +00:00
1 changed files with 1 additions and 5 deletions
Showing only changes of commit ba69f86295 - Show all commits

View File

@ -57,7 +57,6 @@ 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
@ -291,9 +290,6 @@ class LiveRoomService(
.atZone(ZoneId.of("UTC")) .atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of(timezone)) .withZoneSameInstant(ZoneId.of(timezone))
val dateFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd E a hh:mm")
.withLocale(Locale(timezone))
val response = GetRoomDetailResponse( val response = GetRoomDetailResponse(
roomId = roomId, roomId = roomId,
title = room.title, title = room.title,
@ -303,7 +299,7 @@ class LiveRoomService(
numberOfParticipantsTotal = room.numberOfPeople, numberOfParticipantsTotal = room.numberOfPeople,
numberOfParticipants = 0, numberOfParticipants = 0,
channelName = room.channelName, channelName = room.channelName,
beginDateTime = beginDateTime.format(dateFormatter), beginDateTime = beginDateTime.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")),
isPaid = false, isPaid = false,
isPrivateRoom = room.type == LiveRoomType.PRIVATE, isPrivateRoom = room.type == LiveRoomType.PRIVATE,
password = room.password password = room.password