From ccb32a73ddf83b80ca12f4dbb91e3c3895977545 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Wed, 9 Aug 2023 10:36:40 +0900
Subject: [PATCH] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20?=
=?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20-=20container=EA=B0=80=20?=
=?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=EB=B6=80=EB=B6=84=EC=97=90=20con?=
=?UTF-8?q?tainer=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sodalive/content/AudioContentService.kt | 15 +++++++-
.../kr/co/vividnext/sodalive/fcm/FcmEvent.kt | 16 ++++-----
.../sodalive/live/room/LiveRoomService.kt | 34 +++++++++++++++++--
3 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
index acaf24c..f849a25 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
@@ -272,7 +272,20 @@ class AudioContentService(
message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}",
isAuth = audioContent.isAdult,
contentId = contentId,
- creatorId = audioContent.member!!.id
+ creatorId = audioContent.member!!.id,
+ container = "ios"
+ )
+ )
+
+ applicationEventPublisher.publishEvent(
+ FcmEvent(
+ type = FcmEventType.UPLOAD_CONTENT,
+ title = audioContent.member!!.nickname,
+ message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}",
+ isAuth = audioContent.isAdult,
+ contentId = contentId,
+ creatorId = audioContent.member!!.id,
+ container = "aos"
)
)
}
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
index fc2e324..f2b3df9 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
@@ -35,14 +35,13 @@ class FcmSendListener(
fun send(fcmEvent: FcmEvent) {
when (fcmEvent.type) {
FcmEventType.ALL -> {
+ logger.info("ALL")
if (fcmEvent.container.isNotBlank()) {
val pushTokens = memberRepository.getAllRecipientPushTokens(
fcmEvent.isAuth,
fcmEvent.container
)
- logger.info("tokens::: $pushTokens")
-
for (tokens in pushTokens) {
pushService.send(
tokens = tokens,
@@ -55,14 +54,13 @@ class FcmSendListener(
}
FcmEventType.INDIVIDUAL -> {
+ logger.info("INDIVIDUAL")
if (fcmEvent.recipients.isNotEmpty()) {
val pushTokens = memberRepository.getIndividualRecipientPushTokens(
recipients = fcmEvent.recipients,
isAuth = fcmEvent.isAuth
)
- logger.info("tokens::: $pushTokens")
-
val iosPushTokens = pushTokens["ios"]
val aosPushToken = pushTokens["aos"]
@@ -91,6 +89,8 @@ class FcmSendListener(
}
FcmEventType.CREATE_LIVE, FcmEventType.START_LIVE -> {
+ logger.info("CREATE_LIVE")
+ logger.info("START_LIVE")
if (fcmEvent.container.isNotBlank()) {
val pushTokens = memberRepository.getCreateLiveRoomNotificationRecipientPushTokens(
creatorId = fcmEvent.creatorId!!,
@@ -98,8 +98,6 @@ class FcmSendListener(
container = fcmEvent.container
)
- logger.info("tokens::: $pushTokens")
-
for (tokens in pushTokens) {
pushService.send(
tokens = tokens,
@@ -113,6 +111,7 @@ class FcmSendListener(
}
FcmEventType.UPLOAD_CONTENT -> {
+ logger.info("UPLOAD_CONTENT")
if (fcmEvent.container.isNotBlank()) {
val pushTokens = memberRepository.getUploadContentNotificationRecipientPushTokens(
creatorId = fcmEvent.creatorId!!,
@@ -120,8 +119,6 @@ class FcmSendListener(
container = fcmEvent.container
)
- logger.info("tokens::: $pushTokens")
-
for (tokens in pushTokens) {
pushService.send(
tokens = tokens,
@@ -135,10 +132,9 @@ class FcmSendListener(
}
FcmEventType.SEND_MESSAGE -> {
+ logger.info("SEND_MESSAGE")
val response = memberRepository.getMessageRecipientPushToken(messageId = fcmEvent.messageId!!)
- logger.info("tokens::: ${response.pushToken}")
-
pushService.send(
tokens = listOf(response.pushToken),
title = fcmEvent.title,
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
index 4de90c2..a894b70 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -254,7 +254,24 @@ class LiveRoomService(
},
isAuth = createdRoom.isAdult,
roomId = createdRoom.id,
- creatorId = createdRoom.member!!.id
+ creatorId = createdRoom.member!!.id,
+ container = "ios"
+ )
+ )
+
+ applicationEventPublisher.publishEvent(
+ FcmEvent(
+ type = FcmEventType.CREATE_LIVE,
+ title = createdRoom.member!!.nickname,
+ message = if (createdRoom.channelName != null) {
+ "라이브를 시작했습니다. - ${createdRoom.title}"
+ } else {
+ "라이브를 개설했습니다. - ${createdRoom.title}"
+ },
+ isAuth = createdRoom.isAdult,
+ roomId = createdRoom.id,
+ creatorId = createdRoom.member!!.id,
+ container = "aos"
)
)
@@ -386,7 +403,20 @@ class LiveRoomService(
message = "라이브를 시작했습니다 - ${room.title}",
isAuth = room.isAdult,
roomId = room.id,
- creatorId = room.member!!.id
+ creatorId = room.member!!.id,
+ container = "ios"
+ )
+ )
+
+ applicationEventPublisher.publishEvent(
+ FcmEvent(
+ type = FcmEventType.START_LIVE,
+ title = room.member!!.nickname,
+ message = "라이브를 시작했습니다 - ${room.title}",
+ isAuth = room.isAdult,
+ roomId = room.id,
+ creatorId = room.member!!.id,
+ container = "aos"
)
)
}