feat(class, notification): tham gia class thông qua notification

pass-with-high-score · Nov 30, 2024 · 10f67fb · 10f67fb
1 parent 81afb21
commit 10f67fb
Show file tree

Hide file tree

Showing 27 changed files with 134 additions and 75 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -101,7 +101,6 @@ dependencies {
     ksp(libs.androidx.room.compiler)
     implementation(libs.compose.charts)
 
-
     implementation(libs.play.services.ads)
 
     implementation(project(":compose-cardstack"))

diff --git a/app/src/main/java/com/pwhs/quickmem/App.kt b/app/src/main/java/com/pwhs/quickmem/App.kt
@@ -6,7 +6,7 @@ import com.onesignal.OneSignal
 import com.onesignal.debug.LogLevel as OneSignalLogLevel
 import com.pwhs.quickmem.core.datastore.AppManager
 import com.pwhs.quickmem.core.datastore.TokenManager
-import com.pwhs.quickmem.data.dto.notification.TokenRequestDto
+import com.pwhs.quickmem.data.dto.notification.DeviceTokenRequestDto
 import com.pwhs.quickmem.data.remote.ApiService
 import com.revenuecat.purchases.LogLevel as RevenueCatLogLevel
 import com.revenuecat.purchases.Purchases
@@ -78,7 +78,7 @@ class App : Application() {
                 val accessToken = tokenManager.accessToken.firstOrNull() ?: ""
                 val userId = appManager.userId.firstOrNull() ?: ""
                 try {
-                    apiService.sendDeviceToken(accessToken, TokenRequestDto(userId, token))
+                    apiService.sendDeviceToken(accessToken, DeviceTokenRequestDto(userId, token))
                     Timber.d("Token sent to server successfully.")
                 } catch (e: Exception) {
                     Timber.e(e, "Error sending token to server")

diff --git a/app/src/main/java/com/pwhs/quickmem/core/data/enums/NotificationType.kt b/app/src/main/java/com/pwhs/quickmem/core/data/enums/NotificationType.kt
@@ -0,0 +1,6 @@
+package com.pwhs.quickmem.core.data.enums
+
+enum class NotificationType(val type: String) {
+    INVITE_USER_JOIN_CLASS("INVITE_USER_JOIN_CLASS"),
+    NONE("NONE"),
+}
diff --git a/app/src/main/java/com/pwhs/quickmem/core/service/AppFirebaseMessagingService.kt b/app/src/main/java/com/pwhs/quickmem/core/service/AppFirebaseMessagingService.kt
@@ -7,13 +7,14 @@ import android.content.Intent
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES
 import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.pwhs.quickmem.MainActivity
 import com.pwhs.quickmem.R
 import com.pwhs.quickmem.core.datastore.AppManager
 import com.pwhs.quickmem.core.datastore.TokenManager
-import com.pwhs.quickmem.data.dto.notification.TokenRequestDto
+import com.pwhs.quickmem.data.dto.notification.DeviceTokenRequestDto
 import com.pwhs.quickmem.data.remote.ApiService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -42,7 +43,7 @@ class AppFirebaseMessagingService : FirebaseMessagingService() {
                 val accessToken = tokenManager.accessToken.firstOrNull() ?: ""
                 val userId = appManager.userId.firstOrNull() ?: ""
                 try {
-                    apiService.sendDeviceToken(accessToken, TokenRequestDto(userId, token))
+                    apiService.sendDeviceToken(accessToken, DeviceTokenRequestDto(userId, token))
                     Timber.d("Token sent to server successfully.")
                 } catch (e: Exception) {
                     Timber.e(e, "Error sending token to server")
@@ -54,23 +55,38 @@ class AppFirebaseMessagingService : FirebaseMessagingService() {
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         Timber.d("From: ${remoteMessage.from}")
+        remoteMessage.notification?.title?.let { Timber.d("Notification Title: $it") }
+        remoteMessage.notification?.body?.let { Timber.d("Notification Body: $it") }
+        remoteMessage.data.isNotEmpty()
+            .let { Timber.d("Message data payload: ${remoteMessage.data}") }
         CoroutineScope(Dispatchers.IO).launch {
             val isPushNotificationsEnabled = appManager.pushNotifications.firstOrNull() ?: false
             if (isPushNotificationsEnabled) {
                 remoteMessage.notification?.let {
-                    showNotification(it.title, it.body)
+                    showNotification(it.title, it.body, remoteMessage.data)
                 }
             }
         }
     }
 
-    private fun showNotification(title: String?, body: String?) {
+    private fun showNotification(title: String?, body: String?, data: Map<String, String>) {
         val channelId = "QuickMem Channel"
         val notificationId = 0
 
-        val intent = Intent(this, MainActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        val notificationType = data["notificationType"]
+        val classCode = data["code"]
+
+        val intent = if (notificationType == "INVITE_USER_JOIN_CLASS" && classCode != null) {
+            Intent(
+                Intent.ACTION_VIEW,
+                "quickmem://join/class?code=$classCode".toUri()
+            )
+        } else {
+            Intent(this, MainActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            }
         }
+
         val pendingIntent = PendingIntent.getActivity(
             this,
             0,

diff --git a/.../data/dto/notification/TokenRequestDto.kt → ...dto/notification/DeviceTokenRequestDto.kt b/.../data/dto/notification/TokenRequestDto.kt → ...dto/notification/DeviceTokenRequestDto.kt
@@ -2,7 +2,7 @@ package com.pwhs.quickmem.data.dto.notification
 
 import com.google.gson.annotations.SerializedName
 
-data class TokenRequestDto(
+data class DeviceTokenRequestDto(
     @SerializedName("userId")
     val userId: String,
     @SerializedName("deviceToken")

diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/notification/GetNotificationResponseDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/notification/GetNotificationResponseDto.kt
@@ -1,6 +1,7 @@
 package com.pwhs.quickmem.data.dto.notification
 
 import com.google.gson.annotations.SerializedName
+import com.pwhs.quickmem.core.data.enums.NotificationType
 
 data class GetNotificationResponseDto(
     @SerializedName("id")
@@ -13,6 +14,10 @@ data class GetNotificationResponseDto(
     val userId: String,
     @SerializedName("isRead")
     val isRead: Boolean,
+    @SerializedName("notificationType")
+    val notificationType: NotificationType? = NotificationType.NONE,
+    @SerializedName("data")
+    val data: NotificationDataDto? = null,
     @SerializedName("createdAt")
     val createdAt: String,
     @SerializedName("updatedAt")

diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/notification/NotificationDataDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/notification/NotificationDataDto.kt
@@ -0,0 +1,10 @@
+package com.pwhs.quickmem.data.dto.notification
+
+import com.google.gson.annotations.SerializedName
+
+data class NotificationDataDto(
+    @SerializedName("id")
+    val id: String? = null,
+    @SerializedName("code")
+    val code: String? = null,
+)
diff --git a/...src/main/java/com/pwhs/quickmem/data/mapper/notification/GetNotificationResponseMapper.kt b/...src/main/java/com/pwhs/quickmem/data/mapper/notification/GetNotificationResponseMapper.kt
@@ -10,7 +10,9 @@ fun GetNotificationResponseDto.toModel() = GetNotificationResponseModel(
     userId = userId,
     isRead = isRead,
     createdAt = createdAt,
-    updatedAt = updatedAt
+    updatedAt = updatedAt,
+    notificationType = notificationType,
+    data = data?.toModel()
 )
 
 fun GetNotificationResponseModel.toDto() = GetNotificationResponseDto(
@@ -20,5 +22,7 @@ fun GetNotificationResponseModel.toDto() = GetNotificationResponseDto(
     userId = userId,
     isRead = isRead,
     createdAt = createdAt,
-    updatedAt = updatedAt
+    updatedAt = updatedAt,
+    notificationType = notificationType,
+    data = data?.toDto()
 )
diff --git a/app/src/main/java/com/pwhs/quickmem/data/mapper/notification/NotificationDataMapper.kt b/app/src/main/java/com/pwhs/quickmem/data/mapper/notification/NotificationDataMapper.kt
@@ -0,0 +1,14 @@
+package com.pwhs.quickmem.data.mapper.notification
+
+import com.pwhs.quickmem.data.dto.notification.NotificationDataDto
+import com.pwhs.quickmem.domain.model.notification.NotificationDataModel
+
+fun NotificationDataDto.toModel() = NotificationDataModel(
+    id = id,
+    code = code
+)
+
+fun NotificationDataModel.toDto() = NotificationDataDto(
+    id = id,
+    code = code
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/data/remote/ApiService.kt b/app/src/main/java/com/pwhs/quickmem/data/remote/ApiService.kt
@@ -57,7 +57,7 @@ import com.pwhs.quickmem.data.dto.folder.UpdateFolderRequestDto
 import com.pwhs.quickmem.data.dto.folder.UpdateFolderResponseDto
 import com.pwhs.quickmem.data.dto.notification.GetNotificationResponseDto
 import com.pwhs.quickmem.data.dto.notification.MarkNotificationReadRequestDto
-import com.pwhs.quickmem.data.dto.notification.TokenRequestDto
+import com.pwhs.quickmem.data.dto.notification.DeviceTokenRequestDto
 import com.pwhs.quickmem.data.dto.flashcard.WriteStatusFlashCardDto
 import com.pwhs.quickmem.data.dto.streak.GetStreakDto
 import com.pwhs.quickmem.data.dto.streak.GetTopStreakResponseDto
@@ -564,7 +564,7 @@ interface ApiService {
     @POST("notifications/register")
     suspend fun sendDeviceToken(
         @Header("Authorization") authorization: String,
-        @Body tokenRequest: TokenRequestDto
+        @Body tokenRequest: DeviceTokenRequestDto
     ): Response<Unit>
 
     @GET("notifications/user/{id}")

diff --git a/...src/main/java/com/pwhs/quickmem/domain/model/notification/GetNotificationResponseModel.kt b/...src/main/java/com/pwhs/quickmem/domain/model/notification/GetNotificationResponseModel.kt
@@ -1,10 +1,14 @@
 package com.pwhs.quickmem.domain.model.notification
 
+import com.pwhs.quickmem.core.data.enums.NotificationType
+
 data class GetNotificationResponseModel(
     val id: String,
     val title: String,
     val message: String,
     val userId: String,
+    val notificationType: NotificationType? = NotificationType.NONE,
+    val data: NotificationDataModel? = null,
     val isRead: Boolean,
     val createdAt: String,
     val updatedAt: String

diff --git a/app/src/main/java/com/pwhs/quickmem/domain/model/notification/NotificationDataModel.kt b/app/src/main/java/com/pwhs/quickmem/domain/model/notification/NotificationDataModel.kt
@@ -0,0 +1,6 @@
+package com.pwhs.quickmem.domain.model.notification
+
+data class NotificationDataModel(
+    val id: String? = null,
+    val code: String? = null,
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/DeepLinkScreen.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/DeepLinkScreen.kt
@@ -2,7 +2,6 @@ package com.pwhs.quickmem.presentation.app.deeplink
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.annotation.parameters.DeepLink
@@ -11,10 +10,7 @@ import com.ramcosta.composedestinations.generated.destinations.JoinClassScreenDe
 import com.ramcosta.composedestinations.generated.destinations.LoadFolderScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.LoadStudySetScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import timber.log.Timber
 
-//Deeplink for receiving code from class, folder, study set
-//TODO: Implement this screen
 @Destination<RootGraph>(
     deepLinks = [
         DeepLink(uriPattern = "quickmem://join/class?code={classCode}"),
@@ -24,20 +20,18 @@ import timber.log.Timber
 )
 @Composable
 fun DeepLinkScreen(
-    modifier: Modifier = Modifier,
     studySetCode: String? = null,
     folderCode: String? = null,
     classCode: String? = null,
     navigator: DestinationsNavigator,
 ) {
-    Timber.d("DeepLinkScreen: studySetCode: $studySetCode, folderCode: $folderCode, classCode: $classCode")
     LaunchedEffect(key1 = true) {
         when {
             classCode != null -> {
                 navigator.navigate(
                     JoinClassScreenDestination(
                         code = classCode,
-                        type = "class"
+                        isFromDeepLink = true
                     )
                 ) {
                     popUpTo(NavGraphs.root) {
@@ -51,7 +45,6 @@ fun DeepLinkScreen(
             folderCode != null -> {
                 navigator.navigate(
                     LoadFolderScreenDestination(
-                        type = "folder",
                         folderCode = folderCode
                     )
                 ) {
@@ -66,7 +59,6 @@ fun DeepLinkScreen(
             studySetCode != null -> {
                 navigator.navigate(
                     LoadStudySetScreenDestination(
-                        type = "studySet",
                         studySetCode = studySetCode
                     )
                 ) {

diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassArgs.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassArgs.kt
@@ -1,6 +1,7 @@
 package com.pwhs.quickmem.presentation.app.deeplink.classes
 
+
 data class JoinClassArgs(
     val code: String,
-    val type: String
+    val isFromDeepLink: Boolean
 )
diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassScreen.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassScreen.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -69,18 +69,23 @@ fun JoinClassScreen(
         viewModel.uiEvent.collect { event ->
             when (event) {
                 is JoinClassUiEvent.JoinedClass -> {
+                    if (!uiState.isFromDeepLink) {
+                        navigator.navigateUp()
+                    }
                     navigator.navigate(
                         ClassDetailScreenDestination(
                             id = event.id,
                             title = event.title,
                             description = event.description
                         )
                     ) {
-                        popUpTo(NavGraphs.root) {
-                            saveState = false
+                        if (uiState.isFromDeepLink) {
+                            popUpTo(NavGraphs.root) {
+                                saveState = false
+                            }
+                            launchSingleTop = true
+                            restoreState = false
                         }
-                        launchSingleTop = true
-                        restoreState = false
                     }
                 }
 
@@ -156,7 +161,7 @@ fun JoinClass(
                         onClick = onBackHome
                     ) {
                         Icon(
-                            imageVector = Icons.Default.Home,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = "Back",
                             tint = Color.Gray.copy(alpha = 0.6f)
                         )

diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassUiState.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassUiState.kt
@@ -8,6 +8,6 @@ data class JoinClassUiState(
     val classId: String? = null,
     val isUnAuthorized: Boolean = false,
     val code: String? = null,
-    val type: String? = null,
+    val isFromDeepLink: Boolean = false,
     val classDetailResponseModel: GetClassDetailResponseModel? = null
 )
diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassViewModel.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/classes/JoinClassViewModel.kt
@@ -34,15 +34,12 @@ class JoinClassViewModel @Inject constructor(
     val uiEvent = _uiEvent.receiveAsFlow()
 
     init {
-        val code = savedStateHandle.get<String>("code")
-        val type = savedStateHandle.get<String>("type")
-
-        Timber.d("JoinClassViewModel: code: $code, type: $type")
-
+        val code = savedStateHandle.get<String>("code") ?: ""
+        val isFromDeepLink = savedStateHandle.get<Boolean>("isFromDeepLink") ?: false
         _uiState.update {
             it.copy(
                 code = code,
-                type = type
+                isFromDeepLink = isFromDeepLink
             )
         }
 
@@ -85,6 +82,14 @@ class JoinClassViewModel @Inject constructor(
 
                     is Resources.Success -> {
                         if (resource.data?.owner?.id == userId || resource.data?.isJoined == true) {
+                            _uiState.update {
+                                it.copy(
+                                    classDetailResponseModel = resource.data,
+                                    isLoading = false,
+                                    userId = userId,
+                                    classId = resource.data.id
+                                )
+                            }
                             _uiEvent.send(
                                 JoinClassUiEvent.JoinedClass(
                                     id = resource.data.id,

diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/folder/LoadFolderArgs.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/folder/LoadFolderArgs.kt
@@ -1,6 +1,6 @@
 package com.pwhs.quickmem.presentation.app.deeplink.folder
 
+
 data class LoadFolderArgs(
     val folderCode: String,
-    val type: String
 )
diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/folder/LoadFolderUiState.kt b/app/src/main/java/com/pwhs/quickmem/presentation/app/deeplink/folder/LoadFolderUiState.kt
@@ -2,7 +2,6 @@ package com.pwhs.quickmem.presentation.app.deeplink.folder
 
 data class LoadFolderUiState(
     val folderCode: String = "",
-    val type: String = "",
     val isLoading: Boolean = true,
     val folderId: String? = null
 )