🔀 ::(#55) Mypage에 통신한 것을 적용하기위한 리펙토링을 했습니다.

app/src/main/java/DMNavHost.kt

@@ -9,7 +9,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import view.Mypage.navigation.MyScreen
-import view.Mypage.navigation.navGationToMyPage
 import view.login.navigation.LoginScreen
 import view.login.navigation.navigateToLogin
 
@@ -20,11 +19,15 @@ fun DMNavHost(
     startDestination: String
 ){
 
+
     NavHost(navController = navController,
         startDestination =startDestination ){
         LoginScreen(navigateToHome = navController::navigateToLogin)
 
 
-        MyScreen(navGationToMyPage = navController::popBackStack)
+        MyScreen(
+            navigationBack = navController::popBackStack,
+            onErrorToast = { throwable, message ->}
+        )
     }
 }

data/src/main/java/remote/api/auth/UsersAPi.kt

@@ -9,7 +9,7 @@ interface UsersAPi {
     @GET("/{user_id}/profile")
     suspend fun getUsers(
         @Path("user_id") userId: UUID
-    ): List<UsersResponse>
+    ): UsersResponse
 
 
 

data/src/main/java/remote/datasource/users/UsersDataSource.kt

@@ -5,5 +5,5 @@ import remote.dto.users.response.UsersResponse
 import java.util.UUID
 
 interface UsersDataSource {
-    fun getUsers( userId: UUID): Flow<List<UsersResponse>>
-}
+    fun getUsers( userId: UUID): Flow<UsersResponse>
+}

data/src/main/java/remote/datasource/users/UsersDataSourceImpl.kt

@@ -11,6 +11,8 @@ class UsersDataSourceImpl @Inject constructor(
     private val usersService: UsersAPi
 ): UsersDataSource
 {
-    override fun getUsers(userId: UUID): Flow<List<UsersResponse>> =
-        performApiRequest { usersService.getUsers(userId = userId) }
+    override fun getUsers(
+        userId: UUID
+    ): Flow<UsersResponse> =
+        performApiRequest { usersService.getUsers( userId = userId) }
 }

data/src/main/java/remote/dto/myrank/response/MyRankResponse.kt

@@ -11,6 +11,7 @@ data class MyRankResponse (
     @Json(name = "userId") val userId: UUID,
     @Json(name = "rank") val rank: Int,
     @Json(name = "profileImage") val profileImage: String,
+    @Json(name = "roomNum") val roomNum: Int,
     @Json(name = "name") val name: String,
     @Json(name = "penaltyPoint") val penaltyPoint: Int,
 )
@@ -21,6 +22,7 @@ fun MyRankResponse.toModel() = MyRankResponseModel(
     rank = rank,
     profileImage = profileImage,
     name = name,
-    penaltyPoint = penaltyPoint
+    penaltyPoint = penaltyPoint,
+    roomNum = roomNum
 )
 

data/src/main/java/remote/dto/rank/response/RankResponse.kt

@@ -11,11 +11,13 @@ data class RankResponse(
     @Json(name = "rank") val rank: Int,
     @Json(name = "name") val name: String,
     @Json(name = "penaltyPoint") val penaltyPoint: Int,
+    @Json(name = "roomNum") val roomNum: Int,
 )
 
 fun RankResponse.toModel() = RankResponseModel(
     userId = userId,
     rank = rank,
     name = name,
-    penaltyPoint = penaltyPoint
+    penaltyPoint = penaltyPoint,
+    roomNum = roomNum
 )

data/src/main/java/remote/dto/users/response/UsersResponse.kt

@@ -15,6 +15,7 @@ data class UsersResponse (
     @Json(name = "myBecause") val myBecause: String,
     @Json(name = "because") val because: String,
     @Json(name = "Point-List") val pointList: Int,
+    @Json(name = "roomNum") val roomNum: Int,
 )
 
 fun UsersResponse.toModel() = UsersResponseModel(
@@ -25,5 +26,6 @@ fun UsersResponse.toModel() = UsersResponseModel(
     penaltyPoint = penaltyPoint,
     myBecause = myBecause,
     because = because,
-    pointList = pointList
+    pointList = pointList,
+    roomNum = roomNum
 )

data/src/main/java/repoistory/UsersRepositoryImpl.kt

@@ -12,8 +12,7 @@ import javax.inject.Inject
 class UsersRepositoryImpl @Inject constructor(
     private val usersDataSource: UsersDataSource
 ): UsersRepository {
-  
-    override suspend fun getUsers(userId: UUID): Flow<List<UsersResponseModel>> {
-        return usersDataSource.getUsers(userId = userId).map { list -> list.map { it.toModel() } }
+
+    override suspend fun getUsers(userId: UUID): Flow<UsersResponseModel> {
+        return usersDataSource.getUsers(userId = userId).map { it.toModel() } }
     }
-}

domain/src/main/java/model/myrank/response/MyRankResponseModel.kt

@@ -8,4 +8,5 @@ data class MyRankResponseModel(
     val name: String,
     val penaltyPoint: Int,
     val profileImage: String,
+    val roomNum: Int,
 )

domain/src/main/java/model/rank/response/RankResponseModel.kt

@@ -7,4 +7,5 @@ data class RankResponseModel(
     val rank: Int,
     val name: String,
     val penaltyPoint: Int,
+    val roomNum: Int,
 )

domain/src/main/java/model/users/response/UsersResponseModel.kt

@@ -11,4 +11,5 @@ data class UsersResponseModel (
      val myBecause: String,
      val because: String,
      val pointList: Int,
+     val roomNum: Int,
 )

domain/src/main/java/reopoistory/UsersRepository.kt

@@ -5,6 +5,6 @@ import model.users.response.UsersResponseModel
 import java.util.UUID
 
 interface UsersRepository {
-  
-  suspend fun getUsers(userId: UUID): Flow<List<UsersResponseModel>>
+
+    suspend fun getUsers(userId: UUID): Flow<UsersResponseModel>
 }

domain/src/main/java/usecase/Users/GetUsersUseCase.kt

@@ -9,6 +9,6 @@ import javax.inject.Inject
 class GetUsersUseCase @Inject constructor(
     private val usersRepository: UsersRepository
 ){
-    suspend operator fun invoke(userId: UUID): Flow<List<UsersResponseModel>> =
+    suspend operator fun invoke(userId: UUID): Flow<UsersResponseModel> =
         usersRepository.getUsers(userId = userId)
 }

presentation/src/main/java/view/Mypage/Screen/MyPage.kt

@@ -1,140 +1,113 @@
 package view.Mypage.Screen
 
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import model.users.response.UsersResponseModel
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import view.Mypage.component.DemeritList
 import view.Mypage.component.MyDemeritList
 import view.Mypage.component.MyClean
+import viewmodel.users.UsersViewModel
+import viewmodel.users.uistate.UsersUiState
 import java.util.UUID
 
+@Composable
+internal fun MyPageRoute(
+    modifier: Modifier = Modifier,
+    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit,
+    viewModel: UsersViewModel = hiltViewModel(LocalContext.current as ComponentActivity),
+    navigateToBack: () -> Unit,
+) {
+    val usersUiState by viewModel.usersUiState.collectAsStateWithLifecycle()
+
+    MyPage(
+        modifier = modifier,
+        onErrorToast = onErrorToast,
+        navigateToBack = navigateToBack,
+        usersUiState = usersUiState,
+        getUserCallBack = viewModel::getUsers,
+    )
+
+}
+
 @Composable
 fun MyPage(
     modifier: Modifier = Modifier,
-    data:UsersResponseModel
+    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit,
+    navigateToBack: () -> Unit,
+    usersUiState: UsersUiState,
+    getUserCallBack: (UUID) -> Unit,
+) {
+    val scrollState = rememberScrollState()
+    var uuid by remember { mutableStateOf(UUID.randomUUID()) }
 
-    ) {
+    LaunchedEffect(Unit) {
+        getUserCallBack(uuid)
+    }
     Column(
         modifier = modifier
             .fillMaxSize()
+            .verticalScroll(scrollState)
             .background(color = Color(0xFF1E1E1E))
     ) {
         Column(
-            modifier = Modifier.fillMaxWidth(),
-            verticalArrangement = Arrangement.Top,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(
+                    horizontal = 20.dp,
+                    vertical = 16.dp,
+                ),
+            verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
             horizontalAlignment = Alignment.Start,
         ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 20.dp, end = 235.dp),
-                horizontalAlignment = Alignment.Start,
-            ) {
-                Text(
-                    text = "안녕하세요", style = TextStyle(
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight(600),
-                        color = Color(0xFFFFFFFF),
-                    )
-                )
-                Text(
-                    text = AnnotatedString.Builder("${data.name}님").apply {
-                        addStyle(
-                            style = SpanStyle(
-                                color = Color(0xFF9BFFA6), fontSize = 27.sp  // 이산 부분의 글자 크기 설정
-                            ),
-                            start = 0, end = 2
-                        )
-                    }.
-                    toAnnotatedString(), style = TextStyle(
-                        fontSize = 22.sp,  // 기본 글자 크기
-                        fontWeight = FontWeight(900),
-                        color = Color(0xFFFFFFFF),
-                        textAlign = TextAlign.Start
-                    )
-                )
-            }
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(
-                        horizontal = 20.dp,
-                        vertical = 16.dp,
-                    ),
-                verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
-                horizontalAlignment = Alignment.Start,
-            ) {
-                MyClean(
-                    modifier = modifier,
-                    data.todayClean,
-                    data.penaltyPoint,
-                    data.cleanPoint,
-                    )
-
-            }
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 20.dp, end = 20.dp, bottom = 16.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
-                horizontalAlignment = Alignment.Start,
-            ) {
-                MyDemeritList(
-                    modifier = modifier,
-                    data.myBecause,
-                    data.penaltyPoint,
-                )
-            }
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 20.dp, end = 20.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
-                horizontalAlignment = Alignment.Start,
-            ) {
-                DemeritList(
-                    modifier = modifier,
-                    data.because,
-                    data.pointList,
-                )
-            }
+            MyClean(
+                usersUiState = usersUiState,
+                onErrorToast = onErrorToast,
+                modifier = modifier,
+            )
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 20.dp, end = 20.dp, bottom = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
+            horizontalAlignment = Alignment.Start,
+        ) {
+            MyDemeritList(
+                usersUiState = usersUiState,
+                onErrorToast = onErrorToast,
+                modifier = modifier,
+            )
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 20.dp, end = 20.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.Top),
+            horizontalAlignment = Alignment.Start,
+        ) {
+            DemeritList(
+                usersUiState = usersUiState,
+                onErrorToast = onErrorToast,
+            )
         }
     }
 }
-
-@Composable
-@Preview
-fun PreviewMyPage() {
-    MyPage(
-        data = UsersResponseModel(
-            because = "노트북",
-            cleanPoint = 3,
-            myBecause = "노트북",
-            pointList = 3,
-            name = "이산",
-            penaltyPoint = 1,
-            todayClean = "화장실",
-            userId = UUID.randomUUID(),
-
-
-
-            )
-    )
-}