test #314

Merged
klaus merged 2 commits from test into main 2025-05-12 02:12:47 +00:00
2 changed files with 9 additions and 14 deletions

View File

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

View File

@ -424,7 +424,8 @@ class MemberQueryRepositoryImpl(
.from(liveReservation) .from(liveReservation)
.innerJoin(liveReservation.room, liveRoom) .innerJoin(liveReservation.room, liveRoom)
.innerJoin(liveReservation.member, member) .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() .fetch()
.toSet() .toSet()
.chunked(500) .chunked(500)