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

Compare commits

base: klaus:82a6161abfc1060bb1cd685db6b41643f97ee8c1
Branches Tags
klaus:test
klaus:main
..
compare: klaus:2410d77cb7bce38d8731a22d519ceba0f422d870
Branches Tags
klaus:main
klaus:test

No commits in common. "82a6161abfc1060bb1cd685db6b41643f97ee8c1" and "2410d77cb7bce38d8731a22d519ceba0f422d870" have entirely different histories.
82a6161abf ... 2410d77cb7

4 changed files with 32 additions and 43 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt
View File

@ -21,8 +21,6 @@ class FcmService {
messageId: Long? = null,
contentId: Long? = null
) {
if (tokens.isNotEmpty()) {
logger.info("os: $container")
val multicastMessage = MulticastMessage.builder()
.addAllTokens(tokens)
@ -53,8 +51,8 @@ class FcmService {
}
val response = FirebaseMessaging.getInstance().sendEachForMulticast(multicastMessage.build())
logger.info("os: $container")
logger.info("보내기 성공: ${response.successCount}")
logger.info("보내기 실패: ${response.failureCount}")
}
}
}

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

@ -301,7 +301,6 @@ class LiveRoomService(
channelName = room.channelName,
beginDateTime = beginDateTime.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")),
isPaid = false,
isAdult = room.isAdult,
isPrivateRoom = room.type == LiveRoomType.PRIVATE,
password = room.password
)

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

@ -9,7 +9,6 @@ data class GetRoomDetailResponse(
val title: String,
val notice: String,
var isPaid: Boolean,
val isAdult: Boolean,
val isPrivateRoom: Boolean,
val password: String?,
val tags: List<String>,

9
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
View File

@ -80,7 +80,6 @@ class MemberQueryRepositoryImpl(
var where = member.isActive.isTrue
.and(member.email.notIn("admin@sodalive.net"))
.and(member.container.eq(container))
.and(member.pushToken.isNotNull)
if (isAuth) {
where = where.and(member.auth.isNotNull)
@ -114,7 +113,6 @@ class MemberQueryRepositoryImpl(
blockMemberRepository.getBlockedMemberList(creatorId)
)
)
.and(creatorFollowing.member.pushToken.isNotNull)
if (isAuth) {
where = where.and(member.auth.isNotNull)
@ -151,7 +149,6 @@ class MemberQueryRepositoryImpl(
blockMemberRepository.getBlockedMemberList(creatorId)
)
)
.and(creatorFollowing.member.pushToken.isNotNull)
if (isAuth) {
where = where.and(member.auth.isNotNull)
@ -180,10 +177,7 @@ class MemberQueryRepositoryImpl(
)
.from(message)
.innerJoin(message.recipient, member)
.where(
message.id.eq(messageId)
.and(member.pushToken.isNotNull)
)
.where(message.id.eq(messageId))
.fetchFirst()
}
@ -194,7 +188,6 @@ class MemberQueryRepositoryImpl(
var where = member.isActive.isTrue
.and(member.email.notIn("admin@sodalive.net"))
.and(member.id.`in`(*recipients.toTypedArray()))
.and(member.pushToken.isNotNull)
if (isAuth) {
where = where.and(member.auth.isNotNull)