Merge pull request #64 from YAPP-Github/feature/TNT-176

[TNT-176] 트레이너, 트레이니 메인 네비게이션 기초 세팅
YAPP-Github · Feb 5, 2025 · 36327dd · 36327dd
2 parents 20b92e5 + 5389e6f
commit 36327dd
Show file tree

Hide file tree

Showing 79 changed files with 987 additions and 226 deletions.
diff --git a/core/navigation/src/main/java/co/kr/tnt/navigation/RouteModel.kt b/core/navigation/src/main/java/co/kr/tnt/navigation/RouteModel.kt
@@ -42,6 +42,49 @@ sealed interface Route {
     @Serializable
     data class TraineeConnect(val isSkippable: Boolean) : Route
 
+    @Serializable
+    data object TrainerMain : Route
+
+    sealed interface TrainerMainTab : Route {
+        @Serializable
+        data object Home : TrainerMainTab
+
+        @Serializable
+        data object Members : TrainerMainTab
+
+        @Serializable
+        data object Feedback : TrainerMainTab
+
+        @Serializable
+        data object MyPage : TrainerMainTab
+    }
+
+    @Serializable
+    data object TrainerHome : Route
+
+    @Serializable
+    data object TrainerMembers : Route
+
+    @Serializable
+    data object TrainerFeedback : Route
+
+    @Serializable
+    data object TrainerMyPage : Route
+
+    @Serializable
+    data object TraineeMain : Route
+
+    sealed interface TraineeMainTab : Route {
+        @Serializable
+        data object Home : TraineeMainTab
+
+        @Serializable
+        data object MyPage : TraineeMainTab
+    }
+
+    @Serializable
+    data object TraineeHome : Route
+
     @Serializable
     data object TraineeMyPage : Route
 

diff --git a/core/ui/src/main/java/co/kr/tnt/ui/model/DefaultUserProfile.kt b/core/ui/src/main/java/co/kr/tnt/ui/model/DefaultUserProfile.kt
@@ -2,7 +2,7 @@ package co.kr.tnt.ui.model
 
 import androidx.annotation.DrawableRes
 import co.kr.tnt.core.ui.R
-import co.kr.tnt.domain.model.UserType
+import co.kr.tnt.domain.model.User
 
 sealed class DefaultUserProfile(
     @DrawableRes val image: Int,
@@ -15,10 +15,10 @@ sealed class DefaultUserProfile(
     )
 
     companion object {
-        fun fromDomain(type: UserType): DefaultUserProfile {
+        fun fromDomain(type: User): DefaultUserProfile {
             return when (type) {
-                is UserType.Trainee -> Trainer
-                is UserType.Trainer -> Trainee
+                is User.Trainee -> Trainer
+                is User.Trainer -> Trainee
             }
         }
     }

diff --git a/data/network/src/main/java/co/kr/data/network/interceptor/SessionInterceptor.kt b/data/network/src/main/java/co/kr/data/network/interceptor/SessionInterceptor.kt
@@ -14,7 +14,7 @@ internal class SessionInterceptor @Inject constructor(
         val requestBuilder = originRequest.newBuilder()
 
         requestBuilder.addHeader(
-            "AUTHORIZATION",
+            "Authorization",
             "SESSION-ID ${runBlocking { sessionProvider.getSessionId() }}",
         )
 

diff --git a/data/network/src/main/java/co/kr/data/network/model/CheckSessionResponse.kt b/data/network/src/main/java/co/kr/data/network/model/CheckSessionResponse.kt
@@ -0,0 +1,9 @@
+package co.kr.data.network.model
+
+import co.kr.data.network.model.enum.MemberType
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CheckSessionResponse(
+    val memberType: MemberType,
+)
diff --git a/data/network/src/main/java/co/kr/data/network/model/LoginResponse.kt b/data/network/src/main/java/co/kr/data/network/model/LoginResponse.kt
@@ -1,5 +1,7 @@
 package co.kr.data.network.model
 
+import co.kr.data.network.model.enum.MemberType
+import co.kr.data.network.model.enum.toDomain
 import co.kr.tnt.domain.model.AuthType
 import co.kr.tnt.domain.model.LoginResult
 import kotlinx.serialization.Serializable
@@ -14,6 +16,7 @@ data class LoginResponse(
     val socialEmail: String,
     val socialType: AuthType,
     val isSignUp: Boolean,
+    val memberType: MemberType,
 )
 
 fun LoginResponse.toDomain(): LoginResult =
@@ -22,4 +25,5 @@ fun LoginResponse.toDomain(): LoginResult =
         email = socialEmail,
         authType = socialType,
         isSignUp = isSignUp,
+        userType = runCatching(memberType::toDomain).getOrNull(),
     )
diff --git a/data/network/src/main/java/co/kr/data/network/model/SignUpRequest.kt b/data/network/src/main/java/co/kr/data/network/model/SignUpRequest.kt
@@ -1,6 +1,6 @@
 package co.kr.data.network.model
 
-import co.kr.tnt.domain.model.UserType
+import co.kr.tnt.domain.model.User
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -21,14 +21,14 @@ data class SignUpRequest(
     val cautionNote: String? = "",
 )
 
-fun UserType.toSignUpRequest(
+fun User.toSignUpRequest(
     socialId: String,
     socialType: String,
     email: String,
     fcmToken: String,
 ): SignUpRequest {
     return when (this) {
-        is UserType.Trainer -> SignUpRequest(
+        is User.Trainer -> SignUpRequest(
             memberType = "trainer",
             name = name,
             birthday = null,
@@ -45,7 +45,7 @@ fun UserType.toSignUpRequest(
             advertisementAgreement = true,
         )
 
-        is UserType.Trainee -> SignUpRequest(
+        is User.Trainee -> SignUpRequest(
             memberType = "trainee",
             name = name,
             birthday = birthday?.toString(),

diff --git a/data/network/src/main/java/co/kr/data/network/model/enum/MemberType.kt b/data/network/src/main/java/co/kr/data/network/model/enum/MemberType.kt
@@ -0,0 +1,18 @@
+package co.kr.data.network.model.enum
+
+import co.kr.tnt.domain.model.UserType
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class MemberType {
+    TRAINER,
+    TRAINEE,
+    UNREGISTERED,
+}
+
+fun MemberType.toDomain(): UserType =
+    when (this) {
+        MemberType.TRAINER -> UserType.TRAINER
+        MemberType.TRAINEE -> UserType.TRAINEE
+        MemberType.UNREGISTERED -> error("등록되지 않은 유저입니다.")
+    }
diff --git a/data/network/src/main/java/co/kr/data/network/service/ApiService.kt b/data/network/src/main/java/co/kr/data/network/service/ApiService.kt
@@ -1,5 +1,6 @@
 package co.kr.data.network.service
 
+import co.kr.data.network.model.CheckSessionResponse
 import co.kr.data.network.model.LoginRequest
 import co.kr.data.network.model.LoginResponse
 import co.kr.data.network.model.SignUpResponse
@@ -14,7 +15,7 @@ import retrofit2.http.Part
 
 interface ApiService {
     @GET(CHECK_SESSION_PATH)
-    suspend fun getCheckSession()
+    suspend fun getCheckSession(): CheckSessionResponse
 
     @POST("/login")
     suspend fun postLogin(

diff --git a/data/repository/src/main/java/co/kr/data/repository/LoginRepositoryImpl.kt b/data/repository/src/main/java/co/kr/data/repository/LoginRepositoryImpl.kt
@@ -1,11 +1,13 @@
 package co.kr.data.repository
 
 import co.kr.data.network.model.LoginRequest
+import co.kr.data.network.model.enum.toDomain
 import co.kr.data.network.model.toDomain
 import co.kr.data.network.source.LoginRemoteDataSource
 import co.kr.data.storage.source.SessionLocalDataSource
 import co.kr.tnt.domain.model.AuthType
 import co.kr.tnt.domain.model.LoginResult
+import co.kr.tnt.domain.model.UserType
 import co.kr.tnt.domain.repository.LoginRepository
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -15,8 +17,8 @@ internal class LoginRepositoryImpl @Inject constructor(
     private val loginRemoteDataSource: LoginRemoteDataSource,
     private val sessionLocalDataSource: SessionLocalDataSource,
 ) : LoginRepository {
-    override suspend fun isNeedLogin(): Boolean =
-        runCatching { loginRemoteDataSource.getCheckSession() }.isFailure
+    override suspend fun getUserType(): UserType =
+        loginRemoteDataSource.getCheckSession().memberType.toDomain()
 
     override suspend fun login(
         authType: AuthType,

diff --git a/data/repository/src/main/java/co/kr/data/repository/SignUpRepositoryImpl.kt b/data/repository/src/main/java/co/kr/data/repository/SignUpRepositoryImpl.kt
@@ -6,7 +6,7 @@ import co.kr.data.network.model.toSignUpRequest
 import co.kr.data.network.source.SignUpRemoteDataSource
 import co.kr.data.storage.source.SessionLocalDataSource
 import co.kr.tnt.domain.model.SignUpResult
-import co.kr.tnt.domain.model.UserType
+import co.kr.tnt.domain.model.User
 import co.kr.tnt.domain.repository.SignUpRepository
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -25,7 +25,7 @@ class SignUpRepositoryImpl @Inject constructor(
 ) : SignUpRepository {
     override suspend fun signUp(
         profileImage: File?,
-        userType: UserType,
+        user: User,
         socialId: String,
         socialType: String,
         email: String,
@@ -36,13 +36,13 @@ class SignUpRepositoryImpl @Inject constructor(
         }
 
         // TODO FCM token
-        val signUpRequest = userType.toSignUpRequest(
+        val signUpRequest = user.toSignUpRequest(
             socialId = socialId,
             socialType = socialType,
             email = email,
             fcmToken = "EMPTY",
         )
-        val requestBody = signUpRequest.toRequestBody(Json)
+        val requestBody = signUpRequest.toRequestBody()
 
         val response = signupRemoteDataSource.postSignUp(
             profileImage = profileImagePart,
@@ -54,7 +54,7 @@ class SignUpRepositoryImpl @Inject constructor(
         return response.toDomain()
     }
 
-    private fun SignUpRequest.toRequestBody(json: Json): RequestBody {
+    private fun SignUpRequest.toRequestBody(): RequestBody {
         val jsonString = json.encodeToString(this)
         return jsonString.toRequestBody("application/json".toMediaTypeOrNull())
     }

diff --git a/domain/src/main/java/co/kr/tnt/domain/model/LoginResult.kt b/domain/src/main/java/co/kr/tnt/domain/model/LoginResult.kt
@@ -5,4 +5,5 @@ data class LoginResult(
     val email: String,
     val authType: AuthType,
     val isSignUp: Boolean,
+    val userType: UserType?,
 )
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
@@ -0,0 +1,49 @@
+package co.kr.tnt.domain.model
+
+import java.time.LocalDate
+
+sealed class User {
+    abstract val id: String
+    abstract val name: String
+    abstract val image: String?
+
+    data class Trainer(
+        override val id: String,
+        override val name: String,
+        override val image: String?,
+    ) : User() {
+        companion object {
+            val EMPTY = Trainer(
+                id = "",
+                name = "",
+                image = null,
+            )
+        }
+    }
+
+    data class Trainee(
+        override val id: String,
+        override val name: String,
+        override val image: String?,
+        val birthday: LocalDate?,
+        val age: Int?,
+        val weight: Double,
+        val height: Int,
+        val ptPurpose: List<String>,
+        val caution: String?,
+    ) : User() {
+        companion object {
+            val EMPTY = Trainee(
+                id = "",
+                name = "",
+                image = null,
+                birthday = null,
+                age = 0,
+                weight = 0.0,
+                height = 0,
+                ptPurpose = emptyList(),
+                caution = null,
+            )
+        }
+    }
+}
diff --git a/domain/src/main/java/co/kr/tnt/domain/model/UserType.kt b/domain/src/main/java/co/kr/tnt/domain/model/UserType.kt
@@ -1,27 +1,6 @@
 package co.kr.tnt.domain.model
 
-import java.time.LocalDate
-
-sealed class UserType {
-    abstract val id: String
-    abstract val name: String
-    abstract val image: String?
-
-    data class Trainer(
-        override val id: String,
-        override val name: String,
-        override val image: String?,
-    ) : UserType()
-
-    data class Trainee(
-        override val id: String,
-        override val name: String,
-        override val image: String?,
-        val birthday: LocalDate?,
-        val age: Int?,
-        val weight: Double,
-        val height: Int,
-        val ptPurpose: List<String>,
-        val caution: String?,
-    ) : UserType()
+enum class UserType {
+    TRAINER,
+    TRAINEE,
 }
diff --git a/domain/src/main/java/co/kr/tnt/domain/repository/LoginRepository.kt b/domain/src/main/java/co/kr/tnt/domain/repository/LoginRepository.kt
@@ -2,9 +2,10 @@ package co.kr.tnt.domain.repository
 
 import co.kr.tnt.domain.model.AuthType
 import co.kr.tnt.domain.model.LoginResult
+import co.kr.tnt.domain.model.UserType
 
 interface LoginRepository {
-    suspend fun isNeedLogin(): Boolean
+    suspend fun getUserType(): UserType
 
     suspend fun login(
         authType: AuthType,

diff --git a/domain/src/main/java/co/kr/tnt/domain/repository/SignUpRepository.kt b/domain/src/main/java/co/kr/tnt/domain/repository/SignUpRepository.kt
@@ -1,13 +1,13 @@
 package co.kr.tnt.domain.repository
 
 import co.kr.tnt.domain.model.SignUpResult
-import co.kr.tnt.domain.model.UserType
+import co.kr.tnt.domain.model.User
 import java.io.File
 
 interface SignUpRepository {
     suspend fun signUp(
         profileImage: File?,
-        userType: UserType,
+        user: User,
         socialId: String,
         socialType: String,
         email: String,

diff --git a/feature/login/src/main/java/co/kr/tnt/login/LoginContract.kt b/feature/login/src/main/java/co/kr/tnt/login/LoginContract.kt
@@ -3,6 +3,7 @@ package co.kr.tnt.login
 import co.kr.tnt.domain.model.AuthType
 import co.kr.tnt.domain.model.LoginResult
 import co.kr.tnt.domain.model.Term
+import co.kr.tnt.domain.model.UserType
 import co.kr.tnt.login.model.TermState
 import co.kr.tnt.ui.base.UiEvent
 import co.kr.tnt.ui.base.UiSideEffect
@@ -33,7 +34,7 @@ internal class LoginContract {
     sealed interface LoginSideEffect : UiSideEffect {
         data object ShowTermBottomSheet : LoginSideEffect
         data class ShowToast(val message: String) : LoginSideEffect
-        data object NavigateToHome : LoginSideEffect
+        data class NavigateToHome(val userType: UserType) : LoginSideEffect
         data class NavigateToSignup(val loginResult: LoginResult) : LoginSideEffect
     }
 }