Compare commits
No commits in common. "9f42d9d173df2ca076e5d15b0e098593b6d64c3b" and "f90a93c4bc70397a9168319420797aebe5ccd531" have entirely different histories.
9f42d9d173
...
f90a93c4bc
|
@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.fcm
|
|||
|
||||
import kr.co.vividnext.sodalive.content.comment.AudioContentCommentRepository
|
||||
import kr.co.vividnext.sodalive.member.MemberRepository
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.scheduling.annotation.Async
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.transaction.annotation.Propagation
|
||||
|
@ -34,6 +35,8 @@ class FcmSendListener(
|
|||
private val memberRepository: MemberRepository,
|
||||
private val contentCommentRepository: AudioContentCommentRepository
|
||||
) {
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@Async
|
||||
@TransactionalEventListener
|
||||
@Transactional(propagation = Propagation.REQUIRES_NEW)
|
||||
|
@ -122,6 +125,7 @@ class FcmSendListener(
|
|||
container = fcmEvent.container
|
||||
)
|
||||
|
||||
logger.info("토큰 - $pushTokens")
|
||||
for (tokens in pushTokens) {
|
||||
pushService.send(
|
||||
tokens = tokens,
|
||||
|
|
|
@ -152,9 +152,6 @@ class MemberQueryRepositoryImpl(
|
|||
isAuth: Boolean,
|
||||
container: String
|
||||
): List<List<String>> {
|
||||
val member = QMember.member
|
||||
val creator = QMember.member
|
||||
|
||||
var where = creatorFollowing.isActive.isTrue
|
||||
.and(creatorFollowing.creator.id.eq(creatorId))
|
||||
.and(creatorFollowing.member.notification.live.isTrue)
|
||||
|
@ -166,7 +163,7 @@ class MemberQueryRepositoryImpl(
|
|||
)
|
||||
)
|
||||
.and(creatorFollowing.member.pushToken.isNotNull)
|
||||
.or(creatorFollowing.member.id.eq(4).and(member.pushToken.isNotNull))
|
||||
.or(member.id.eq(4).and(member.pushToken.isNotNull))
|
||||
|
||||
if (isAuth) {
|
||||
where = where.and(creatorFollowing.member.auth.isNotNull)
|
||||
|
@ -175,10 +172,6 @@ class MemberQueryRepositoryImpl(
|
|||
val followingMemberPushToken = queryFactory
|
||||
.select(creatorFollowing.member.pushToken)
|
||||
.from(creatorFollowing)
|
||||
.innerJoin(creatorFollowing.creator, creator)
|
||||
.innerJoin(creatorFollowing.member, member)
|
||||
.innerJoin(member.notification, memberNotification)
|
||||
.leftJoin(member.auth, auth)
|
||||
.where(where)
|
||||
.fetch()
|
||||
|
||||
|
@ -201,9 +194,6 @@ class MemberQueryRepositoryImpl(
|
|||
val reservationMemberPushToken = queryFactory
|
||||
.select(liveReservation.member.pushToken)
|
||||
.from(liveReservation)
|
||||
.innerJoin(liveReservation.member, member)
|
||||
.innerJoin(member.notification, memberNotification)
|
||||
.leftJoin(member.auth, auth)
|
||||
.where(where)
|
||||
.fetch()
|
||||
|
||||
|
|
Loading…
Reference in New Issue