[MERGE] #396 -> develop

leeeyubin · web-flow · commit ab77f3a3018d · 2025-05-18T20:19:49.000+09:00
[FEAT/#396] 푸시알림 상태 변경 / 서버통신 구현
diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/extension/FlowExt.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/extension/FlowExt.kt
@@ -0,0 +1,24 @@
+package com.terning.core.designsystem.extension
+
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.SendChannel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.flow
+
+fun <T, K> Flow<T>.groupBy(getKey: (T) -> K): Flow<Pair<K, Flow<T>>> = flow {
+    val storage = mutableMapOf<K, SendChannel<T>>()
+    try {
+        collect { t ->
+            val key = getKey(t)
+            val channel = storage.getOrPut(key) {
+                Channel<T>(capacity = Channel.BUFFERED).also {
+                    emit(key to it.consumeAsFlow())
+                }
+            }
+            channel.send(t)
+        }
+    } finally {
+        storage.values.forEach { it.close() }
+    }
+}
diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/type/AlarmType.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/type/AlarmType.kt
@@ -0,0 +1,6 @@
+package com.terning.core.designsystem.type
+
+enum class AlarmType(val value: String) {
+    ENABLED("ENABLED"),
+    DISABLED("DISABLED")
+}
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/datasource/MyPageDataSource.kt b/data/mypage/src/main/java/com/terning/data/mypage/datasource/MyPageDataSource.kt
@@ -2,6 +2,7 @@ package com.terning.data.mypage.datasource
 
 import com.terning.core.network.BaseResponse
 import com.terning.core.network.NonDataBaseResponse
+import com.terning.data.mypage.dto.request.AlarmStatusRequestDto
 import com.terning.data.mypage.dto.request.MyPageProfileEditRequestDto
 import com.terning.data.mypage.dto.response.MyPageResponseDto
 
@@ -15,4 +16,8 @@ interface MyPageDataSource {
     suspend fun editProfile(
         request: MyPageProfileEditRequestDto
     ): NonDataBaseResponse
-}
+
+    suspend fun updateAlarmState(
+        request : AlarmStatusRequestDto
+    ) : NonDataBaseResponse
+}
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/datasourceimpl/MyPageDataSourceImpl.kt b/data/mypage/src/main/java/com/terning/data/mypage/datasourceimpl/MyPageDataSourceImpl.kt
@@ -3,6 +3,7 @@ package com.terning.data.mypage.datasourceimpl
 import com.terning.core.network.BaseResponse
 import com.terning.core.network.NonDataBaseResponse
 import com.terning.data.mypage.datasource.MyPageDataSource
+import com.terning.data.mypage.dto.request.AlarmStatusRequestDto
 import com.terning.data.mypage.dto.request.MyPageProfileEditRequestDto
 import com.terning.data.mypage.dto.response.MyPageResponseDto
 import com.terning.data.mypage.service.MyPageService
@@ -20,4 +21,7 @@ class MyPageDataSourceImpl @Inject constructor(
     override suspend fun editProfile(
         request: MyPageProfileEditRequestDto
     ): NonDataBaseResponse = myPageService.editProfile(request)
-}
+
+    override suspend fun updateAlarmState(request: AlarmStatusRequestDto): NonDataBaseResponse =
+        myPageService.patchAlarmStatus(request)
+}
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/dto/request/AlarmStatusRequestDto.kt b/data/mypage/src/main/java/com/terning/data/mypage/dto/request/AlarmStatusRequestDto.kt
@@ -0,0 +1,10 @@
+package com.terning.data.mypage.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AlarmStatusRequestDto(
+    @SerialName("newStatus")
+    val newStatus: String
+)
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/dto/response/MyPageResponseDto.kt b/data/mypage/src/main/java/com/terning/data/mypage/dto/response/MyPageResponseDto.kt
@@ -10,5 +10,7 @@ data class MyPageResponseDto(
     @SerialName("profileImage")
     val profileImage: String,
     @SerialName("authType")
-    val authType: String
-)
+    val authType: String,
+    @SerialName("pushStatus")
+    val pushStatus: String
+)
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/mapper/AlarmStatusMapper.kt b/data/mypage/src/main/java/com/terning/data/mypage/mapper/AlarmStatusMapper.kt
@@ -0,0 +1,9 @@
+package com.terning.data.mypage.mapper
+
+import com.terning.data.mypage.dto.request.AlarmStatusRequestDto
+import com.terning.domain.mypage.entity.AlarmStatus
+
+fun AlarmStatus.toAlarmStatusRequestDto(): AlarmStatusRequestDto =
+    AlarmStatusRequestDto(
+        newStatus = newStatus
+    )
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/mapper/MyPageMapper.kt b/data/mypage/src/main/java/com/terning/data/mypage/mapper/MyPageMapper.kt
@@ -7,5 +7,6 @@ fun MyPageResponseDto.toMyPageProfile() =
     MyPageProfile(
         name = name,
         profileImage = profileImage,
-        authType = authType
+        authType = authType,
+        alarmStatus = pushStatus
     )
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/repositoryimpl/MyPageRepositoryImpl.kt b/data/mypage/src/main/java/com/terning/data/mypage/repositoryimpl/MyPageRepositoryImpl.kt
@@ -1,8 +1,10 @@
 package com.terning.data.mypage.repositoryimpl
 
 import com.terning.data.mypage.datasource.MyPageDataSource
+import com.terning.data.mypage.mapper.toAlarmStatusRequestDto
 import com.terning.data.mypage.mapper.toMyPageProfile
 import com.terning.data.mypage.mapper.toMyPageProfileEditRequestDto
+import com.terning.domain.mypage.entity.AlarmStatus
 import com.terning.domain.mypage.entity.MyPageProfile
 import com.terning.domain.mypage.entity.MyPageProfileEdit
 import com.terning.domain.mypage.repository.MyPageRepository
@@ -34,4 +36,9 @@ class MyPageRepositoryImpl @Inject constructor(
                 request.toMyPageProfileEditRequestDto()
             )
         }
-}
+
+    override suspend fun updateAlarmState(request: AlarmStatus): Result<Unit> =
+        runCatching {
+            myPageDataSource.updateAlarmState(request.toAlarmStatusRequestDto())
+        }
+}
diff --git a/data/mypage/src/main/java/com/terning/data/mypage/service/MyPageService.kt b/data/mypage/src/main/java/com/terning/data/mypage/service/MyPageService.kt
@@ -2,6 +2,7 @@ package com.terning.data.mypage.service
 
 import com.terning.core.network.BaseResponse
 import com.terning.core.network.NonDataBaseResponse
+import com.terning.data.mypage.dto.request.AlarmStatusRequestDto
 import com.terning.data.mypage.dto.request.MyPageProfileEditRequestDto
 import com.terning.data.mypage.dto.response.MyPageResponseDto
 import retrofit2.http.Body
@@ -24,4 +25,9 @@ interface MyPageService {
     suspend fun editProfile(
         @Body body: MyPageProfileEditRequestDto
     ): NonDataBaseResponse
+
+    @PATCH("api/v1/push-status")
+    suspend fun patchAlarmStatus(
+        @Body body: AlarmStatusRequestDto
+    ): NonDataBaseResponse
 }
diff --git a/domain/mypage/src/main/java/com/terning/domain/mypage/entity/AlarmStatus.kt b/domain/mypage/src/main/java/com/terning/domain/mypage/entity/AlarmStatus.kt
@@ -0,0 +1,5 @@
+package com.terning.domain.mypage.entity
+
+data class AlarmStatus(
+    val newStatus: String
+)
diff --git a/domain/mypage/src/main/java/com/terning/domain/mypage/entity/MyPageProfile.kt b/domain/mypage/src/main/java/com/terning/domain/mypage/entity/MyPageProfile.kt
@@ -3,5 +3,6 @@ package com.terning.domain.mypage.entity
 data class MyPageProfile(
     val name: String,
     val profileImage: String,
-    val authType: String
-)
+    val authType: String,
+    val alarmStatus: String
+)
diff --git a/domain/mypage/src/main/java/com/terning/domain/mypage/repository/MyPageRepository.kt b/domain/mypage/src/main/java/com/terning/domain/mypage/repository/MyPageRepository.kt
@@ -1,5 +1,6 @@
 package com.terning.domain.mypage.repository
 
+import com.terning.domain.mypage.entity.AlarmStatus
 import com.terning.domain.mypage.entity.MyPageProfile
 import com.terning.domain.mypage.entity.MyPageProfileEdit
 
@@ -13,4 +14,8 @@ interface MyPageRepository {
     suspend fun editProfile(
         request: MyPageProfileEdit
     ): Result<Unit>
-}
+
+    suspend fun updateAlarmState(
+        request: AlarmStatus
+    ): Result<Unit>
+}
diff --git a/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt b/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt
@@ -105,6 +105,10 @@ fun HomeRoute(
                     viewModel.updatePermissionRequested(true)
                 }
         }
+        else {
+            val isAlarmAvailable = viewModel.getAlarmAvailability()
+            viewModel.updateAlarmAvailability(isAlarmAvailable)
+        }
     }
 
     var hasHandledInternDeeplink by rememberSaveable { mutableStateOf(false) }
diff --git a/feature/home/src/main/java/com/terning/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/terning/feature/home/HomeViewModel.kt
@@ -6,12 +6,15 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.map
 import com.terning.core.designsystem.state.UiState
+import com.terning.core.designsystem.type.AlarmType.DISABLED
+import com.terning.core.designsystem.type.AlarmType.ENABLED
 import com.terning.core.designsystem.type.SortBy
 import com.terning.domain.home.entity.ChangeFilteringRequestModel
 import com.terning.domain.home.entity.FcmToken
 import com.terning.domain.home.entity.HomeRecommendIntern
 import com.terning.domain.home.entity.HomeRecommendedIntern
 import com.terning.domain.home.repository.HomeRepository
+import com.terning.domain.mypage.entity.AlarmStatus
 import com.terning.domain.mypage.repository.MyPageRepository
 import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -220,6 +223,11 @@ class HomeViewModel @Inject constructor(
 
     fun updateAlarmAvailability(availability: Boolean) {
         userRepository.setAlarmAvailable(availability)
+
+        viewModelScope.launch {
+            if (availability) myPageRepository.updateAlarmState(AlarmStatus(ENABLED.value))
+            else myPageRepository.updateAlarmState(AlarmStatus(DISABLED.value))
+        }
     }
 
     fun updatePermissionRequested(requested: Boolean) {
@@ -244,4 +252,6 @@ class HomeViewModel @Inject constructor(
             ).onFailure(Timber::e)
         }
     }
+
+    fun getAlarmAvailability(): Boolean = userRepository.getAlarmAvailable()
 }
diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt
@@ -94,8 +94,12 @@ fun MyPageRoute(
         rememberPermissionState(permission = notificationPermission)
     var isChecked by remember {
         mutableStateOf(
-            if (!permissionState.status.isGranted) false
-            else viewModel.getAlarmAvailability()
+            if (!permissionState.status.isGranted) {
+                viewModel.updateAlarmAvailability(false)
+                false
+            } else {
+                viewModel.getAlarmAvailability()
+            }
         )
     }
     val notificationSettingsLauncher =
@@ -106,17 +110,15 @@ fun MyPageRoute(
             viewModel.updateAlarmAvailability(isGranted)
         }
 
-    LaunchedEffect(Unit) {
+    DisposableEffect(lifecycleOwner) {
         systemUiController.setStatusBarColor(color = Back)
-    }
 
-    DisposableEffect(lifecycleOwner) {
         onDispose {
             systemUiController.setStatusBarColor(color = White)
         }
     }
 
-    LaunchedEffect(key1 = true) {
+    LaunchedEffect(Unit) {
         viewModel.getProfile()
     }
 
diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageState.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageState.kt
@@ -1,6 +1,7 @@
 package com.terning.feature.mypage.mypage
 
 import com.terning.core.designsystem.state.UiState
+import com.terning.core.designsystem.type.AlarmType.DISABLED
 
 data class MyPageState(
     val isGetSuccess: UiState<Boolean> = UiState.Loading,
@@ -13,5 +14,6 @@ data class MyPageState(
     val showPersonal: Boolean = false,
     val showLogoutBottomSheet: Boolean = false,
     val showQuitBottomSheet: Boolean = false,
-    val showAlarmDialog: Boolean = false
-)
+    val showAlarmDialog: Boolean = false,
+    val alarmStatus: String = DISABLED.value,
+)
diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageViewModel.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageViewModel.kt
diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/model/AlarmInfo.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/model/AlarmInfo.kt

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ fun MyPageResponseDto.toMyPageProfile() =`
`7`	`7`	`MyPageProfile(`
`8`	`8`	`name = name,`
`9`	`9`	`profileImage = profileImage,`
`10`		`- authType = authType`
	`10`	`+ authType = authType,`
	`11`	`+ alarmStatus = pushStatus`
`11`	`12`	`)`