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

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

Reviewed-on: #94
This commit is contained in:
klaus 2023-11-24 07:03:10 +00:00
parent 0c01aeec50 11bb799bd5
commit 3795fb4a40
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt
View File

@ -81,7 +81,7 @@ class ChargeEventService(
title = chargeEvent.title,
message = "$additionalCan 캔이 추가 지급되었습니다.",
recipients = listOf(member.id!!),
isAuth = false
isAuth = null
)
)
}
@ -103,7 +103,7 @@ class ChargeEventService(
title = "첫 충전 이벤트",
message = "$additionalCan 캔이 추가 지급되었습니다.",
recipients = listOf(member.id!!),
isAuth = false
isAuth = null
)
)
}

2
src/main/kotlin/kr/co/vividnext/sodalive/can/charge/free/AdsChargeService.kt
View File

@ -78,7 +78,7 @@ class AdsChargeService(
title = "제휴보상",
message = "${adsCharge.point.toInt()} 캔이 지급되었습니다.",
recipients = listOf(member.id!!),
isAuth = false
isAuth = null
)
)
}

2
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
View File

@ -341,7 +341,7 @@ class AudioContentService(
title = "콘텐츠 등록완료",
message = audioContent.title,
recipients = listOf(audioContent.member!!.id!!),
isAuth = audioContent.isAdult,
isAuth = null,
contentId = contentId
)
)

7
src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt
View File

@ -22,6 +22,7 @@ class FcmController(private val applicationEventPublisher: ApplicationEventPubli
FcmEvent(
type = FcmEventType.INDIVIDUAL,
title = request.title,
isAuth = request.isAuth,
message = request.message,
recipients = request.memberIds
)
@ -32,7 +33,8 @@ class FcmController(private val applicationEventPublisher: ApplicationEventPubli
type = FcmEventType.ALL,
title = request.title,
message = request.message,
container = "ios"
container = "ios",
isAuth = request.isAuth
)
)
@ -41,7 +43,8 @@ class FcmController(private val applicationEventPublisher: ApplicationEventPubli
type = FcmEventType.ALL,
title = request.title,
message = request.message,
container = "aos"
container = "aos",
isAuth = request.isAuth
)
)
}

8
src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
View File

@ -20,7 +20,7 @@ class FcmEvent(
val container: String = "",
val recipients: List<Long> = listOf(),
val recipientsMap: Map<String, List<List<String>>>? = null,
val isAuth: Boolean = false,
val isAuth: Boolean? = null,
val roomId: Long? = null,
val contentId: Long? = null,
val messageId: Long? = null,
@ -97,7 +97,7 @@ class FcmSendListener(
if (fcmEvent.container.isNotBlank()) {
val pushTokens = memberRepository.getCreateLiveRoomNotificationRecipientPushTokens(
creatorId = fcmEvent.creatorId!!,
isAuth = fcmEvent.isAuth,
isAuth = fcmEvent.isAuth ?: false,
container = fcmEvent.container
)
@ -118,7 +118,7 @@ class FcmSendListener(
val pushTokens = memberRepository.getStartLiveRoomNotificationRecipientPushTokens(
creatorId = fcmEvent.creatorId!!,
roomId = fcmEvent.roomId!!,
isAuth = fcmEvent.isAuth,
isAuth = fcmEvent.isAuth ?: false,
container = fcmEvent.container
)
@ -166,7 +166,7 @@ class FcmSendListener(
if (fcmEvent.container.isNotBlank()) {
val pushTokens = memberRepository.getUploadContentNotificationRecipientPushTokens(
creatorId = fcmEvent.creatorId!!,
isAuth = fcmEvent.isAuth,
isAuth = fcmEvent.isAuth ?: false,
container = fcmEvent.container
)

3
src/main/kotlin/kr/co/vividnext/sodalive/fcm/PushRequest.kt
View File

@ -3,5 +3,6 @@ package kr.co.vividnext.sodalive.fcm
data class PushRequest(
val memberIds: List<Long>,
val title: String,
val message: String
val message: String,
val isAuth: Boolean?
)

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

@ -25,7 +25,7 @@ interface MemberQueryRepository {
fun findByPushToken(pushToken: String): List<Member>
fun findByNicknameAndOtherCondition(nickname: String, member: Member): List<Member>
fun findCreatorByIdOrNull(memberId: Long): Member?
fun getAllRecipientPushTokens(isAuth: Boolean, container: String): List<List<String>>
fun getAllRecipientPushTokens(isAuth: Boolean?, container: String): List<List<String>>
fun getCreateLiveRoomNotificationRecipientPushTokens(
creatorId: Long,
isAuth: Boolean,
@ -46,7 +46,7 @@ interface MemberQueryRepository {
): List<List<String>>
fun getMessageRecipientPushToken(messageId: Long): GetMessageRecipientPushTokenResponse
fun getIndividualRecipientPushTokens(recipients: List<Long>, isAuth: Boolean): Map<String, List<List<String>>>
fun getIndividualRecipientPushTokens(recipients: List<Long>, isAuth: Boolean?): Map<String, List<List<String>>>
fun getChangeNicknamePrice(memberId: Long): GetChangeNicknamePriceResponse
fun getMemberByEmail(email: String): Member?
@ -93,14 +93,18 @@ class MemberQueryRepositoryImpl(
.fetchFirst()
}
override fun getAllRecipientPushTokens(isAuth: Boolean, container: String): List<List<String>> {
override fun getAllRecipientPushTokens(isAuth: Boolean?, container: String): List<List<String>> {
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)
if (isAuth != null) {
where = if (isAuth) {
where.and(auth.isNotNull)
} else {
where.and(auth.isNull)
}
}
return queryFactory
@ -276,15 +280,19 @@ class MemberQueryRepositoryImpl(
override fun getIndividualRecipientPushTokens(
recipients: List<Long>,
isAuth: Boolean
isAuth: Boolean?
): Map<String, List<List<String>>> {
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)
if (isAuth != null) {
where = if (isAuth) {
where.and(auth.isNotNull)
} else {
where.and(auth.isNull)
}
}
val aosPushTokens = queryFactory