[fix/#45] 친구 조회 오류 수정

depromeet · Jan 24, 2024 · 014a1e4 · 014a1e4
1 parent 7d75b8a
commit 014a1e4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.../main/java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/MyPageViewModel.kt b/.../main/java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/MyPageViewModel.kt
@@ -4,6 +4,7 @@ package com.teumteum.teumteum.presentation.mypage.setting.viewModel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.teumteum.domain.entity.Friend
+import com.teumteum.domain.entity.FriendMyPage
 import com.teumteum.domain.entity.UserInfo
 import com.teumteum.domain.repository.AuthRepository
 import com.teumteum.domain.repository.UserRepository
@@ -28,8 +29,8 @@ class MyPageViewModel @Inject constructor(
     private val _frontCardState = MutableStateFlow(FrontCard())
     val frontCardState: StateFlow<FrontCard> = _frontCardState
 
-    private val _friendsList = MutableStateFlow<List<Friend>>(emptyList())
-    val friendsList : StateFlow<List<Friend>> = _friendsList
+    private val _friendsList = MutableStateFlow<List<FriendMyPage>>(emptyList())
+    val friendsList : StateFlow<List<FriendMyPage>> = _friendsList
 
     init {
         loadUserInfo()

diff --git a/...a/com/teumteum/teumteum/presentation/mypage/setting/viewModel/RecommendDetailViewModel.kt b/...a/com/teumteum/teumteum/presentation/mypage/setting/viewModel/RecommendDetailViewModel.kt
@@ -3,6 +3,7 @@ package com.teumteum.teumteum.presentation.mypage.setting.viewModel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.teumteum.domain.entity.Friend
+import com.teumteum.domain.entity.FriendMyPage
 import com.teumteum.domain.entity.UserInfo
 import com.teumteum.domain.repository.SettingRepository
 import com.teumteum.domain.repository.UserRepository
@@ -38,10 +39,10 @@ class RecommendDetailViewModel @Inject constructor(
     private val _isFriend = MutableStateFlow<Boolean>(false)
     val isFriend: StateFlow<Boolean> = _isFriend.asStateFlow()
 
-    private val _friendsList = MutableStateFlow<List<Friend>>(emptyList())
-    val friendsList : StateFlow<List<Friend>> = _friendsList
+    private val _friendsList = MutableStateFlow<List<FriendMyPage>>(emptyList())
+    val friendsList : StateFlow<List<FriendMyPage>> = _friendsList
 
-    fun checkIfUserIsFriend(friendsList: List<Friend>, userId: Long) {
+    fun checkIfUserIsFriend(friendsList: List<FriendMyPage>, userId: Long) {
         _isFriend.value = friendsList.any { friend -> friend.id.toLong() == userId }
     }
 

diff --git a/...java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/SettingMeetingUiModel.kt b/...java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/SettingMeetingUiModel.kt
@@ -3,6 +3,7 @@ package com.teumteum.teumteum.presentation.mypage.setting.viewModel
 import android.content.Intent
 import androidx.annotation.DrawableRes
 import com.teumteum.domain.entity.Friend
+import com.teumteum.domain.entity.FriendMyPage
 import com.teumteum.teumteum.R
 
 data class Meeting(
@@ -17,7 +18,7 @@ data class Recommend(
     val characterId: Int,
 )
 
-fun Friend.toRecommend(): Recommend {
+fun FriendMyPage.toRecommend(): Recommend {
     return Recommend(
         id = this.id,
         characterId = this.characterId,

diff --git a/core/domain/src/main/java/com/teumteum/domain/entity/Friend.kt b/core/domain/src/main/java/com/teumteum/domain/entity/Friend.kt
@@ -14,9 +14,17 @@ data class Friend(
     val mannerTemperature: Int
 )
 
+@Serializable
+data class FriendMyPage(
+    val id: Int,
+    val characterId: Int,
+    val name: String,
+    val job: JobEntity,
+)
+
 @Serializable
 data class Friends(
-    val friends: List<Friend>
+    val friends: List<FriendMyPage>
 )