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

Reviewed-on: #314
This commit is contained in:
klaus 2025-05-12 02:12:47 +00:00
commit c4e1709b99
2 changed files with 9 additions and 14 deletions

View File

@ -56,7 +56,6 @@ class FcmService(private val pushTokenService: PushTokenService) {
.build()
)
if (container == "ios") {
multicastMessage
.setNotification(
Notification.builder()
@ -64,11 +63,6 @@ class FcmService(private val pushTokenService: PushTokenService) {
.setBody(message)
.build()
)
} else {
multicastMessage
.putData("title", title)
.putData("message", message)
}
if (roomId != null) {
multicastMessage.putData("room_id", roomId.toString())

View File

@ -424,7 +424,8 @@ class MemberQueryRepositoryImpl(
.from(liveReservation)
.innerJoin(liveReservation.room, liveRoom)
.innerJoin(liveReservation.member, member)
.where(where.and(pushToken.deviceType.eq("aos")))
.innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
.where(where.and(pushToken.deviceType.eq("ios")))
.fetch()
.toSet()
.chunked(500)