src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt

@@ -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())

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

@@ -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)