From b915ace6ffbc048b10b8bd6b3b54596d2fcebbb2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 8 May 2025 19:47:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=91=B8=EC=8B=9C=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EB=B0=9C=EC=86=A1=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20iOS=EC=9D=BC=20=EB=95=8C=EB=8A=94=20notificatio?= =?UTF-8?q?n,=20android=20=EC=9D=BC=20=EB=95=8C=EB=8A=94=20data-only=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=ED=95=98=EB=8D=98=20=ED=98=84=EC=9E=AC=20=EB=B0=A9=EC=8B=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=AA=A8=EB=91=90=20notification=EC=9D=84?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/fcm/FcmService.kt | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt index b1b78fc..997b2f5 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt @@ -56,19 +56,13 @@ class FcmService(private val pushTokenService: PushTokenService) { .build() ) - if (container == "ios") { - multicastMessage - .setNotification( - Notification.builder() - .setTitle(title) - .setBody(message) - .build() - ) - } else { - multicastMessage - .putData("title", title) - .putData("message", message) - } + multicastMessage + .setNotification( + Notification.builder() + .setTitle(title) + .setBody(message) + .build() + ) if (roomId != null) { multicastMessage.putData("room_id", roomId.toString()) -- 2.40.1 From ced35af66d0ceadebbec5e4fde94207d2e4065d7 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 9 May 2025 11:28:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=98=88=EC=95=BD=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20-=20push?= =?UTF-8?q?=20=ED=86=A0=ED=81=B0=20=EA=B0=80=EC=A0=B8=EC=98=AC=20=EB=95=8C?= =?UTF-8?q?=20push=20token=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=9D=84=20?= =?UTF-8?q?=EC=B0=B8=EC=A1=B0=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=84=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt index 62cc950..2f14fea 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt +++ b/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) -- 2.40.1