feat: 완결 및 휴재 알림 구현

app/src/main/AndroidManifest.xml

@@ -156,6 +156,10 @@
             android:name=".ui.notificationSetting.NotificationSettingActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.novelNotification.NovelNotificationListActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.expandedFeedImage.ExpandedFeedImageActivity"
             android:exported="false"

app/src/main/java/com/into/websoso/core/common/util/message/PushMessage.kt

@@ -0,0 +1,36 @@
+package com.into.websoso.core.common.util.message
+
+data class PushMessage(
+    val title: String?,
+    val body: String?,
+    val feedId: Long?,
+    val novelId: Long?,
+    val notificationId: Long,
+) {
+    val destination: PushDestination
+        get() = when {
+            feedId != null -> PushDestination.FEED
+            novelId != null -> PushDestination.NOVEL
+            else -> PushDestination.NOTIFICATION_DETAIL
+        }
+
+    companion object {
+        fun from(data: Map<String, String>): PushMessage? {
+            val notificationId = data["notificationId"]?.toLongOrNull() ?: return null
+
+            return PushMessage(
+                title = data["title"],
+                body = data["body"],
+                feedId = data["feedId"]?.toLongOrNull(),
+                novelId = data["novelId"]?.toLongOrNull(),
+                notificationId = notificationId,
+            )
+        }
+    }
+}
+
+enum class PushDestination {
+    FEED,
+    NOVEL,
+    NOTIFICATION_DETAIL,
+}

app/src/main/java/com/into/websoso/core/common/util/message/WSSFirebaseMessagingService.kt

@@ -9,10 +9,14 @@ import androidx.core.app.NotificationCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.into.websoso.core.resource.R.mipmap.ic_wss_logo
+import com.into.websoso.core.resource.R.string.app_name
+import com.into.websoso.core.resource.R.string.push_notification_channel_description
+import com.into.websoso.core.resource.R.string.push_notification_default_body
 import com.into.websoso.data.repository.PushMessageRepository
 import com.into.websoso.ui.feedDetail.FeedDetailActivity
 import com.into.websoso.ui.main.MainActivity
 import com.into.websoso.ui.notificationDetail.NotificationDetailActivity
+import com.into.websoso.ui.novelDetail.NovelDetailActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -27,44 +31,51 @@ class WSSFirebaseMessagingService : FirebaseMessagingService() {
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
 
-        val receivedData = message.data
-        if (receivedData.isEmpty()) return
-
-        val title = receivedData["title"] ?: DEFAULT_TITLE
-        val body = receivedData["body"] ?: DEFAULT_BODY
-        val feedId = receivedData["feedId"]?.toLongOrNull()
-        val notificationId = receivedData["notificationId"]?.toLong() ?: return
+        val pushMessage = PushMessage.from(message.data) ?: return
 
         setupNotificationChannel()
-        val pendingIntent = createPendingIntent(
-            feedId,
-            notificationId,
+        val pendingIntent = createPendingIntent(pushMessage)
+        showNotification(
+            title = pushMessage.title ?: getString(app_name),
+            body = pushMessage.body ?: getString(push_notification_default_body),
+            pendingIntent = pendingIntent,
         )
-        showNotification(title, body, pendingIntent)
     }
 
     private fun setupNotificationChannel() {
         val notificationManager =
             getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val channel = NotificationChannel(
             CHANNEL_ID,
-            CHANNEL_NAME,
+            getString(app_name),
             NotificationManager.IMPORTANCE_DEFAULT,
         ).apply {
-            description = CHANNEL_DESCRIPTION
+            description = getString(push_notification_channel_description)
         }
         notificationManager.createNotificationChannel(channel)
     }
 
-    private fun createPendingIntent(
-        feedId: Long?,
-        notificationId: Long,
-    ): PendingIntent {
+    private fun createPendingIntent(pushMessage: PushMessage): PendingIntent {
         val mainIntent = MainActivity.getIntent(this)
+        val notificationId = pushMessage.notificationId
+
+        val detailIntent = when (pushMessage.destination) {
+            PushDestination.FEED -> FeedDetailActivity.getIntent(
+                this,
+                requireNotNull(pushMessage.feedId),
+                notificationId,
+            )
 
-        val detailIntent = when {
-            feedId != null -> FeedDetailActivity.getIntent(this, feedId, notificationId)
-            else -> NotificationDetailActivity.getIntent(this, notificationId)
+            PushDestination.NOVEL -> NovelDetailActivity.getIntent(
+                this,
+                requireNotNull(pushMessage.novelId),
+                notificationId,
+            )
+
+            PushDestination.NOTIFICATION_DETAIL -> NotificationDetailActivity.getIntent(
+                this,
+                notificationId,
+            )
         }
 
         return TaskStackBuilder.create(this).run {
@@ -108,10 +119,6 @@ class WSSFirebaseMessagingService : FirebaseMessagingService() {
     }
 
     companion object {
-        private const val DEFAULT_TITLE = "웹소소"
-        private const val DEFAULT_BODY = "푸시 알림 메시지입니다"
         private const val CHANNEL_ID = "websoso"
-        private const val CHANNEL_NAME = "웹소소"
-        private const val CHANNEL_DESCRIPTION = "웹소소 알림입니다."
     }
 }

app/src/main/java/com/into/websoso/data/di/ApiModule.kt

@@ -6,6 +6,7 @@ import com.into.websoso.data.remote.api.FeedApi
 import com.into.websoso.data.remote.api.KeywordApi
 import com.into.websoso.data.remote.api.NotificationApi
 import com.into.websoso.data.remote.api.NovelApi
+import com.into.websoso.data.remote.api.NovelNotificationApi
 import com.into.websoso.data.remote.api.PushMessageApi
 import com.into.websoso.data.remote.api.UserApi
 import com.into.websoso.data.remote.api.UserNovelApi
@@ -36,6 +37,10 @@ object ApiModule {
     @Singleton
     fun provideNotificationApi(retrofit: Retrofit): NotificationApi = retrofit.create(NotificationApi::class.java)
 
+    @Provides
+    @Singleton
+    fun provideNovelNotificationApi(retrofit: Retrofit): NovelNotificationApi = retrofit.create(NovelNotificationApi::class.java)
+
     @Provides
     @Singleton
     fun provideFeedApi(retrofit: Retrofit): FeedApi = retrofit.create(FeedApi::class.java)

app/src/main/java/com/into/websoso/data/mapper/NotificationMapper.kt

@@ -19,6 +19,7 @@ fun NotificationsResponseDto.toData(): NotificationsEntity =
                 isRead = it.isRead,
                 isNotice = it.isNotice,
                 feedId = it.feedId,
+                novelId = it.novelId,
             )
         },
     )

app/src/main/java/com/into/websoso/data/mapper/NovelNotificationMapper.kt

@@ -0,0 +1,29 @@
+package com.into.websoso.data.mapper
+
+import com.into.websoso.data.model.NovelNotificationSettingEntity
+import com.into.websoso.data.model.NovelNotificationSubscriptionEntity
+import com.into.websoso.data.model.NovelNotificationSubscriptionsEntity
+import com.into.websoso.data.remote.response.NovelNotificationSettingResponseDto
+import com.into.websoso.data.remote.response.NovelNotificationSubscriptionsResponseDto
+
+fun NovelNotificationSettingResponseDto.toData(): NovelNotificationSettingEntity =
+    NovelNotificationSettingEntity(
+        isCompletionNotificationEnabled = isCompletionNotificationEnabled,
+        isHiatusReturnNotificationEnabled = isHiatusReturnNotificationEnabled,
+    )
+
+fun NovelNotificationSubscriptionsResponseDto.toData(): NovelNotificationSubscriptionsEntity =
+    NovelNotificationSubscriptionsEntity(
+        isLoadable = isLoadable,
+        nextSubscriptionId = nextSubscriptionId,
+        subscriptions = subscriptions.map {
+            NovelNotificationSubscriptionEntity(
+                subscriptionId = it.subscriptionId,
+                novelId = it.novelId,
+                novelTitle = it.novelTitle,
+                novelAuthor = it.novelAuthor,
+                novelImage = it.novelImage,
+                registeredDate = it.registeredDate,
+            )
+        },
+    )

app/src/main/java/com/into/websoso/data/model/NotificationEntity.kt

@@ -11,11 +11,13 @@ data class NotificationEntity(
     val isRead: Boolean,
     val isNotice: Boolean,
     val feedId: Long?,
+    val novelId: Long?,
 ) {
     fun getIntrinsicId(): Long =
         when {
             isNotice -> notificationId
             feedId != null -> feedId
+            novelId != null -> novelId
             else -> DEFAULT_INTRINSIC_ID
         }
 }

app/src/main/java/com/into/websoso/data/model/NovelNotificationSettingEntity.kt

@@ -0,0 +1,6 @@
+package com.into.websoso.data.model
+
+data class NovelNotificationSettingEntity(
+    val isCompletionNotificationEnabled: Boolean,
+    val isHiatusReturnNotificationEnabled: Boolean,
+)

app/src/main/java/com/into/websoso/data/model/NovelNotificationSubscriptionEntity.kt

@@ -0,0 +1,10 @@
+package com.into.websoso.data.model
+
+data class NovelNotificationSubscriptionEntity(
+    val subscriptionId: Long,
+    val novelId: Long,
+    val novelTitle: String,
+    val novelAuthor: String,
+    val novelImage: String,
+    val registeredDate: String,
+)

app/src/main/java/com/into/websoso/data/model/NovelNotificationSubscriptionsEntity.kt

@@ -0,0 +1,7 @@
+package com.into.websoso.data.model
+
+data class NovelNotificationSubscriptionsEntity(
+    val isLoadable: Boolean,
+    val nextSubscriptionId: Long?,
+    val subscriptions: List<NovelNotificationSubscriptionEntity>,
+)

app/src/main/java/com/into/websoso/data/remote/api/NovelNotificationApi.kt

@@ -0,0 +1,37 @@
+package com.into.websoso.data.remote.api
+
+import com.into.websoso.data.remote.request.NovelNotificationSettingRequestDto
+import com.into.websoso.data.remote.request.NovelNotificationSubscriptionsDeleteRequestDto
+import com.into.websoso.data.remote.response.NovelNotificationSettingResponseDto
+import com.into.websoso.data.remote.response.NovelNotificationSubscriptionsResponseDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.HTTP
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface NovelNotificationApi {
+    @GET("novels/{novelId}/notification")
+    suspend fun getNovelNotificationSetting(
+        @Path("novelId") novelId: Long,
+    ): NovelNotificationSettingResponseDto
+
+    @PUT("novels/{novelId}/notification")
+    suspend fun putNovelNotificationSetting(
+        @Path("novelId") novelId: Long,
+        @Body novelNotificationSettingRequestDto: NovelNotificationSettingRequestDto,
+    )
+
+    @GET("users/me/notification/novels")
+    suspend fun getNovelNotificationSubscriptions(
+        @Query("notificationType") notificationType: String,
+        @Query("lastSubscriptionId") lastSubscriptionId: Long,
+        @Query("size") size: Int,
+    ): NovelNotificationSubscriptionsResponseDto
+
+    @HTTP(method = "DELETE", path = "users/me/notification/novels", hasBody = true)
+    suspend fun deleteNovelNotificationSubscriptions(
+        @Body novelNotificationSubscriptionsDeleteRequestDto: NovelNotificationSubscriptionsDeleteRequestDto,
+    )
+}

app/src/main/java/com/into/websoso/data/remote/request/NovelNotificationSettingRequestDto.kt

@@ -0,0 +1,12 @@
+package com.into.websoso.data.remote.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NovelNotificationSettingRequestDto(
+    @SerialName("isCompletionNotificationEnabled")
+    val isCompletionNotificationEnabled: Boolean,
+    @SerialName("isHiatusReturnNotificationEnabled")
+    val isHiatusReturnNotificationEnabled: Boolean,
+)

app/src/main/java/com/into/websoso/data/remote/request/NovelNotificationSubscriptionsDeleteRequestDto.kt

@@ -0,0 +1,12 @@
+package com.into.websoso.data.remote.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NovelNotificationSubscriptionsDeleteRequestDto(
+    @SerialName("notificationType")
+    val notificationType: String,
+    @SerialName("novelIds")
+    val novelIds: List<Long>,
+)

app/src/main/java/com/into/websoso/data/remote/response/NotificationsResponseDto.kt

@@ -28,5 +28,7 @@ data class NotificationsResponseDto(
         val isNotice: Boolean,
         @SerialName("feedId")
         val feedId: Long?,
+        @SerialName("novelId")
+        val novelId: Long? = null,
     )
 }

app/src/main/java/com/into/websoso/data/remote/response/NovelNotificationSettingResponseDto.kt

@@ -0,0 +1,12 @@
+package com.into.websoso.data.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NovelNotificationSettingResponseDto(
+    @SerialName("isCompletionNotificationEnabled")
+    val isCompletionNotificationEnabled: Boolean,
+    @SerialName("isHiatusReturnNotificationEnabled")
+    val isHiatusReturnNotificationEnabled: Boolean,
+)

app/src/main/java/com/into/websoso/data/remote/response/NovelNotificationSubscriptionsResponseDto.kt

@@ -0,0 +1,30 @@
+package com.into.websoso.data.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NovelNotificationSubscriptionsResponseDto(
+    @SerialName("isLoadable")
+    val isLoadable: Boolean,
+    @SerialName("nextSubscriptionId")
+    val nextSubscriptionId: Long? = null,
+    @SerialName("subscriptions")
+    val subscriptions: List<NovelNotificationSubscriptionResponseDto>,
+) {
+    @Serializable
+    data class NovelNotificationSubscriptionResponseDto(
+        @SerialName("subscriptionId")
+        val subscriptionId: Long,
+        @SerialName("novelId")
+        val novelId: Long,
+        @SerialName("novelTitle")
+        val novelTitle: String,
+        @SerialName("novelAuthor")
+        val novelAuthor: String,
+        @SerialName("novelImage")
+        val novelImage: String,
+        @SerialName("registeredDate")
+        val registeredDate: String,
+    )
+}