Merge branch 'develop' into feat/LoginUI

Author: jife-archive

composeApp/src/commonMain/kotlin/com/nexters/emotia/di/Modules.kt

@@ -3,7 +3,7 @@ package com.nexters.emotia.di
 import com.nexters.emotia.core.data.chatting.di.dataChatModule
 import com.nexters.emotia.core.data.onboarding.di.dataOnboardingModule
 import com.nexters.emotia.core.domain.onboarding.di.domainOnboardingModule
-
+import com.nexters.emotia.core.platform.di.platformModule
 import com.nexters.emotia.feature.main.di.featureModule
 import com.nexters.emotia.network.di.coreNetworkModule
 import org.koin.dsl.module
@@ -12,6 +12,7 @@ val appModule =
     module {
         includes(
             coreNetworkModule,
+            platformModule,
             dataChatModule,
             dataOnboardingModule,
             domainOnboardingModule,

core/data/chatting/build.gradle.kts

@@ -17,9 +17,11 @@ kotlin {
             implementation(libs.ktor.serialization.kotlinx.json)
             implementation(libs.ktor.logging)
             implementation(libs.koin.core)
+            implementation(libs.kotlinx.datetime)
 
             implementation(projects.core.network)
             implementation(projects.core.domain.chatting)
+            implementation(projects.core.platform)
 
         }
         iosMain.dependencies {

core/data/chatting/src/commonMain/kotlin/com/nexters/emotia/core/data/chatting/datasource/ChattingRemoteDataSource.kt

@@ -7,7 +7,7 @@ import com.nexters.emotia.network.dto.response.SendChatResponse
 interface ChattingRemoteDataSource {
     suspend fun createRoom(username: String): CreateRoomResponse
     suspend fun sendChat(
-        roomId: Int,
+        roomId: String,
         message: String,
     ): SendChatResponse
 

core/data/chatting/src/commonMain/kotlin/com/nexters/emotia/core/data/chatting/datasource/ChattingRemoteDataSourceImpl.kt

@@ -17,11 +17,11 @@ class ChattingRemoteDataSourceImpl(
     }
 
     override suspend fun sendChat(
-        roomId: Int,
+        roomId: String,
         message: String,
     ): SendChatResponse {
         return apiService.sendChat(
-            chatRoomId = roomId.toString(),
+            chatRoomId = roomId,
             message = message,
         )
     }

core/data/chatting/src/commonMain/kotlin/com/nexters/emotia/core/data/chatting/di/DataChatModule.kt

@@ -14,5 +14,9 @@ val dataChatModule =
         singleOf(::ChattingRemoteDataSourceImpl).bind<ChattingRemoteDataSource>()
 
         // Repository 주입
-        singleOf(::ChattingRepositoryImpl).bind<ChattingRepository>()
+        single<ChattingRepository> {
+            ChattingRepositoryImpl(
+                remoteDataSource = get(),
+            )
+        }
     }

core/data/chatting/src/commonMain/kotlin/com/nexters/emotia/core/data/chatting/mapper/ChattingMapper.kt

@@ -3,10 +3,12 @@ package com.nexters.emotia.core.data.chatting.mapper
 import com.nexters.emotia.core.domain.chatting.entity.ChatMessage
 import com.nexters.emotia.core.domain.chatting.entity.ChattingRoom
 import com.nexters.emotia.core.domain.chatting.entity.Fairy
+import com.nexters.emotia.core.domain.chatting.entity.SenderType
 import com.nexters.emotia.network.dto.response.CreateRoomResponse
 import com.nexters.emotia.network.dto.response.FairyDto
 import com.nexters.emotia.network.dto.response.GetFairiesResponse
 import com.nexters.emotia.network.dto.response.SendChatResponse
+import kotlinx.datetime.Clock
 
 fun CreateRoomResponse.toDomain(): ChattingRoom {
     val roomData = this.data ?: throw IllegalStateException("응답 데이터가 없습니다")
@@ -21,7 +23,9 @@ fun SendChatResponse.toDomain(): ChatMessage {
     val chatData = this.data ?: throw IllegalStateException("응답 데이터가 없습니다")
 
     return ChatMessage(
-        message = chatData.message
+        message = chatData.message,
+        senderType = SenderType.OTHER,
+        timestamp = Clock.System.now().toEpochMilliseconds()
     )
 }
 

core/data/chatting/src/commonMain/kotlin/com/nexters/emotia/core/data/chatting/repository/ChattingRepositoryImpl.kt

@@ -25,7 +25,7 @@ class ChattingRepositoryImpl(
         }
     }
 
-    override suspend fun sendChat(roomId: Int, message: String): Result<ChatMessage> {
+    override suspend fun sendChat(roomId: String, message: String): Result<ChatMessage> {
         return runCatching {
             val response = remoteDataSource.sendChat(roomId, message)