Compare commits

...

3 Commits

4 changed files with 43 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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