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

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

Reviewed-on: #72
This commit is contained in:
klaus 2023-11-07 16:23:11 +00:00
parent 2acffd8afc 24fc451574
commit e96d8f7469
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,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
@ -125,14 +126,13 @@ class LiveRoomService(
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(DateTimeFormatter.ofPattern("yyyy년 MM월 dd일 (E) a HH시 mm분").withLocale(Locale.KOREAN))
GetRoomListResponse( GetRoomListResponse(
roomId = it.id!!, roomId = it.id!!,
title = it.title, title = it.title,
content = it.notice, content = it.notice,
beginDateTime = beginDateTime.format( beginDateTime = beginDateTime,
DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")
),
numberOfParticipate = (roomInfo?.listenerCount ?: 0) + numberOfParticipate = (roomInfo?.listenerCount ?: 0) +
(roomInfo?.speakerCount ?: 0) + (roomInfo?.speakerCount ?: 0) +
(roomInfo?.managerCount ?: 0), (roomInfo?.managerCount ?: 0),
@ -297,6 +297,7 @@ class LiveRoomService(
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(DateTimeFormatter.ofPattern("yyyy년 MM월 dd일 (E) a HH시 mm분").withLocale(Locale.KOREAN))
val response = GetRoomDetailResponse( val response = GetRoomDetailResponse(
roomId = roomId, roomId = roomId,
@ -307,7 +308,7 @@ class LiveRoomService(
numberOfParticipantsTotal = room.numberOfPeople, numberOfParticipantsTotal = room.numberOfPeople,
numberOfParticipants = 0, numberOfParticipants = 0,
channelName = room.channelName, channelName = room.channelName,
beginDateTime = beginDateTime.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")), beginDateTime = beginDateTime,
isPaid = false, isPaid = false,
isAdult = room.isAdult, isAdult = room.isAdult,
isPrivateRoom = room.type == LiveRoomType.PRIVATE, isPrivateRoom = room.type == LiveRoomType.PRIVATE,
@ -384,27 +385,29 @@ class LiveRoomService(
val room = repository.getLiveRoomAndAccountId(request.roomId, member.id!!) val room = repository.getLiveRoomAndAccountId(request.roomId, member.id!!)
?: throw SodaException("해당하는 라이브가 없습니다.") ?: throw SodaException("해당하는 라이브가 없습니다.")
val dateTime = LocalDateTime.now() val nowDateTime = LocalDateTime.now()
.atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of(request.timezone))
.toLocalDateTime()
val beginDateTime = room.beginDateTime if (nowDateTime.plusMinutes(10).isBefore(room.beginDateTime)) {
.atZone(ZoneId.of("UTC")) val startAvailableDateTimeString = room.beginDateTime
.withZoneSameInstant(ZoneId.of(request.timezone)) .minusMinutes(10)
.toLocalDateTime() .atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
.format(DateTimeFormatter.ofPattern("yyyy년 MM월 dd일 (E) a HH시 mm분").withLocale(Locale.KOREAN))
if (dateTime.plusMinutes(10).isBefore(beginDateTime)) {
val startAvailableDateTimeString = beginDateTime.minusMinutes(10).format(
DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")
)
throw SodaException("$startAvailableDateTimeString 이후에 시작할 수 있습니다.") throw SodaException("$startAvailableDateTimeString 이후에 시작할 수 있습니다.")
} }
val dateTime = nowDateTime
.atZone(ZoneId.of("UTC"))
.withZoneSameInstant(ZoneId.of(request.timezone))
.toLocalDateTime()
room.channelName = "SODA_LIVE_CHANNEL_" + room.channelName = "SODA_LIVE_CHANNEL_" +
"${member.id}_${dateTime.year}_${dateTime.month}_${dateTime.dayOfMonth}_" + "${member.id}_${dateTime.year}_${dateTime.month}_${dateTime.dayOfMonth}_" +
"${dateTime.hour}_${dateTime.minute}" "${dateTime.hour}_${dateTime.minute}"
room.beginDateTime = nowDateTime
applicationEventPublisher.publishEvent( applicationEventPublisher.publishEvent(
FcmEvent( FcmEvent(
type = FcmEventType.START_LIVE, type = FcmEventType.START_LIVE,