From 8654263c591f52a3a76a2f9192b79cf23a857699 Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:07:53 +0900 Subject: [PATCH 1/6] =?UTF-8?q?:memo:=20RecyclablesType=20=EC=97=90=20cont?= =?UTF-8?q?ent=20=ED=95=84=EB=93=9C=EC=9D=98=20=EC=9D=B4=EB=A6=84=EC=9D=84?= =?UTF-8?q?=20body=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miso/domain/notification/domain/NotificationType.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationType.kt b/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationType.kt index 3dc2485f..4ee275af 100644 --- a/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationType.kt +++ b/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationType.kt @@ -2,21 +2,21 @@ package andreas311.miso.domain.notification.domain enum class NotificationType( val title: String, - val content: String + val body: String ) { INQUIRY_WAIT( title = "Miso 문의사항 등록 완료!", - content = "최대한 빠르게 답변 드릴테니 기다려주세요 :)" + body = "최대한 빠르게 답변 드릴테니 기다려주세요 :)" ), INQUIRY_COMPLETE( title = "Miso 문의사항 답변 도착!", - content = "내 문의 내역에서 답변을 확인해주세요 :)" + body = "내 문의 내역에서 답변을 확인해주세요 :)" ), ENVIRONMENT( title = "오늘의 환경 지식을 알고 싶다면?", - content = "Miso 에서 오늘의 환경 지식을 확인해보세요 :)" + body = "Miso 에서 오늘의 환경 지식을 확인해보세요 :)" ) } \ No newline at end of file From 59a2d6379494aa11bfedc7a61c357e2a659b0c9b Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:08:07 +0900 Subject: [PATCH 2/6] =?UTF-8?q?:memo:=20NotificationAlarm=20=EC=97=90=20co?= =?UTF-8?q?ntent=20=ED=95=84=EB=93=9C=EC=9D=98=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=9D=84=20body=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miso/domain/notification/domain/NotificationAlarm.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationAlarm.kt b/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationAlarm.kt index 6d09bca1..4144fd88 100644 --- a/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationAlarm.kt +++ b/src/main/kotlin/andreas311/miso/domain/notification/domain/NotificationAlarm.kt @@ -2,6 +2,6 @@ package andreas311.miso.domain.notification.domain data class NotificationAlarm( val title: String, - val content: String, + val body: String, val writer: String ) From 305749adf2e3655a6ad94eb04fcc77d04db1143f Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:09:23 +0900 Subject: [PATCH 3/6] =?UTF-8?q?:memo:=20InquiryNotificationSendService=20?= =?UTF-8?q?=EC=97=90=20content=20=ED=95=84=EB=93=9C=EC=9D=98=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EC=9D=84=20body=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/InquiryNotificationSendService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/andreas311/miso/domain/notification/application/service/InquiryNotificationSendService.kt b/src/main/kotlin/andreas311/miso/domain/notification/application/service/InquiryNotificationSendService.kt index 688cf49c..8d6292c1 100644 --- a/src/main/kotlin/andreas311/miso/domain/notification/application/service/InquiryNotificationSendService.kt +++ b/src/main/kotlin/andreas311/miso/domain/notification/application/service/InquiryNotificationSendService.kt @@ -23,7 +23,7 @@ class InquiryNotificationSendService( deviceToken = token, notificationAlarm = NotificationAlarm( title = notificationType.title, - content = notificationType.content, + body = notificationType.body, writer = "미소" ) ) From 6e604a8b10d73bd1107602ad9a507189b0a8a8d5 Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:09:35 +0900 Subject: [PATCH 4/6] =?UTF-8?q?:memo:=20EnvironmentNotificationSendService?= =?UTF-8?q?=20=EC=97=90=20content=20=ED=95=84=EB=93=9C=EC=9D=98=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=EC=9D=84=20body=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/EnvironmentNotificationSendService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/andreas311/miso/domain/notification/application/service/EnvironmentNotificationSendService.kt b/src/main/kotlin/andreas311/miso/domain/notification/application/service/EnvironmentNotificationSendService.kt index 419e70d3..2ab9a0ab 100644 --- a/src/main/kotlin/andreas311/miso/domain/notification/application/service/EnvironmentNotificationSendService.kt +++ b/src/main/kotlin/andreas311/miso/domain/notification/application/service/EnvironmentNotificationSendService.kt @@ -19,7 +19,7 @@ class EnvironmentNotificationSendService( deviceTokens = queryDeviceTokenPort.findAll().map { it.deviceToken }, notificationAlarm = NotificationAlarm( title = NotificationType.ENVIRONMENT.title, - content = NotificationType.ENVIRONMENT.content, + body = NotificationType.ENVIRONMENT.body, writer = "미소" ) ) From 8dd7ff10aee09714a659c9cff67ac3b161d60bdd Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:10:48 +0900 Subject: [PATCH 5/6] =?UTF-8?q?:art:=20FcmNotificationAdapter=20=EC=97=90?= =?UTF-8?q?=20Message=20=EC=A0=84=EC=86=A1=20=EB=B0=A9=EC=8B=9D=EC=9D=84?= =?UTF-8?q?=20Notification=20=EC=97=90=EC=84=9C=20Data=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firebase/adapter/FcmNotificationAdapter.kt | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/andreas311/miso/thirdparty/firebase/adapter/FcmNotificationAdapter.kt b/src/main/kotlin/andreas311/miso/thirdparty/firebase/adapter/FcmNotificationAdapter.kt index 69d05e01..2152c0c4 100644 --- a/src/main/kotlin/andreas311/miso/thirdparty/firebase/adapter/FcmNotificationAdapter.kt +++ b/src/main/kotlin/andreas311/miso/thirdparty/firebase/adapter/FcmNotificationAdapter.kt @@ -5,7 +5,6 @@ import andreas311.miso.domain.notification.domain.NotificationAlarm import com.google.firebase.messaging.FirebaseMessaging import com.google.firebase.messaging.Message import com.google.firebase.messaging.MulticastMessage -import com.google.firebase.messaging.Notification import org.springframework.stereotype.Component @Component @@ -30,23 +29,14 @@ class FcmNotificationAdapter : FcmNotificationPort { private fun getMassageBuilderByNotification(notificationAlarm: NotificationAlarm) = with(notificationAlarm) { Message.builder() - .setNotification( - Notification.builder() - .setTitle(title) - .setBody(content) - .build() - ) + .putData("title", title) + .putData("body", body) } private fun getMulticastMassageBuilderByNotification(notificationAlarm: NotificationAlarm) = with(notificationAlarm) { MulticastMessage.builder() - .setNotification( - Notification.builder() - .setTitle(title) - .setBody(content) - .build() - ) + .putData("title", title) + .putData("body", body) } - } \ No newline at end of file From 128bb0d335ef9ba5dc0e66a44bdd005a83bd5c94 Mon Sep 17 00:00:00 2001 From: uuuuuuuk Date: Thu, 18 Apr 2024 11:28:44 +0900 Subject: [PATCH 6/6] =?UTF-8?q?:memo:=20=EC=BD=94=EB=93=9C=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recyclables/application/service/ProcessRecyclablesService.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/andreas311/miso/domain/recyclables/application/service/ProcessRecyclablesService.kt b/src/main/kotlin/andreas311/miso/domain/recyclables/application/service/ProcessRecyclablesService.kt index f5919490..24005026 100644 --- a/src/main/kotlin/andreas311/miso/domain/recyclables/application/service/ProcessRecyclablesService.kt +++ b/src/main/kotlin/andreas311/miso/domain/recyclables/application/service/ProcessRecyclablesService.kt @@ -19,7 +19,6 @@ class ProcessRecyclablesService( private val webClient: WebClient, private val queryRecyclablesPort: QueryRecyclablesPort ) : ProcessRecyclablesUseCase { - @Value("\${ai.url}") private val url: String = ""