feat: TOP-62 코드 리뷰 반영(UiModel) 생성

THT-Team · Sep 15, 2023 · c15da0e · c15da0e
1 parent 1f9afca
commit c15da0e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 11 deletions.
diff --git a/feature/chat/src/main/java/tht/feature/chat/component/ChatItem.kt b/feature/chat/src/main/java/tht/feature/chat/component/ChatItem.kt
@@ -21,10 +21,11 @@ import com.example.compose_ui.component.text.p.ThtP1
 import com.example.compose_ui.component.text.subtitle.ThtSubtitle2
 import com.example.compose_ui.extensions.noRippleClickable
 import com.tht.tht.domain.chat.model.ChatListModel
+import tht.feature.chat.model.ChatListUiModel
 
 @Composable
 internal fun ChatItem(
-    item: ChatListModel,
+    item: ChatListUiModel,
     isLoading: Boolean,
     onClickItem: () -> Unit,
 ) {
@@ -74,7 +75,7 @@ internal fun ChatItem(
 @Preview(showBackground = true, backgroundColor = 0xFF000000)
 internal fun ChatItemPreivew() {
     ChatItem(
-        item = ChatListModel(
+        item = ChatListUiModel(
             chatRoomIdx = 1L,
             partnerProfileUrl = "",
             partnerName = "스티치",

diff --git a/feature/chat/src/main/java/tht/feature/chat/component/LazyColumnChatItem.kt b/feature/chat/src/main/java/tht/feature/chat/component/LazyColumnChatItem.kt
@@ -10,10 +10,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import com.tht.tht.domain.chat.model.ChatListModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import tht.feature.chat.model.ChatListUiModel
 
 @Composable
 internal fun LazyColumnChatItem(
-    items: ImmutableList<ChatListModel>,
+    items: ImmutableList<ChatListUiModel>,
     isLoading: Boolean,
     onClickItem: () -> Unit,
 ) {

diff --git a/feature/chat/src/main/java/tht/feature/chat/component/detail/ChatDetailList.kt b/feature/chat/src/main/java/tht/feature/chat/component/detail/ChatDetailList.kt
@@ -30,11 +30,11 @@ import com.example.compose_ui.component.spacer.Spacer
 import com.example.compose_ui.component.text.caption.ThtCaption2
 import com.example.compose_ui.component.text.p.ThtP1
 import com.example.compose_ui.component.text.p.ThtP2
-import com.tht.tht.domain.chat.model.ChatListModel
 import kotlinx.collections.immutable.ImmutableList
+import tht.feature.chat.model.ChatListUiModel
 
 @Composable
-fun ChatDetailList(items: ImmutableList<ChatListModel>) {
+fun ChatDetailList(items: ImmutableList<ChatListUiModel>) {
     LazyColumn(
         modifier = Modifier
             .fillMaxSize()

diff --git a/feature/chat/src/main/java/tht/feature/chat/mapper/ChatListModelMapper.kt b/feature/chat/src/main/java/tht/feature/chat/mapper/ChatListModelMapper.kt
@@ -0,0 +1,13 @@
+package tht.feature.chat.mapper
+
+import com.tht.tht.domain.chat.model.ChatListModel
+import tht.feature.chat.model.ChatListUiModel
+
+
+fun ChatListModel.toModel() = ChatListUiModel(
+    chatRoomIdx = chatRoomIdx,
+    partnerName = partnerName,
+    partnerProfileUrl = partnerProfileUrl,
+    currentMessage = currentMessage,
+    messageTime = messageTime,
+)
diff --git a/feature/chat/src/main/java/tht/feature/chat/model/ChatListUiModel.kt b/feature/chat/src/main/java/tht/feature/chat/model/ChatListUiModel.kt
@@ -0,0 +1,9 @@
+package tht.feature.chat.model
+
+data class ChatListUiModel(
+    val chatRoomIdx: Long,
+    val partnerName: String,
+    val partnerProfileUrl: String,
+    val currentMessage: String,
+    val messageTime: String,
+)
diff --git a/feature/chat/src/main/java/tht/feature/chat/viewmodel/detail/ChatDetailViewModel.kt b/feature/chat/src/main/java/tht/feature/chat/viewmodel/detail/ChatDetailViewModel.kt
@@ -5,12 +5,12 @@ import com.example.compose_ui.common.viewmodel.Container
 import com.example.compose_ui.common.viewmodel.Store
 import com.example.compose_ui.common.viewmodel.intent
 import com.example.compose_ui.common.viewmodel.store
-import com.tht.tht.domain.chat.model.ChatListModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import tht.feature.chat.model.ChatListUiModel
 import tht.feature.chat.viewmodel.detail.sideeffect.ChatDetailSideEffect
 import tht.feature.chat.viewmodel.detail.state.ChatDetailState
 import tht.feature.chat.viewmodel.state.skeletonChatList
@@ -36,7 +36,7 @@ internal class ChatDetailViewModel @Inject constructor() :
                 ChatDetailState.ChatList(
                     isLoading = false,
                     chatList = persistentListOf(
-                        ChatListModel(
+                        ChatListUiModel(
                             chatRoomIdx = 1L,
                             partnerName = "하하",
                             partnerProfileUrl = "",

diff --git a/feature/chat/src/main/java/tht/feature/chat/viewmodel/detail/state/ChatDetailState.kt b/feature/chat/src/main/java/tht/feature/chat/viewmodel/detail/state/ChatDetailState.kt
@@ -1,12 +1,12 @@
 package tht.feature.chat.viewmodel.detail.state
 
-import com.tht.tht.domain.chat.model.ChatListModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import tht.feature.chat.model.ChatListUiModel
 
 sealed class ChatDetailState {
     data class ChatList(
         val isLoading: Boolean,
-        val chatList: ImmutableList<ChatListModel> = persistentListOf(),
+        val chatList: ImmutableList<ChatListUiModel> = persistentListOf(),
     ) : ChatDetailState()
 }
diff --git a/feature/chat/src/main/java/tht/feature/chat/viewmodel/state/ChatSkeleton.kt b/feature/chat/src/main/java/tht/feature/chat/viewmodel/state/ChatSkeleton.kt
@@ -1,10 +1,10 @@
 package tht.feature.chat.viewmodel.state
 
-import com.tht.tht.domain.chat.model.ChatListModel
 import kotlinx.collections.immutable.toImmutableList
+import tht.feature.chat.model.ChatListUiModel
 
 internal val skeletonChatList = (1..20).map {
-    ChatListModel(
+    ChatListUiModel(
         chatRoomIdx = it.toLong(),
         partnerName = it.toString(),
         partnerProfileUrl = "",