From 68bd80bde419c3b59c6f2a7a32f6043151eb1ce6 Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Sun, 9 Feb 2025 13:52:59 +0900
Subject: [PATCH 1/6] Add PushOptOut data model and repository
---
.../kotlin/notification/data/PushCategory.kt | 33 +++++++++++++++++++
.../kotlin/notification/data/PushOptOut.kt | 21 ++++++++++++
.../repository/PushOptOutRepository.kt | 17 ++++++++++
3 files changed, 71 insertions(+)
create mode 100644 core/src/main/kotlin/notification/data/PushCategory.kt
create mode 100644 core/src/main/kotlin/notification/data/PushOptOut.kt
create mode 100644 core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
diff --git a/core/src/main/kotlin/notification/data/PushCategory.kt b/core/src/main/kotlin/notification/data/PushCategory.kt
new file mode 100644
index 00000000..6f1ff1e2
--- /dev/null
+++ b/core/src/main/kotlin/notification/data/PushCategory.kt
@@ -0,0 +1,33 @@
+package com.wafflestudio.snutt.notification.data
+
+import com.fasterxml.jackson.annotation.JsonValue
+import org.springframework.core.convert.converter.Converter
+import org.springframework.data.convert.ReadingConverter
+import org.springframework.data.convert.WritingConverter
+import org.springframework.stereotype.Component
+
+enum class PushCategory(
+ @JsonValue val value: Int,
+) {
+ LECTURE_UPDATE(1),
+ VACANCY_NOTIFICATION(2),
+ ;
+
+ companion object {
+ private val valueMap = PushCategory.entries.associateBy { e -> e.value }
+
+ fun getOfValue(value: Int): PushCategory? = valueMap[value]
+ }
+}
+
+@ReadingConverter
+@Component
+class PushCategoryReadConverter : Converter<Int, PushCategory> {
+ override fun convert(source: Int): PushCategory = PushCategory.getOfValue(source)!!
+}
+
+@WritingConverter
+@Component
+class PushCategoryWriteConverter : Converter<PushCategory, Int> {
+ override fun convert(source: PushCategory): Int = source.value
+}
diff --git a/core/src/main/kotlin/notification/data/PushOptOut.kt b/core/src/main/kotlin/notification/data/PushOptOut.kt
new file mode 100644
index 00000000..30ef5888
--- /dev/null
+++ b/core/src/main/kotlin/notification/data/PushOptOut.kt
@@ -0,0 +1,21 @@
+package com.wafflestudio.snutt.notification.data
+
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.index.CompoundIndex
+import org.springframework.data.mongodb.core.index.Indexed
+import org.springframework.data.mongodb.core.mapping.Document
+import org.springframework.data.mongodb.core.mapping.Field
+import org.springframework.data.mongodb.core.mapping.FieldType
+
+@Document(collection = "push_opt_out")
+@CompoundIndex(def = "{ 'user_id': 1, 'push_category': 1 }")
+data class PushOptOut(
+ @Id
+ val id: String? = null,
+ @Indexed
+ @Field("user_id", targetType = FieldType.OBJECT_ID)
+ val userId: String,
+ @Field("push_category")
+ @Indexed
+ val pushCategory: PushCategory,
+)
diff --git a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
new file mode 100644
index 00000000..f8751019
--- /dev/null
+++ b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
@@ -0,0 +1,17 @@
+package com.wafflestudio.snutt.notification.repository
+
+import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.data.PushOptOut
+import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+
+interface PushOptOutRepository : CoroutineCrudRepository<PushOptOut, String> {
+ suspend fun existsByUserIdAndPushCategory(
+ userId: String,
+ pushCategory: PushCategory,
+ ): Boolean
+
+ suspend fun deleteByUserIdAndPushCategory(
+ userId: String,
+ pushCategory: PushCategory,
+ ): Long
+}
From d13cd599dcbd91f4a2aaf3c4134bc1fe9da7e2e9 Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Sun, 9 Feb 2025 14:42:44 +0900
Subject: [PATCH 2/6] Add send-categorical-push method to PushService
---
.../repository/PushOptOutRepository.kt | 5 ++
.../notification/service/PushService.kt | 65 +++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
index f8751019..88972f54 100644
--- a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
+++ b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
@@ -14,4 +14,9 @@ interface PushOptOutRepository : CoroutineCrudRepository<PushOptOut, String> {
userId: String,
pushCategory: PushCategory,
): Long
+
+ suspend fun findByUserIdInAndPushCategory(
+ userIds: List<String>,
+ pushCategory: PushCategory,
+ ): List<PushOptOut>
}
diff --git a/core/src/main/kotlin/notification/service/PushService.kt b/core/src/main/kotlin/notification/service/PushService.kt
index 0627a91e..8dccf9d0 100644
--- a/core/src/main/kotlin/notification/service/PushService.kt
+++ b/core/src/main/kotlin/notification/service/PushService.kt
@@ -3,6 +3,8 @@ package com.wafflestudio.snutt.notification.service
import com.wafflestudio.snutt.common.push.PushClient
import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.common.push.dto.TargetedPushMessageWithToken
+import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.repository.PushOptOutRepository
import org.springframework.stereotype.Service
/**
@@ -22,12 +24,30 @@ interface PushService {
suspend fun sendGlobalPush(pushMessage: PushMessage)
suspend fun sendTargetPushes(userToPushMessage: Map<String, PushMessage>)
+
+ suspend fun sendCategoricalPush(
+ pushMessage: PushMessage,
+ userId: String,
+ pushCategory: PushCategory,
+ )
+
+ suspend fun sendCategoricalPushes(
+ pushMessage: PushMessage,
+ userIds: List<String>,
+ pushCategory: PushCategory,
+ )
+
+ suspend fun sendCategoricalTargetPushes(
+ userToPushMessage: Map<String, PushMessage>,
+ pushCategory: PushCategory,
+ )
}
@Service
class PushServiceImpl internal constructor(
private val deviceService: DeviceService,
private val pushClient: PushClient,
+ private val pushOptOutRepository: PushOptOutRepository,
) : PushService {
override suspend fun sendPush(
pushMessage: PushMessage,
@@ -60,4 +80,49 @@ class PushServiceImpl internal constructor(
deviceService.getUserDevices(userId).map { it.fcmRegistrationId to pushMessage }
}.map { (fcmRegistrationId, message) -> TargetedPushMessageWithToken(fcmRegistrationId, message) }
.let { pushClient.sendMessages(it) }
+
+ override suspend fun sendCategoricalPush(
+ pushMessage: PushMessage,
+ userId: String,
+ pushCategory: PushCategory,
+ ) {
+ if (!pushOptOutRepository.existsByUserIdAndPushCategory(userId, pushCategory)) {
+ sendPush(pushMessage, userId)
+ }
+ }
+
+ override suspend fun sendCategoricalPushes(
+ pushMessage: PushMessage,
+ userIds: List<String>,
+ pushCategory: PushCategory,
+ ) {
+ val filteredUserIds =
+ pushOptOutRepository
+ .findByUserIdInAndPushCategory(userIds, pushCategory)
+ .map { it.userId }
+ .toSet()
+ .let { optOutUserIds -> userIds.filterNot { it in optOutUserIds } }
+
+ if (filteredUserIds.isNotEmpty()) {
+ sendPushes(pushMessage, filteredUserIds)
+ }
+ }
+
+ override suspend fun sendCategoricalTargetPushes(
+ userToPushMessage: Map<String, PushMessage>,
+ pushCategory: PushCategory,
+ ) {
+ val userIds = userToPushMessage.keys.toList()
+
+ val filteredUserToPushMessage =
+ pushOptOutRepository
+ .findByUserIdInAndPushCategory(userIds, pushCategory)
+ .map { it.userId }
+ .toSet()
+ .let { optOutUserIds -> userToPushMessage.filterKeys { it !in optOutUserIds } }
+
+ if (filteredUserToPushMessage.isNotEmpty()) {
+ sendTargetPushes(filteredUserToPushMessage)
+ }
+ }
}
From 8c67b4bda4798b8a9532d24df0fca534e830070b Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Sun, 9 Feb 2025 15:08:51 +0900
Subject: [PATCH 3/6] =?UTF-8?q?SugangSnuNotificationService=20/=20PushWith?=
=?UTF-8?q?NotificationService=EC=97=90=20=ED=91=B8=EC=8B=9C=20=EC=B9=B4?=
=?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/service/SugangSnuNotificationService.kt | 3 ++-
core/src/main/kotlin/notification/data/PushCategory.kt | 8 ++++++++
.../main/kotlin/notification/service/PushService.kt | 10 +++++++++-
.../service/PushWithNotificationService.kt | 5 +++--
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
index 2b78d01b..69d735b2 100644
--- a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
+++ b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
@@ -5,6 +5,7 @@ import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.coursebook.data.Coursebook
import com.wafflestudio.snutt.notification.data.Notification
import com.wafflestudio.snutt.notification.data.NotificationType
+import com.wafflestudio.snutt.notification.data.PushCategory
import com.wafflestudio.snutt.notification.service.NotificationService
import com.wafflestudio.snutt.notification.service.PushService
import com.wafflestudio.snutt.notification.service.PushWithNotificationService
@@ -74,7 +75,7 @@ class SugangSnuNotificationServiceImpl(
urlScheme = DeeplinkType.NOTIFICATIONS,
)
}
- pushService.sendTargetPushes(userIdToMessage)
+ pushService.sendCategoricalTargetPushes(userIdToMessage, PushCategory.LECTURE_UPDATE)
}
override suspend fun notifyCoursebookUpdate(coursebook: Coursebook) {
diff --git a/core/src/main/kotlin/notification/data/PushCategory.kt b/core/src/main/kotlin/notification/data/PushCategory.kt
index 6f1ff1e2..abb2c537 100644
--- a/core/src/main/kotlin/notification/data/PushCategory.kt
+++ b/core/src/main/kotlin/notification/data/PushCategory.kt
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component
enum class PushCategory(
@JsonValue val value: Int,
) {
+ NORMAL(0),
LECTURE_UPDATE(1),
VACANCY_NOTIFICATION(2),
;
@@ -31,3 +32,10 @@ class PushCategoryReadConverter : Converter<Int, PushCategory> {
class PushCategoryWriteConverter : Converter<PushCategory, Int> {
override fun convert(source: PushCategory): Int = source.value
}
+
+fun PushCategory(notificationType: NotificationType) =
+ when (notificationType) {
+ NotificationType.LECTURE_UPDATE -> PushCategory.LECTURE_UPDATE
+ NotificationType.LECTURE_VACANCY -> PushCategory.VACANCY_NOTIFICATION
+ else -> PushCategory.NORMAL
+ }
diff --git a/core/src/main/kotlin/notification/service/PushService.kt b/core/src/main/kotlin/notification/service/PushService.kt
index 8dccf9d0..f14d8632 100644
--- a/core/src/main/kotlin/notification/service/PushService.kt
+++ b/core/src/main/kotlin/notification/service/PushService.kt
@@ -86,7 +86,7 @@ class PushServiceImpl internal constructor(
userId: String,
pushCategory: PushCategory,
) {
- if (!pushOptOutRepository.existsByUserIdAndPushCategory(userId, pushCategory)) {
+ if (pushCategory == PushCategory.NORMAL || !pushOptOutRepository.existsByUserIdAndPushCategory(userId, pushCategory)) {
sendPush(pushMessage, userId)
}
}
@@ -96,6 +96,10 @@ class PushServiceImpl internal constructor(
userIds: List<String>,
pushCategory: PushCategory,
) {
+ if (pushCategory == PushCategory.NORMAL) {
+ sendPushes(pushMessage, userIds)
+ }
+
val filteredUserIds =
pushOptOutRepository
.findByUserIdInAndPushCategory(userIds, pushCategory)
@@ -112,6 +116,10 @@ class PushServiceImpl internal constructor(
userToPushMessage: Map<String, PushMessage>,
pushCategory: PushCategory,
) {
+ if (pushCategory == PushCategory.NORMAL) {
+ sendTargetPushes(userToPushMessage)
+ }
+
val userIds = userToPushMessage.keys.toList()
val filteredUserToPushMessage =
diff --git a/core/src/main/kotlin/notification/service/PushWithNotificationService.kt b/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
index 0da50ba8..1d25c8a4 100644
--- a/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
+++ b/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
@@ -2,6 +2,7 @@ package com.wafflestudio.snutt.notification.service
import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.notification.data.NotificationType
+import com.wafflestudio.snutt.notification.data.PushCategory
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import org.springframework.stereotype.Service
@@ -46,7 +47,7 @@ class PushWithNotificationServiceImpl internal constructor(
): Unit =
coroutineScope {
launch { notificationService.sendNotification(pushMessage.toNotification(notificationType, userId)) }
- launch { pushService.sendPush(pushMessage, userId) }
+ launch { pushService.sendCategoricalPush(pushMessage, userId, PushCategory(notificationType)) }
}
override suspend fun sendPushesAndNotifications(
@@ -65,7 +66,7 @@ class PushWithNotificationServiceImpl internal constructor(
},
)
}
- launch { pushService.sendPushes(pushMessage, userIds) }
+ launch { pushService.sendCategoricalPushes(pushMessage, userIds, PushCategory(notificationType)) }
}
override suspend fun sendGlobalPushAndNotification(
From 2cf26d5381918c91ce91713091b4658ec0cc00d8 Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Sun, 9 Feb 2025 23:27:33 +0900
Subject: [PATCH 4/6] Add PushPreference Service/Handler
---
.../kotlin/handler/PushPreferenceHandler.kt | 47 +++++++++++++
api/src/main/kotlin/router/MainRouter.kt | 14 ++++
.../kotlin/notification/data/PushOptOut.kt | 2 +-
.../kotlin/notification/dto/PushPreference.kt | 8 +++
.../dto/PushPreferenceResponse.kt | 12 ++++
.../repository/PushOptOutRepository.kt | 2 +
.../service/PushPreferenceService.kt | 67 +++++++++++++++++++
7 files changed, 151 insertions(+), 1 deletion(-)
create mode 100644 api/src/main/kotlin/handler/PushPreferenceHandler.kt
create mode 100644 core/src/main/kotlin/notification/dto/PushPreference.kt
create mode 100644 core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
create mode 100644 core/src/main/kotlin/notification/service/PushPreferenceService.kt
diff --git a/api/src/main/kotlin/handler/PushPreferenceHandler.kt b/api/src/main/kotlin/handler/PushPreferenceHandler.kt
new file mode 100644
index 00000000..c73426e7
--- /dev/null
+++ b/api/src/main/kotlin/handler/PushPreferenceHandler.kt
@@ -0,0 +1,47 @@
+package com.wafflestudio.snutt.handler
+
+import com.wafflestudio.snutt.middleware.SnuttRestApiDefaultMiddleware
+import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.dto.PushPreferenceResponse
+import com.wafflestudio.snutt.notification.service.PushPreferenceService
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.server.ServerRequest
+
+@Component
+class PushPreferenceHandler(
+ private val pushPreferenceService: PushPreferenceService,
+ snuttRestApiDefaultMiddleware: SnuttRestApiDefaultMiddleware,
+) : ServiceHandler(
+ handlerMiddleware = snuttRestApiDefaultMiddleware,
+ ) {
+ suspend fun getPushPreferences(req: ServerRequest) =
+ handle(req) {
+ val user = req.getContext().user!!
+ val pushPreferences = pushPreferenceService.getPushPreferences(user)
+ pushPreferences.map { PushPreferenceResponse(it) }
+ }
+
+ suspend fun enableLectureUpdate(req: ServerRequest) =
+ handle(req) {
+ val user = req.getContext().user!!
+ pushPreferenceService.enablePush(user, PushCategory.LECTURE_UPDATE)
+ }
+
+ suspend fun disableLectureUpdate(req: ServerRequest) =
+ handle(req) {
+ val user = req.getContext().user!!
+ pushPreferenceService.disablePush(user, PushCategory.LECTURE_UPDATE)
+ }
+
+ suspend fun enableVacancyNotification(req: ServerRequest) =
+ handle(req) {
+ val user = req.getContext().user!!
+ pushPreferenceService.enablePush(user, PushCategory.VACANCY_NOTIFICATION)
+ }
+
+ suspend fun disableVacancyNotification(req: ServerRequest) =
+ handle(req) {
+ val user = req.getContext().user!!
+ pushPreferenceService.disablePush(user, PushCategory.VACANCY_NOTIFICATION)
+ }
+}
diff --git a/api/src/main/kotlin/router/MainRouter.kt b/api/src/main/kotlin/router/MainRouter.kt
index 463de490..00b51023 100644
--- a/api/src/main/kotlin/router/MainRouter.kt
+++ b/api/src/main/kotlin/router/MainRouter.kt
@@ -15,6 +15,7 @@ import com.wafflestudio.snutt.handler.FriendTableHandler
import com.wafflestudio.snutt.handler.LectureSearchHandler
import com.wafflestudio.snutt.handler.NotificationHandler
import com.wafflestudio.snutt.handler.PopupHandler
+import com.wafflestudio.snutt.handler.PushPreferenceHandler
import com.wafflestudio.snutt.handler.StaticPageHandler
import com.wafflestudio.snutt.handler.TagHandler
import com.wafflestudio.snutt.handler.TimetableHandler
@@ -70,6 +71,7 @@ class MainRouter(
private val feedbackHandler: FeedbackHandler,
private val staticPageHandler: StaticPageHandler,
private val evServiceHandler: EvServiceHandler,
+ private val pushPreferenceHandler: PushPreferenceHandler,
) {
@Bean
fun healthCheck() =
@@ -343,4 +345,16 @@ class MainRouter(
GET("/privacy_policy").invoke { staticPageHandler.privacyPolicy() }
GET("/terms_of_service").invoke { staticPageHandler.termsOfService() }
}
+
+ @Bean
+ fun pushPreferenceRouter() =
+ v1CoRouter {
+ "/push/preferences".nest {
+ GET("", pushPreferenceHandler::getPushPreferences)
+ POST("lecture-update", pushPreferenceHandler::enableLectureUpdate)
+ DELETE("lecture-update", pushPreferenceHandler::disableLectureUpdate)
+ POST("vacancy-notification", pushPreferenceHandler::enableVacancyNotification)
+ DELETE("vacancy-notification", pushPreferenceHandler::disableVacancyNotification)
+ }
+ }
}
diff --git a/core/src/main/kotlin/notification/data/PushOptOut.kt b/core/src/main/kotlin/notification/data/PushOptOut.kt
index 30ef5888..c6c7c1b1 100644
--- a/core/src/main/kotlin/notification/data/PushOptOut.kt
+++ b/core/src/main/kotlin/notification/data/PushOptOut.kt
@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.mapping.Field
import org.springframework.data.mongodb.core.mapping.FieldType
@Document(collection = "push_opt_out")
-@CompoundIndex(def = "{ 'user_id': 1, 'push_category': 1 }")
+@CompoundIndex(def = "{ 'user_id': 1, 'push_category': 1 }", unique = true)
data class PushOptOut(
@Id
val id: String? = null,
diff --git a/core/src/main/kotlin/notification/dto/PushPreference.kt b/core/src/main/kotlin/notification/dto/PushPreference.kt
new file mode 100644
index 00000000..b3d9ff95
--- /dev/null
+++ b/core/src/main/kotlin/notification/dto/PushPreference.kt
@@ -0,0 +1,8 @@
+package com.wafflestudio.snutt.notification.dto
+
+import com.wafflestudio.snutt.notification.data.PushCategory
+
+data class PushPreference(
+ val pushCategory: PushCategory,
+ val enabled: Boolean,
+)
diff --git a/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt b/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
new file mode 100644
index 00000000..66b8df99
--- /dev/null
+++ b/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
@@ -0,0 +1,12 @@
+package com.wafflestudio.snutt.notification.dto
+
+data class PushPreferenceResponse(
+ val pushCategoryName: String,
+ val enabled: Boolean,
+)
+
+fun PushPreferenceResponse(pushPreference: PushPreference) =
+ PushPreferenceResponse(
+ pushCategoryName = pushPreference.pushCategory.name,
+ enabled = pushPreference.enabled,
+ )
diff --git a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
index 88972f54..c63be8a4 100644
--- a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
+++ b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
@@ -19,4 +19,6 @@ interface PushOptOutRepository : CoroutineCrudRepository<PushOptOut, String> {
userIds: List<String>,
pushCategory: PushCategory,
): List<PushOptOut>
+
+ suspend fun findByUserId(userId: String): List<PushOptOut>
}
diff --git a/core/src/main/kotlin/notification/service/PushPreferenceService.kt b/core/src/main/kotlin/notification/service/PushPreferenceService.kt
new file mode 100644
index 00000000..aedefc4a
--- /dev/null
+++ b/core/src/main/kotlin/notification/service/PushPreferenceService.kt
@@ -0,0 +1,67 @@
+package com.wafflestudio.snutt.notification.service
+
+import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.data.PushOptOut
+import com.wafflestudio.snutt.notification.dto.PushPreference
+import com.wafflestudio.snutt.notification.repository.PushOptOutRepository
+import com.wafflestudio.snutt.users.data.User
+import org.springframework.stereotype.Service
+
+interface PushPreferenceService {
+ suspend fun enablePush(
+ user: User,
+ pushCategory: PushCategory,
+ )
+
+ suspend fun disablePush(
+ user: User,
+ pushCategory: PushCategory,
+ )
+
+ suspend fun getPushPreferences(user: User): List<PushPreference>
+}
+
+@Service
+class PushPreferenceServiceImpl(
+ private val pushOptOutRepository: PushOptOutRepository,
+) : PushPreferenceService {
+ override suspend fun enablePush(
+ user: User,
+ pushCategory: PushCategory,
+ ) {
+ pushOptOutRepository.save(
+ PushOptOut(
+ userId = user.id!!,
+ pushCategory = pushCategory,
+ ),
+ )
+ }
+
+ override suspend fun disablePush(
+ user: User,
+ pushCategory: PushCategory,
+ ) {
+ pushOptOutRepository.deleteByUserIdAndPushCategory(
+ userId = user.id!!,
+ pushCategory = pushCategory,
+ )
+ }
+
+ override suspend fun getPushPreferences(user: User): List<PushPreference> {
+ val allPushCategories = PushCategory.entries.filterNot { it == PushCategory.NORMAL }
+ val disabledPushCategories = pushOptOutRepository.findByUserId(user.id!!).map { it.pushCategory }.toSet()
+ return allPushCategories.map {
+ if (it in disabledPushCategories) {
+ return@map PushPreference(
+ pushCategory = it,
+ enabled = false,
+ )
+ } else {
+ return@map PushPreference(
+ pushCategory = it,
+ enabled = true,
+ )
+ }
+ }
+ }
+}
From 2e3bb3abb6bf0d440d1b58fe1b5a2ab21d5fae1c Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Wed, 19 Mar 2025 21:46:56 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=EB=AA=A8?=
=?UTF-8?q?=EB=8D=B8=20=EB=B3=80=EA=B2=BD=20&=20PushPreferenceService=20?=
=?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../kotlin/handler/PushPreferenceHandler.kt | 30 ++----
api/src/main/kotlin/router/MainRouter.kt | 5 +-
.../service/SugangSnuNotificationService.kt | 4 +-
.../kotlin/notification/data/PushCategory.kt | 41 -------
.../data/{PushOptOut.kt => PushPreference.kt} | 14 +--
.../notification/data/PushPreferenceItem.kt | 6 ++
.../notification/data/PushPreferenceType.kt | 14 +++
.../kotlin/notification/dto/PushPreference.kt | 8 --
.../notification/dto/PushPreferenceDto.kt | 10 ++
.../dto/PushPreferenceResponse.kt | 12 ---
.../repository/PushOptOutRepository.kt | 24 -----
.../repository/PushPreferenceRepository.kt | 10 ++
.../service/PushPreferenceService.kt | 102 ++++++++++--------
.../notification/service/PushService.kt | 57 ++++------
.../service/PushWithNotificationService.kt | 6 +-
15 files changed, 137 insertions(+), 206 deletions(-)
delete mode 100644 core/src/main/kotlin/notification/data/PushCategory.kt
rename core/src/main/kotlin/notification/data/{PushOptOut.kt => PushPreference.kt} (53%)
create mode 100644 core/src/main/kotlin/notification/data/PushPreferenceItem.kt
create mode 100644 core/src/main/kotlin/notification/data/PushPreferenceType.kt
delete mode 100644 core/src/main/kotlin/notification/dto/PushPreference.kt
create mode 100644 core/src/main/kotlin/notification/dto/PushPreferenceDto.kt
delete mode 100644 core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
delete mode 100644 core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
create mode 100644 core/src/main/kotlin/notification/repository/PushPreferenceRepository.kt
diff --git a/api/src/main/kotlin/handler/PushPreferenceHandler.kt b/api/src/main/kotlin/handler/PushPreferenceHandler.kt
index c73426e7..8fc7bedd 100644
--- a/api/src/main/kotlin/handler/PushPreferenceHandler.kt
+++ b/api/src/main/kotlin/handler/PushPreferenceHandler.kt
@@ -1,11 +1,11 @@
package com.wafflestudio.snutt.handler
import com.wafflestudio.snutt.middleware.SnuttRestApiDefaultMiddleware
-import com.wafflestudio.snutt.notification.data.PushCategory
-import com.wafflestudio.snutt.notification.dto.PushPreferenceResponse
+import com.wafflestudio.snutt.notification.dto.PushPreferenceDto
import com.wafflestudio.snutt.notification.service.PushPreferenceService
import org.springframework.stereotype.Component
import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.awaitBody
@Component
class PushPreferenceHandler(
@@ -17,31 +17,13 @@ class PushPreferenceHandler(
suspend fun getPushPreferences(req: ServerRequest) =
handle(req) {
val user = req.getContext().user!!
- val pushPreferences = pushPreferenceService.getPushPreferences(user)
- pushPreferences.map { PushPreferenceResponse(it) }
+ pushPreferenceService.getPushPreferenceDto(user)
}
- suspend fun enableLectureUpdate(req: ServerRequest) =
+ suspend fun savePushPreferences(req: ServerRequest) =
handle(req) {
val user = req.getContext().user!!
- pushPreferenceService.enablePush(user, PushCategory.LECTURE_UPDATE)
- }
-
- suspend fun disableLectureUpdate(req: ServerRequest) =
- handle(req) {
- val user = req.getContext().user!!
- pushPreferenceService.disablePush(user, PushCategory.LECTURE_UPDATE)
- }
-
- suspend fun enableVacancyNotification(req: ServerRequest) =
- handle(req) {
- val user = req.getContext().user!!
- pushPreferenceService.enablePush(user, PushCategory.VACANCY_NOTIFICATION)
- }
-
- suspend fun disableVacancyNotification(req: ServerRequest) =
- handle(req) {
- val user = req.getContext().user!!
- pushPreferenceService.disablePush(user, PushCategory.VACANCY_NOTIFICATION)
+ val pushPreferenceDto = req.awaitBody<PushPreferenceDto>()
+ pushPreferenceService.savePushPreference(user, pushPreferenceDto)
}
}
diff --git a/api/src/main/kotlin/router/MainRouter.kt b/api/src/main/kotlin/router/MainRouter.kt
index 00b51023..64215da8 100644
--- a/api/src/main/kotlin/router/MainRouter.kt
+++ b/api/src/main/kotlin/router/MainRouter.kt
@@ -351,10 +351,7 @@ class MainRouter(
v1CoRouter {
"/push/preferences".nest {
GET("", pushPreferenceHandler::getPushPreferences)
- POST("lecture-update", pushPreferenceHandler::enableLectureUpdate)
- DELETE("lecture-update", pushPreferenceHandler::disableLectureUpdate)
- POST("vacancy-notification", pushPreferenceHandler::enableVacancyNotification)
- DELETE("vacancy-notification", pushPreferenceHandler::disableVacancyNotification)
+ POST("", pushPreferenceHandler::savePushPreferences)
}
}
}
diff --git a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
index 69d735b2..46f408e1 100644
--- a/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
+++ b/batch/src/main/kotlin/sugangsnu/common/service/SugangSnuNotificationService.kt
@@ -5,7 +5,7 @@ import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.coursebook.data.Coursebook
import com.wafflestudio.snutt.notification.data.Notification
import com.wafflestudio.snutt.notification.data.NotificationType
-import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.data.PushPreferenceType
import com.wafflestudio.snutt.notification.service.NotificationService
import com.wafflestudio.snutt.notification.service.PushService
import com.wafflestudio.snutt.notification.service.PushWithNotificationService
@@ -75,7 +75,7 @@ class SugangSnuNotificationServiceImpl(
urlScheme = DeeplinkType.NOTIFICATIONS,
)
}
- pushService.sendCategoricalTargetPushes(userIdToMessage, PushCategory.LECTURE_UPDATE)
+ pushService.sendTargetPushes(userIdToMessage, PushPreferenceType.LECTURE_UPDATE)
}
override suspend fun notifyCoursebookUpdate(coursebook: Coursebook) {
diff --git a/core/src/main/kotlin/notification/data/PushCategory.kt b/core/src/main/kotlin/notification/data/PushCategory.kt
deleted file mode 100644
index abb2c537..00000000
--- a/core/src/main/kotlin/notification/data/PushCategory.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.wafflestudio.snutt.notification.data
-
-import com.fasterxml.jackson.annotation.JsonValue
-import org.springframework.core.convert.converter.Converter
-import org.springframework.data.convert.ReadingConverter
-import org.springframework.data.convert.WritingConverter
-import org.springframework.stereotype.Component
-
-enum class PushCategory(
- @JsonValue val value: Int,
-) {
- NORMAL(0),
- LECTURE_UPDATE(1),
- VACANCY_NOTIFICATION(2),
- ;
-
- companion object {
- private val valueMap = PushCategory.entries.associateBy { e -> e.value }
-
- fun getOfValue(value: Int): PushCategory? = valueMap[value]
- }
-}
-
-@ReadingConverter
-@Component
-class PushCategoryReadConverter : Converter<Int, PushCategory> {
- override fun convert(source: Int): PushCategory = PushCategory.getOfValue(source)!!
-}
-
-@WritingConverter
-@Component
-class PushCategoryWriteConverter : Converter<PushCategory, Int> {
- override fun convert(source: PushCategory): Int = source.value
-}
-
-fun PushCategory(notificationType: NotificationType) =
- when (notificationType) {
- NotificationType.LECTURE_UPDATE -> PushCategory.LECTURE_UPDATE
- NotificationType.LECTURE_VACANCY -> PushCategory.VACANCY_NOTIFICATION
- else -> PushCategory.NORMAL
- }
diff --git a/core/src/main/kotlin/notification/data/PushOptOut.kt b/core/src/main/kotlin/notification/data/PushPreference.kt
similarity index 53%
rename from core/src/main/kotlin/notification/data/PushOptOut.kt
rename to core/src/main/kotlin/notification/data/PushPreference.kt
index c6c7c1b1..5699fc9a 100644
--- a/core/src/main/kotlin/notification/data/PushOptOut.kt
+++ b/core/src/main/kotlin/notification/data/PushPreference.kt
@@ -1,21 +1,17 @@
package com.wafflestudio.snutt.notification.data
import org.springframework.data.annotation.Id
-import org.springframework.data.mongodb.core.index.CompoundIndex
import org.springframework.data.mongodb.core.index.Indexed
import org.springframework.data.mongodb.core.mapping.Document
import org.springframework.data.mongodb.core.mapping.Field
import org.springframework.data.mongodb.core.mapping.FieldType
-@Document(collection = "push_opt_out")
-@CompoundIndex(def = "{ 'user_id': 1, 'push_category': 1 }", unique = true)
-data class PushOptOut(
+@Document(collection = "pushPreference")
+data class PushPreference(
@Id
val id: String? = null,
- @Indexed
- @Field("user_id", targetType = FieldType.OBJECT_ID)
+ @Indexed(unique = true)
+ @Field(targetType = FieldType.OBJECT_ID)
val userId: String,
- @Field("push_category")
- @Indexed
- val pushCategory: PushCategory,
+ val pushPreferences: List<PushPreferenceItem>,
)
diff --git a/core/src/main/kotlin/notification/data/PushPreferenceItem.kt b/core/src/main/kotlin/notification/data/PushPreferenceItem.kt
new file mode 100644
index 00000000..df835e57
--- /dev/null
+++ b/core/src/main/kotlin/notification/data/PushPreferenceItem.kt
@@ -0,0 +1,6 @@
+package com.wafflestudio.snutt.notification.data
+
+data class PushPreferenceItem(
+ val type: PushPreferenceType,
+ val isEnabled: Boolean,
+)
diff --git a/core/src/main/kotlin/notification/data/PushPreferenceType.kt b/core/src/main/kotlin/notification/data/PushPreferenceType.kt
new file mode 100644
index 00000000..9f8814ea
--- /dev/null
+++ b/core/src/main/kotlin/notification/data/PushPreferenceType.kt
@@ -0,0 +1,14 @@
+package com.wafflestudio.snutt.notification.data
+
+enum class PushPreferenceType {
+ NORMAL,
+ LECTURE_UPDATE,
+ VACANCY_NOTIFICATION,
+}
+
+fun PushPreferenceType(notificationType: NotificationType) =
+ when (notificationType) {
+ NotificationType.LECTURE_UPDATE -> PushPreferenceType.LECTURE_UPDATE
+ NotificationType.LECTURE_VACANCY -> PushPreferenceType.VACANCY_NOTIFICATION
+ else -> PushPreferenceType.NORMAL
+ }
diff --git a/core/src/main/kotlin/notification/dto/PushPreference.kt b/core/src/main/kotlin/notification/dto/PushPreference.kt
deleted file mode 100644
index b3d9ff95..00000000
--- a/core/src/main/kotlin/notification/dto/PushPreference.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.wafflestudio.snutt.notification.dto
-
-import com.wafflestudio.snutt.notification.data.PushCategory
-
-data class PushPreference(
- val pushCategory: PushCategory,
- val enabled: Boolean,
-)
diff --git a/core/src/main/kotlin/notification/dto/PushPreferenceDto.kt b/core/src/main/kotlin/notification/dto/PushPreferenceDto.kt
new file mode 100644
index 00000000..60cd9375
--- /dev/null
+++ b/core/src/main/kotlin/notification/dto/PushPreferenceDto.kt
@@ -0,0 +1,10 @@
+package com.wafflestudio.snutt.notification.dto
+
+import com.wafflestudio.snutt.notification.data.PushPreference
+import com.wafflestudio.snutt.notification.data.PushPreferenceItem
+
+data class PushPreferenceDto(
+ val pushPreferences: List<PushPreferenceItem>,
+)
+
+fun PushPreferenceDto(pushPreference: PushPreference) = PushPreferenceDto(pushPreference.pushPreferences.toList())
diff --git a/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt b/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
deleted file mode 100644
index 66b8df99..00000000
--- a/core/src/main/kotlin/notification/dto/PushPreferenceResponse.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.wafflestudio.snutt.notification.dto
-
-data class PushPreferenceResponse(
- val pushCategoryName: String,
- val enabled: Boolean,
-)
-
-fun PushPreferenceResponse(pushPreference: PushPreference) =
- PushPreferenceResponse(
- pushCategoryName = pushPreference.pushCategory.name,
- enabled = pushPreference.enabled,
- )
diff --git a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt b/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
deleted file mode 100644
index c63be8a4..00000000
--- a/core/src/main/kotlin/notification/repository/PushOptOutRepository.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.wafflestudio.snutt.notification.repository
-
-import com.wafflestudio.snutt.notification.data.PushCategory
-import com.wafflestudio.snutt.notification.data.PushOptOut
-import org.springframework.data.repository.kotlin.CoroutineCrudRepository
-
-interface PushOptOutRepository : CoroutineCrudRepository<PushOptOut, String> {
- suspend fun existsByUserIdAndPushCategory(
- userId: String,
- pushCategory: PushCategory,
- ): Boolean
-
- suspend fun deleteByUserIdAndPushCategory(
- userId: String,
- pushCategory: PushCategory,
- ): Long
-
- suspend fun findByUserIdInAndPushCategory(
- userIds: List<String>,
- pushCategory: PushCategory,
- ): List<PushOptOut>
-
- suspend fun findByUserId(userId: String): List<PushOptOut>
-}
diff --git a/core/src/main/kotlin/notification/repository/PushPreferenceRepository.kt b/core/src/main/kotlin/notification/repository/PushPreferenceRepository.kt
new file mode 100644
index 00000000..213e39b0
--- /dev/null
+++ b/core/src/main/kotlin/notification/repository/PushPreferenceRepository.kt
@@ -0,0 +1,10 @@
+package com.wafflestudio.snutt.notification.repository
+
+import com.wafflestudio.snutt.notification.data.PushPreference
+import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+
+interface PushPreferenceRepository : CoroutineCrudRepository<PushPreference, String> {
+ suspend fun findByUserId(userId: String): PushPreference?
+
+ suspend fun findByUserIdIn(userIds: List<String>): List<PushPreference>
+}
diff --git a/core/src/main/kotlin/notification/service/PushPreferenceService.kt b/core/src/main/kotlin/notification/service/PushPreferenceService.kt
index aedefc4a..5a8f93e1 100644
--- a/core/src/main/kotlin/notification/service/PushPreferenceService.kt
+++ b/core/src/main/kotlin/notification/service/PushPreferenceService.kt
@@ -1,67 +1,85 @@
package com.wafflestudio.snutt.notification.service
-import com.wafflestudio.snutt.notification.data.PushCategory
-import com.wafflestudio.snutt.notification.data.PushOptOut
-import com.wafflestudio.snutt.notification.dto.PushPreference
-import com.wafflestudio.snutt.notification.repository.PushOptOutRepository
+import com.wafflestudio.snutt.notification.data.PushPreference
+import com.wafflestudio.snutt.notification.data.PushPreferenceType
+import com.wafflestudio.snutt.notification.dto.PushPreferenceDto
+import com.wafflestudio.snutt.notification.repository.PushPreferenceRepository
import com.wafflestudio.snutt.users.data.User
import org.springframework.stereotype.Service
interface PushPreferenceService {
- suspend fun enablePush(
+ suspend fun savePushPreference(
user: User,
- pushCategory: PushCategory,
+ pushPreferenceDto: PushPreferenceDto,
)
- suspend fun disablePush(
- user: User,
- pushCategory: PushCategory,
- )
+ suspend fun getPushPreferenceDto(user: User): PushPreferenceDto
+
+ suspend fun isPushPreferenceEnabled(
+ userId: String,
+ pushPreferenceType: PushPreferenceType,
+ ): Boolean
- suspend fun getPushPreferences(user: User): List<PushPreference>
+ suspend fun filterUsersByPushPreference(
+ userIds: List<String>,
+ pushPreferenceType: PushPreferenceType,
+ ): List<String>
}
@Service
class PushPreferenceServiceImpl(
- private val pushOptOutRepository: PushOptOutRepository,
+ private val pushPreferenceRepository: PushPreferenceRepository,
) : PushPreferenceService {
- override suspend fun enablePush(
+ override suspend fun savePushPreference(
user: User,
- pushCategory: PushCategory,
+ pushPreferenceDto: PushPreferenceDto,
) {
- pushOptOutRepository.save(
- PushOptOut(
- userId = user.id!!,
- pushCategory = pushCategory,
- ),
+ pushPreferenceRepository.save(
+ pushPreferenceRepository.findByUserId(user.id!!)
+ ?.copy(pushPreferences = pushPreferenceDto.pushPreferences)
+ ?: PushPreference(
+ userId = user.id,
+ pushPreferences = pushPreferenceDto.pushPreferences,
+ ),
)
}
- override suspend fun disablePush(
- user: User,
- pushCategory: PushCategory,
- ) {
- pushOptOutRepository.deleteByUserIdAndPushCategory(
- userId = user.id!!,
- pushCategory = pushCategory,
- )
+ override suspend fun getPushPreferenceDto(user: User): PushPreferenceDto =
+ pushPreferenceRepository.findByUserId(user.id!!)
+ ?.let { PushPreferenceDto(it) }
+ ?: PushPreferenceDto(
+ pushPreferences = emptyList(),
+ )
+
+ override suspend fun isPushPreferenceEnabled(
+ userId: String,
+ pushPreferenceType: PushPreferenceType,
+ ): Boolean {
+ if (pushPreferenceType == PushPreferenceType.NORMAL) {
+ return true
+ }
+
+ return pushPreferenceRepository
+ .findByUserId(userId)
+ ?.pushPreferences
+ ?.any { it.type == pushPreferenceType && it.isEnabled }
+ ?: false
}
- override suspend fun getPushPreferences(user: User): List<PushPreference> {
- val allPushCategories = PushCategory.entries.filterNot { it == PushCategory.NORMAL }
- val disabledPushCategories = pushOptOutRepository.findByUserId(user.id!!).map { it.pushCategory }.toSet()
- return allPushCategories.map {
- if (it in disabledPushCategories) {
- return@map PushPreference(
- pushCategory = it,
- enabled = false,
- )
- } else {
- return@map PushPreference(
- pushCategory = it,
- enabled = true,
- )
- }
+ override suspend fun filterUsersByPushPreference(
+ userIds: List<String>,
+ pushPreferenceType: PushPreferenceType,
+ ): List<String> {
+ if (pushPreferenceType == PushPreferenceType.NORMAL) {
+ return userIds
}
+
+ return pushPreferenceRepository
+ .findByUserIdIn(userIds)
+ .filter { pushPreference ->
+ pushPreference.pushPreferences
+ .any { it.type == pushPreferenceType && it.isEnabled }
+ }
+ .map { it.userId }
}
}
diff --git a/core/src/main/kotlin/notification/service/PushService.kt b/core/src/main/kotlin/notification/service/PushService.kt
index f14d8632..655bb184 100644
--- a/core/src/main/kotlin/notification/service/PushService.kt
+++ b/core/src/main/kotlin/notification/service/PushService.kt
@@ -3,8 +3,7 @@ package com.wafflestudio.snutt.notification.service
import com.wafflestudio.snutt.common.push.PushClient
import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.common.push.dto.TargetedPushMessageWithToken
-import com.wafflestudio.snutt.notification.data.PushCategory
-import com.wafflestudio.snutt.notification.repository.PushOptOutRepository
+import com.wafflestudio.snutt.notification.data.PushPreferenceType
import org.springframework.stereotype.Service
/**
@@ -25,21 +24,21 @@ interface PushService {
suspend fun sendTargetPushes(userToPushMessage: Map<String, PushMessage>)
- suspend fun sendCategoricalPush(
+ suspend fun sendPush(
pushMessage: PushMessage,
userId: String,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
)
- suspend fun sendCategoricalPushes(
+ suspend fun sendPushes(
pushMessage: PushMessage,
userIds: List<String>,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
)
- suspend fun sendCategoricalTargetPushes(
+ suspend fun sendTargetPushes(
userToPushMessage: Map<String, PushMessage>,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
)
}
@@ -47,7 +46,7 @@ interface PushService {
class PushServiceImpl internal constructor(
private val deviceService: DeviceService,
private val pushClient: PushClient,
- private val pushOptOutRepository: PushOptOutRepository,
+ private val pushPreferenceService: PushPreferenceService,
) : PushService {
override suspend fun sendPush(
pushMessage: PushMessage,
@@ -81,53 +80,37 @@ class PushServiceImpl internal constructor(
}.map { (fcmRegistrationId, message) -> TargetedPushMessageWithToken(fcmRegistrationId, message) }
.let { pushClient.sendMessages(it) }
- override suspend fun sendCategoricalPush(
+ override suspend fun sendPush(
pushMessage: PushMessage,
userId: String,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
) {
- if (pushCategory == PushCategory.NORMAL || !pushOptOutRepository.existsByUserIdAndPushCategory(userId, pushCategory)) {
+ if (pushPreferenceService.isPushPreferenceEnabled(userId, pushPreferenceType)) {
sendPush(pushMessage, userId)
}
}
- override suspend fun sendCategoricalPushes(
+ override suspend fun sendPushes(
pushMessage: PushMessage,
userIds: List<String>,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
) {
- if (pushCategory == PushCategory.NORMAL) {
- sendPushes(pushMessage, userIds)
- }
-
- val filteredUserIds =
- pushOptOutRepository
- .findByUserIdInAndPushCategory(userIds, pushCategory)
- .map { it.userId }
- .toSet()
- .let { optOutUserIds -> userIds.filterNot { it in optOutUserIds } }
+ val filteredUserIds = pushPreferenceService.filterUsersByPushPreference(userIds, pushPreferenceType)
if (filteredUserIds.isNotEmpty()) {
sendPushes(pushMessage, filteredUserIds)
}
}
- override suspend fun sendCategoricalTargetPushes(
+ override suspend fun sendTargetPushes(
userToPushMessage: Map<String, PushMessage>,
- pushCategory: PushCategory,
+ pushPreferenceType: PushPreferenceType,
) {
- if (pushCategory == PushCategory.NORMAL) {
- sendTargetPushes(userToPushMessage)
- }
-
- val userIds = userToPushMessage.keys.toList()
-
val filteredUserToPushMessage =
- pushOptOutRepository
- .findByUserIdInAndPushCategory(userIds, pushCategory)
- .map { it.userId }
- .toSet()
- .let { optOutUserIds -> userToPushMessage.filterKeys { it !in optOutUserIds } }
+ userToPushMessage.filterKeys {
+ userId ->
+ pushPreferenceService.isPushPreferenceEnabled(userId, pushPreferenceType)
+ }
if (filteredUserToPushMessage.isNotEmpty()) {
sendTargetPushes(filteredUserToPushMessage)
diff --git a/core/src/main/kotlin/notification/service/PushWithNotificationService.kt b/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
index 1d25c8a4..1ccbcfea 100644
--- a/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
+++ b/core/src/main/kotlin/notification/service/PushWithNotificationService.kt
@@ -2,7 +2,7 @@ package com.wafflestudio.snutt.notification.service
import com.wafflestudio.snutt.common.push.dto.PushMessage
import com.wafflestudio.snutt.notification.data.NotificationType
-import com.wafflestudio.snutt.notification.data.PushCategory
+import com.wafflestudio.snutt.notification.data.PushPreferenceType
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import org.springframework.stereotype.Service
@@ -47,7 +47,7 @@ class PushWithNotificationServiceImpl internal constructor(
): Unit =
coroutineScope {
launch { notificationService.sendNotification(pushMessage.toNotification(notificationType, userId)) }
- launch { pushService.sendCategoricalPush(pushMessage, userId, PushCategory(notificationType)) }
+ launch { pushService.sendPush(pushMessage, userId, PushPreferenceType(notificationType)) }
}
override suspend fun sendPushesAndNotifications(
@@ -66,7 +66,7 @@ class PushWithNotificationServiceImpl internal constructor(
},
)
}
- launch { pushService.sendCategoricalPushes(pushMessage, userIds, PushCategory(notificationType)) }
+ launch { pushService.sendPushes(pushMessage, userIds, PushPreferenceType(notificationType)) }
}
override suspend fun sendGlobalPushAndNotification(
From 2e896ce5182b684ee8353a2a5af2bed37b7c2377 Mon Sep 17 00:00:00 2001
From: seonghaejo <jsh990324@snu.ac.kr>
Date: Wed, 19 Mar 2025 22:34:50 +0900
Subject: [PATCH 6/6] Add docs
---
api/src/main/kotlin/router/MainRouter.kt | 2 +
api/src/main/kotlin/router/docs/PushDocs.kt | 95 +++++++++++++++++++++
2 files changed, 97 insertions(+)
create mode 100644 api/src/main/kotlin/router/docs/PushDocs.kt
diff --git a/api/src/main/kotlin/router/MainRouter.kt b/api/src/main/kotlin/router/MainRouter.kt
index 64215da8..fe60d3a3 100644
--- a/api/src/main/kotlin/router/MainRouter.kt
+++ b/api/src/main/kotlin/router/MainRouter.kt
@@ -35,6 +35,7 @@ import com.wafflestudio.snutt.router.docs.FriendDocs
import com.wafflestudio.snutt.router.docs.LectureSearchDocs
import com.wafflestudio.snutt.router.docs.NotificationDocs
import com.wafflestudio.snutt.router.docs.PopupDocs
+import com.wafflestudio.snutt.router.docs.PushDocs
import com.wafflestudio.snutt.router.docs.TagDocs
import com.wafflestudio.snutt.router.docs.ThemeDocs
import com.wafflestudio.snutt.router.docs.TimetableDocs
@@ -347,6 +348,7 @@ class MainRouter(
}
@Bean
+ @PushDocs
fun pushPreferenceRouter() =
v1CoRouter {
"/push/preferences".nest {
diff --git a/api/src/main/kotlin/router/docs/PushDocs.kt b/api/src/main/kotlin/router/docs/PushDocs.kt
new file mode 100644
index 00000000..37bf28a0
--- /dev/null
+++ b/api/src/main/kotlin/router/docs/PushDocs.kt
@@ -0,0 +1,95 @@
+package com.wafflestudio.snutt.router.docs
+
+import com.wafflestudio.snutt.notification.dto.PushPreferenceDto
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.media.Content
+import io.swagger.v3.oas.annotations.media.ExampleObject
+import io.swagger.v3.oas.annotations.media.Schema
+import io.swagger.v3.oas.annotations.parameters.RequestBody
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import org.springdoc.core.annotations.RouterOperation
+import org.springdoc.core.annotations.RouterOperations
+import org.springframework.http.MediaType
+import org.springframework.web.bind.annotation.RequestMethod
+
+@RouterOperations(
+ RouterOperation(
+ path = "/v1/push/preferences",
+ method = [RequestMethod.GET],
+ produces = [MediaType.APPLICATION_JSON_VALUE],
+ operation =
+ Operation(
+ operationId = "getPushPreferences",
+ responses = [
+ ApiResponse(
+ responseCode = "200",
+ content = [
+ Content(
+ schema = Schema(implementation = PushPreferenceDto::class),
+ examples = [
+ ExampleObject(
+ value = """
+ {
+ "pushPreferences": [
+ {
+ "type": "LECTURE_UPDATE",
+ "isEnabled": "true"
+ },
+ {
+ "type": "VACANCY_NOTIFICATION",
+ "isEnabled": "true"
+ }
+ ]
+ }
+ """,
+ ),
+ ],
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ RouterOperation(
+ path = "/v1/push/preferences",
+ method = [RequestMethod.POST],
+ produces = [MediaType.APPLICATION_JSON_VALUE],
+ operation =
+ Operation(
+ operationId = "savePushPreferences",
+ requestBody =
+ RequestBody(
+ content = [
+ Content(
+ schema = Schema(implementation = PushPreferenceDto::class),
+ mediaType = MediaType.APPLICATION_JSON_VALUE,
+ examples = [
+ ExampleObject(
+ value = """
+ {
+ "pushPreferences": [
+ {
+ "type": "LECTURE_UPDATE",
+ "isEnabled": false
+ },
+ {
+ "type": "VACANCY_NOTIFICATION",
+ "isEnabled": false
+ }
+ ]
+ }
+ """,
+ ),
+ ],
+ ),
+ ],
+ ),
+ responses = [
+ ApiResponse(
+ responseCode = "200",
+ ),
+ ],
+ ),
+ ),
+)
+annotation class PushDocs()