Merge pull request #78 from YAPP-Github/feature/TNT-186

[TNT-186] 트레이니 마이페이지 기능 구현
YAPP-Github · Feb 10, 2025 · 20af918 · 20af918
2 parents 0c3fce9 + e8d2a69
commit 20af918
Show file tree

Hide file tree

Showing 16 changed files with 424 additions and 374 deletions.
diff --git a/data/network/src/main/java/co/kr/data/network/model/UserResponse.kt b/data/network/src/main/java/co/kr/data/network/model/UserResponse.kt
@@ -10,14 +10,27 @@ data class UserResponse(
     val name: String,
     val email: String,
     val profileImageUrl: String,
-    val birthday: String?,
     val memberType: MemberType,
     val socialType: String,
-    val invitationCode: String,
-    val height: Double?,
-    val weight: Double?,
+    val trainer: TrainerResponse?,
+    val trainee: TraineeResponse?,
+)
+
+@Serializable
+data class TrainerResponse(
+    val activeTraineeCount: Int?,
+    val totalTraineeCount: Int?,
+    val invitationCode: String?,
+)
+
+@Serializable
+data class TraineeResponse(
+    val birthday: String?,
+    val age: Int?,
+    val height: Double,
+    val weight: Double,
     val cautionNote: String?,
-    val goalContents: List<String>,
+    val ptGoals: List<String>,
 )
 
 fun UserResponse.toDomain(dateFormatter: DateFormatter): User {
@@ -32,11 +45,12 @@ fun UserResponse.toDomain(dateFormatter: DateFormatter): User {
             id = "TODO",
             name = name,
             image = profileImageUrl,
-            birthday = birthday?.let(dateFormatter::parse),
-            weight = requireNotNull(weight),
-            height = requireNotNull(height?.toInt()),
-            ptPurpose = goalContents,
-            caution = cautionNote,
+            birthday = trainee?.birthday?.let(dateFormatter::parse),
+            weight = requireNotNull(trainee?.weight),
+            height = requireNotNull(trainee?.height?.toInt()),
+            ptPurpose = trainee?.ptGoals ?: emptyList(),
+            caution = trainee?.cautionNote,
+            isConnected = false,
         )
 
         MemberType.UNREGISTERED -> error("등록되지 않은 유저입니다.")

diff --git a/data/repository/src/main/java/co/kr/data/repository/TraineeRepositoryImpl.kt b/data/repository/src/main/java/co/kr/data/repository/TraineeRepositoryImpl.kt
@@ -1,11 +1,14 @@
 package co.kr.data.repository
 
+import co.kr.data.network.model.toDomain
 import co.kr.data.network.model.trainee.DailyRecordsResponse
 import co.kr.data.network.model.trainee.MonthlyRecordedDatesResponse
 import co.kr.data.network.model.trainee.PtSessionResponse
 import co.kr.data.network.model.trainee.RecordResponse
 import co.kr.data.network.model.trainee.RecordedDateResponse
 import co.kr.data.network.model.trainee.toDomain
+import co.kr.data.network.source.UserRemoteDataSource
+import co.kr.tnt.domain.model.User
 import co.kr.tnt.domain.model.trainee.TraineeDailyRecord
 import co.kr.tnt.domain.model.trainee.TraineeDailyRecordStatus
 import co.kr.tnt.domain.repository.TraineeRepository
@@ -17,8 +20,15 @@ import javax.inject.Singleton
 
 @Singleton
 internal class TraineeRepositoryImpl @Inject constructor(
+    private val userRemoteDataSource: UserRemoteDataSource,
     private val dateFormatter: DateFormatter,
 ) : TraineeRepository {
+    override suspend fun getMyInfo(): User.Trainee {
+        val user = userRemoteDataSource.getMyInfo().toDomain(dateFormatter)
+        require(user is User.Trainee)
+        return user
+    }
+
     // TODO : API에 맞춰 수정
     override suspend fun getDailyDataStatus(yearMonth: YearMonth): List<TraineeDailyRecordStatus> {
         val result = MonthlyRecordedDatesResponse(
@@ -36,6 +46,7 @@ internal class TraineeRepositoryImpl @Inject constructor(
         return result
     }
 
+    // TODO : API에 맞춰 수정
     override suspend fun getTraineeDailyRecord(day: LocalDate): TraineeDailyRecord {
         val result = listOf(
             DailyRecordsResponse(

diff --git a/domain/src/main/java/co/kr/tnt/domain/model/User.kt b/domain/src/main/java/co/kr/tnt/domain/model/User.kt
@@ -30,6 +30,7 @@ sealed class User {
         val height: Int,
         val ptPurpose: List<String>,
         val caution: String?,
+        val isConnected: Boolean,
     ) : User() {
         /** 한국식 나이 */
         val age: Int? =
@@ -49,6 +50,7 @@ sealed class User {
                 height = 0,
                 ptPurpose = emptyList(),
                 caution = null,
+                isConnected = false,
             )
         }
     }

diff --git a/domain/src/main/java/co/kr/tnt/domain/repository/TraineeRepository.kt b/domain/src/main/java/co/kr/tnt/domain/repository/TraineeRepository.kt
@@ -1,12 +1,13 @@
 package co.kr.tnt.domain.repository
 
+import co.kr.tnt.domain.model.User
 import co.kr.tnt.domain.model.trainee.TraineeDailyRecord
 import co.kr.tnt.domain.model.trainee.TraineeDailyRecordStatus
 import java.time.LocalDate
 import java.time.YearMonth
 
 interface TraineeRepository {
+    suspend fun getMyInfo(): User.Trainee
     suspend fun getDailyDataStatus(yearMonth: YearMonth): List<TraineeDailyRecordStatus>
-
     suspend fun getTraineeDailyRecord(day: LocalDate): TraineeDailyRecord
 }
diff --git a/feature/main/src/main/java/co/kr/tnt/main/ui/TnTNavHost.kt b/feature/main/src/main/java/co/kr/tnt/main/ui/TnTNavHost.kt
@@ -89,7 +89,7 @@ fun TnTNavHost(
                 navigateToLogin = { navController.navigateToLogin(clearBackStack = true) },
             )
             traineeMainScreen(
-                navigateToConnect = { navController.navigateToTraineeConnect(true) },
+                navigateToConnect = navController::navigateToTraineeConnect,
                 navigateToWebView = navController::navigateToWebView,
                 navigateToLogin = { navController.navigateToLogin(clearBackStack = true) },
             )

diff --git a/feature/trainee/main/src/main/java/co/kr/tnt/trainee/main/TraineeMainScreen.kt b/feature/trainee/main/src/main/java/co/kr/tnt/trainee/main/TraineeMainScreen.kt
@@ -17,7 +17,7 @@ import co.kr.tnt.trainee.notification.navigation.traineeNotification
 
 @Composable
 internal fun TraineeMainRoute(
-    navigateToConnect: () -> Unit,
+    navigateToConnect: (Boolean) -> Unit,
     navigateToLogin: () -> Unit,
     navigateToWebView: (url: String) -> Unit,
 ) {
@@ -37,7 +37,7 @@ internal fun TraineeMainRoute(
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 private fun TraineeMainScreen(
     state: TraineeMainState,
-    navigateToConnect: () -> Unit,
+    navigateToConnect: (Boolean) -> Unit,
     navigateToLogin: () -> Unit,
     navigateToWebView: (url: String) -> Unit,
 ) {
@@ -70,7 +70,6 @@ private fun TraineeMainScreen(
                 )
             }
             traineeMyPageNavGraph(
-                navigateToPrevious = navController::popBackStack,
                 navigateToLogin = navigateToLogin,
                 navigateToWebView = navigateToWebView,
                 navigateToTraineeConnect = navigateToConnect,

diff --git a/...ure/trainee/main/src/main/java/co/kr/tnt/trainee/main/navigation/TraineeMainNavigation.kt b/...ure/trainee/main/src/main/java/co/kr/tnt/trainee/main/navigation/TraineeMainNavigation.kt
@@ -22,7 +22,7 @@ fun NavController.navigateToTraineeMain(
 )
 
 fun NavGraphBuilder.traineeMainScreen(
-    navigateToConnect: () -> Unit,
+    navigateToConnect: (Boolean) -> Unit,
     navigateToLogin: () -> Unit,
     navigateToWebView: (url: String) -> Unit,
 ) {

diff --git a/feature/trainee/mypage/build.gradle.kts b/feature/trainee/mypage/build.gradle.kts
@@ -9,5 +9,9 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.login)
+
     implementation(libs.kotlinx.immutable)
+    implementation(libs.accompanist.permissions)
+    implementation(libs.play.services.oss.licenses)
 }
diff --git a/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageContract.kt b/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageContract.kt
@@ -1,45 +1,49 @@
 package co.kr.tnt.trainee.mypage
 
-import co.kr.tnt.trainee.mypage.model.DialogState
+import co.kr.tnt.domain.model.User
 import co.kr.tnt.ui.base.UiEvent
 import co.kr.tnt.ui.base.UiSideEffect
 import co.kr.tnt.ui.base.UiState
 
 internal class TraineeMyPageContract {
     data class TraineeMyPageUiState(
-        val image: String? = "",
-        val name: String = "",
+        val user: User.Trainee = User.Trainee.EMPTY,
         val trainerName: String = "",
-        val isConnected: Boolean = false,
-        val isPushEnabled: Boolean = true,
-        val appVersion: String = "0.0.0",
-        val dialogState: DialogState = DialogState.LOGOUT,
-        val url: String = "",
-        val showWebView: Boolean = false,
-        val showWarningDialog: Boolean = false,
-        val showCompleteDialog: Boolean = false,
-    ) : UiState
+        val isEnablePushNotification: Boolean = true,
+        val dialogState: DialogState = DialogState.NONE,
+    ) : UiState {
+        enum class DialogState {
+            NONE,
+            LOGOUT_CONFIRM,
+            LOGOUT,
+            DELETE_ACCOUNT_CONFIRM,
+            DELETE_ACCOUNT,
+            SHOULD_ALLOW_PERMISSION,
+        }
+    }
 
     sealed interface TraineeMyPageUiEvent : UiEvent {
-        data object OnEditButtonClick : TraineeMyPageUiEvent
-        data object OnConnectButtonClick : TraineeMyPageUiEvent
-        data object OnDisconnectButtonClick : TraineeMyPageUiEvent
-        data object ToggleNotification : TraineeMyPageUiEvent
-        data object OnServiceTermClick : TraineeMyPageUiEvent
-        data object OnPrivacyClick : TraineeMyPageUiEvent
-        data object OnOpenSourceClick : TraineeMyPageUiEvent
-        data object OnLogoutClick : TraineeMyPageUiEvent
-        data object OnDeleteAccountClick : TraineeMyPageUiEvent
-        data object OnConfirmWarningDialog : TraineeMyPageUiEvent
-        data object OnConfirmCompleteDialog : TraineeMyPageUiEvent
-        data object OnDismissPopup : TraineeMyPageUiEvent
+        data class OnToggleNotification(
+            val isGrantedPermission: Boolean,
+            val shouldShowRationale: Boolean,
+        ) : TraineeMyPageUiEvent
+
+        data object OnClickConnect : TraineeMyPageUiEvent
+        data object OnClickTermsOfService : TraineeMyPageUiEvent
+        data object OnClickPrivacy : TraineeMyPageUiEvent
+        data object OnClickOpenSource : TraineeMyPageUiEvent
+        data object OnClickLogout : TraineeMyPageUiEvent
+        data object OnClickDeleteAccount : TraineeMyPageUiEvent
+        data object OnClickDialogConfirm : TraineeMyPageUiEvent
+        data object OnDismissDialog : TraineeMyPageUiEvent
     }
 
     sealed interface TraineeMyPageEffect : UiSideEffect {
         data class ShowToast(val message: String) : TraineeMyPageEffect
         data object NavigateToConnect : TraineeMyPageEffect
-        data object NavigateToPrevious : TraineeMyPageEffect
         data object NavigateToLogin : TraineeMyPageEffect
         data class NavigateToWebView(val url: String) : TraineeMyPageEffect
+        data object NavigateToOpenSourceLicense : TraineeMyPageEffect
+        data class RequestPermission(val isExplicitlyDenied: Boolean) : TraineeMyPageEffect
     }
 }