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

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

Reviewed-on: #11
This commit is contained in:
klaus 2023-08-21 13:19:03 +00:00
parent 474646db47 fa8d8c4ab1
commit 3e1887e0d1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ class LiveRoomService(
?: throw SodaException("이미 종료된 방입니다") ?: throw SodaException("이미 종료된 방입니다")
if (room.isAdult && member.auth == null) { if (room.isAdult && member.auth == null) {
throw SodaException("본인인증이 필요한 서비스 입니다.\n요즘라이브 마이페이지에서 본인인증 후 다시 이용해 주세요.") throw SodaException("본인인증이 필요한 서비스 입니다.\n소다라이브 마이페이지에서 본인인증 후 다시 이용해 주세요.")
} }
val beginDateTime = room.beginDateTime val beginDateTime = room.beginDateTime

8
src/main/kotlin/kr/co/vividnext/sodalive/message/MessageService.kt
View File

@ -146,16 +146,16 @@ class MessageService(
return getVoiceMessageResponse(totalCount, messageList, timezone) return getVoiceMessageResponse(totalCount, messageList, timezone)
} }
fun getReceivedVoiceMessages(member: Member, pageable: Pageable, timezone: String): GetTextMessageResponse { fun getReceivedVoiceMessages(member: Member, pageable: Pageable, timezone: String): GetVoiceMessageResponse {
val totalCount = repository.getReceivedVoiceMessageCount(memberId = member.id!!) val totalCount = repository.getReceivedVoiceMessageCount(memberId = member.id!!)
val messageList = repository.getReceivedVoiceMessageList(pageable, memberId = member.id!!) val messageList = repository.getReceivedVoiceMessageList(pageable, memberId = member.id!!)
return getTextMessageResponse(totalCount, messageList, timezone) return getVoiceMessageResponse(totalCount, messageList, timezone)
} }
fun getKeepVoiceMessages(member: Member, pageable: Pageable, timezone: String): GetTextMessageResponse { fun getKeepVoiceMessages(member: Member, pageable: Pageable, timezone: String): GetVoiceMessageResponse {
val totalCount = repository.getKeepVoiceMessageCount(memberId = member.id!!) val totalCount = repository.getKeepVoiceMessageCount(memberId = member.id!!)
val messageList = repository.getKeepVoiceMessageList(pageable, memberId = member.id!!) val messageList = repository.getKeepVoiceMessageList(pageable, memberId = member.id!!)
return getTextMessageResponse(totalCount, messageList, timezone) return getVoiceMessageResponse(totalCount, messageList, timezone)
} }
@Transactional @Transactional