[Refactor/#177] domain, presentation 계층간 model mapper를 구현합니다.

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthRemoteDataSource.kt

@@ -1,13 +1,13 @@
 package com.threegap.bitnagil.data.auth.datasource
 
-import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
-import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
-import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
+import com.threegap.bitnagil.data.auth.model.request.LoginRequest
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequest
+import com.threegap.bitnagil.data.auth.model.response.LoginResponse
 
 interface AuthRemoteDataSource {
-    suspend fun login(socialAccessToken: String, loginRequestDto: LoginRequestDto): Result<LoginResponseDto>
-    suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit>
+    suspend fun login(socialAccessToken: String, loginRequest: LoginRequest): Result<LoginResponse>
+    suspend fun submitAgreement(termsAgreementRequest: TermsAgreementRequest): Result<Unit>
     suspend fun logout(): Result<Unit>
     suspend fun withdrawal(reason: String): Result<Unit>
-    suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto>
+    suspend fun reissueToken(refreshToken: String): Result<LoginResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -1,10 +1,10 @@
 package com.threegap.bitnagil.data.auth.datasourceimpl
 
 import com.threegap.bitnagil.data.auth.datasource.AuthRemoteDataSource
-import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
-import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
+import com.threegap.bitnagil.data.auth.model.request.LoginRequest
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequest
 import com.threegap.bitnagil.data.auth.model.request.WithdrawalReasonRequest
-import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
+import com.threegap.bitnagil.data.auth.model.response.LoginResponse
 import com.threegap.bitnagil.data.auth.service.AuthService
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.common.safeUnitApiCall
@@ -13,14 +13,14 @@ import javax.inject.Inject
 class AuthRemoteDataSourceImpl @Inject constructor(
     private val authService: AuthService,
 ) : AuthRemoteDataSource {
-    override suspend fun login(socialAccessToken: String, loginRequestDto: LoginRequestDto): Result<LoginResponseDto> =
+    override suspend fun login(socialAccessToken: String, loginRequest: LoginRequest): Result<LoginResponse> =
         safeApiCall {
-            authService.postLogin(socialAccessToken, loginRequestDto)
+            authService.postLogin(socialAccessToken, loginRequest)
         }
 
-    override suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit> =
+    override suspend fun submitAgreement(termsAgreementRequest: TermsAgreementRequest): Result<Unit> =
         safeUnitApiCall {
-            authService.submitAgreement(termsAgreementRequestDto)
+            authService.submitAgreement(termsAgreementRequest)
         }
 
     override suspend fun logout(): Result<Unit> =
@@ -33,7 +33,7 @@ class AuthRemoteDataSourceImpl @Inject constructor(
             authService.postWithdrawal(WithdrawalReasonRequest(reason))
         }
 
-    override suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto> =
+    override suspend fun reissueToken(refreshToken: String): Result<LoginResponse> =
         safeApiCall {
             authService.postReissueToken(refreshToken)
         }

data/src/main/java/com/threegap/bitnagil/data/auth/model/request/LoginRequestDto.kt → data/src/main/java/com/threegap/bitnagil/data/auth/model/request/LoginRequest.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class LoginRequestDto(
+data class LoginRequest(
     @SerialName("socialType")
     val socialType: String,
 )

data/src/main/java/com/threegap/bitnagil/data/auth/model/request/TermsAgreementRequestDto.kt → data/src/main/java/com/threegap/bitnagil/data/auth/model/request/TermsAgreementRequest.kt

@@ -1,14 +1,22 @@
 package com.threegap.bitnagil.data.auth.model.request
 
+import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class TermsAgreementRequestDto(
+data class TermsAgreementRequest(
     @SerialName("agreedToTermsOfService")
     val agreedToTermsOfService: Boolean,
     @SerialName("agreedToPrivacyPolicy")
     val agreedToPrivacyPolicy: Boolean,
     @SerialName("isOverFourteen")
     val isOverFourteen: Boolean,
 )
+
+internal fun TermsAgreement.toDto() =
+    TermsAgreementRequest(
+        agreedToTermsOfService = this.agreedToTermsOfService,
+        agreedToPrivacyPolicy = this.agreedToPrivacyPolicy,
+        isOverFourteen = this.isOverFourteen,
+    )

data/src/main/java/com/threegap/bitnagil/data/auth/model/response/LoginResponseDto.kt → data/src/main/java/com/threegap/bitnagil/data/auth/model/response/LoginResponse.kt

@@ -1,15 +1,23 @@
 package com.threegap.bitnagil.data.auth.model.response
 
+import com.threegap.bitnagil.domain.auth.model.AuthSession
 import com.threegap.bitnagil.domain.auth.model.UserRole
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class LoginResponseDto(
+data class LoginResponse(
     @SerialName("accessToken")
     val accessToken: String,
     @SerialName("refreshToken")
     val refreshToken: String,
     @SerialName("role")
     val role: UserRole,
 )
+
+internal fun LoginResponse.toDomain() =
+    AuthSession(
+        accessToken = this.accessToken,
+        refreshToken = this.refreshToken,
+        role = this.role,
+    )

data/src/main/java/com/threegap/bitnagil/data/auth/repositoryimpl/AuthRepositoryImpl.kt

@@ -2,9 +2,9 @@ package com.threegap.bitnagil.data.auth.repositoryimpl
 
 import com.threegap.bitnagil.data.auth.datasource.AuthLocalDataSource
 import com.threegap.bitnagil.data.auth.datasource.AuthRemoteDataSource
-import com.threegap.bitnagil.data.auth.mapper.toDomain
-import com.threegap.bitnagil.data.auth.mapper.toDto
-import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
+import com.threegap.bitnagil.data.auth.model.request.LoginRequest
+import com.threegap.bitnagil.data.auth.model.request.toDto
+import com.threegap.bitnagil.data.auth.model.response.toDomain
 import com.threegap.bitnagil.domain.auth.model.AuthSession
 import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 import com.threegap.bitnagil.domain.auth.repository.AuthRepository
@@ -15,7 +15,7 @@ class AuthRepositoryImpl @Inject constructor(
     private val authLocalDataSource: AuthLocalDataSource,
 ) : AuthRepository {
     override suspend fun login(socialAccessToken: String, socialType: String): Result<AuthSession> =
-        authRemoteDataSource.login(socialAccessToken, LoginRequestDto(socialType))
+        authRemoteDataSource.login(socialAccessToken, LoginRequest(socialType))
             .map { it.toDomain() }
 
     override suspend fun submitAgreement(termsAgreement: TermsAgreement): Result<Unit> =

data/src/main/java/com/threegap/bitnagil/data/auth/service/AuthService.kt

@@ -1,9 +1,9 @@
 package com.threegap.bitnagil.data.auth.service
 
-import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
-import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
+import com.threegap.bitnagil.data.auth.model.request.LoginRequest
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequest
 import com.threegap.bitnagil.data.auth.model.request.WithdrawalReasonRequest
-import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
+import com.threegap.bitnagil.data.auth.model.response.LoginResponse
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.Header
@@ -15,12 +15,12 @@ interface AuthService {
     @Headers("No-Service-Token: true")
     suspend fun postLogin(
         @Header("SocialAccessToken") socialAccessToken: String,
-        @Body loginRequestDto: LoginRequestDto,
-    ): BaseResponse<LoginResponseDto>
+        @Body loginRequest: LoginRequest,
+    ): BaseResponse<LoginResponse>
 
     @POST("/api/v1/auth/agreements")
     suspend fun submitAgreement(
-        @Body termsAgreementRequestDto: TermsAgreementRequestDto,
+        @Body termsAgreementRequest: TermsAgreementRequest,
     ): BaseResponse<Unit>
 
     @POST("/api/v1/auth/withdrawal")
@@ -33,5 +33,5 @@ interface AuthService {
     @Headers("No-Service-Token: true", "Auto-Login: true")
     suspend fun postReissueToken(
         @Header("Refresh-Token") refreshToken: String,
-    ): BaseResponse<LoginResponseDto>
+    ): BaseResponse<LoginResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/datasource/EmotionDataSource.kt

@@ -1,11 +1,11 @@
 package com.threegap.bitnagil.data.emotion.datasource
 
 import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
+import com.threegap.bitnagil.data.emotion.model.response.DailyEmotionResponse
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
-import com.threegap.bitnagil.data.emotion.model.response.TodayEmotionResponseDto
 
 interface EmotionDataSource {
     suspend fun getEmotions(): Result<List<EmotionDto>>
     suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse>
-    suspend fun fetchTodayEmotion(currentDate: String): Result<TodayEmotionResponseDto>
+    suspend fun fetchDailyEmotion(currentDate: String): Result<DailyEmotionResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionDataSourceImpl.kt

@@ -4,8 +4,8 @@ import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
 import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
+import com.threegap.bitnagil.data.emotion.model.response.DailyEmotionResponse
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
-import com.threegap.bitnagil.data.emotion.model.response.TodayEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.service.EmotionService
 import javax.inject.Inject
 
@@ -25,8 +25,8 @@ class EmotionDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun fetchTodayEmotion(currentDate: String): Result<TodayEmotionResponseDto> =
+    override suspend fun fetchDailyEmotion(currentDate: String): Result<DailyEmotionResponse> =
         safeApiCall {
-            emotionService.fetchTodayEmotion(currentDate)
+            emotionService.fetchDailyEmotion(currentDate)
         }
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/DailyEmotionResponse.kt

@@ -0,0 +1,26 @@
+package com.threegap.bitnagil.data.emotion.model.response
+
+import com.threegap.bitnagil.domain.emotion.model.DailyEmotion
+import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DailyEmotionResponse(
+    @SerialName("emotionMarbleType")
+    val emotionMarbleType: EmotionMarbleType?,
+    @SerialName("emotionMarbleName")
+    val emotionMarbleName: String?,
+    @SerialName("imageUrl")
+    val imageUrl: String?,
+    @SerialName("emotionMarbleHomeMessage")
+    val emotionMarbleHomeMessage: String?,
+)
+
+fun DailyEmotionResponse.toDomain(): DailyEmotion =
+    DailyEmotion(
+        type = emotionMarbleType,
+        name = emotionMarbleName,
+        imageUrl = imageUrl,
+        homeMessage = emotionMarbleHomeMessage,
+    )

data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt

@@ -2,10 +2,10 @@ package com.threegap.bitnagil.data.emotion.repositoryImpl
 
 import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
 import com.threegap.bitnagil.data.emotion.model.response.toDomain
+import com.threegap.bitnagil.domain.emotion.model.DailyEmotion
 import com.threegap.bitnagil.domain.emotion.model.Emotion
 import com.threegap.bitnagil.domain.emotion.model.EmotionChangeEvent
 import com.threegap.bitnagil.domain.emotion.model.EmotionRecommendRoutine
-import com.threegap.bitnagil.domain.emotion.model.TodayEmotion
 import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -34,8 +34,8 @@ class EmotionRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun fetchTodayEmotion(currentDate: String): Result<TodayEmotion?> =
-        emotionDataSource.fetchTodayEmotion(currentDate).map { it.toDomain() }
+    override suspend fun fetchDailyEmotion(currentDate: String): Result<DailyEmotion> =
+        emotionDataSource.fetchDailyEmotion(currentDate).map { it.toDomain() }
 
     private val _emotionChangeEventFlow = MutableSharedFlow<EmotionChangeEvent>()
     override suspend fun getEmotionChangeEventFlow(): Flow<EmotionChangeEvent> = _emotionChangeEventFlow.asSharedFlow()

data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt

@@ -2,8 +2,8 @@ package com.threegap.bitnagil.data.emotion.service
 
 import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
+import com.threegap.bitnagil.data.emotion.model.response.DailyEmotionResponse
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
-import com.threegap.bitnagil.data.emotion.model.response.TodayEmotionResponseDto
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -20,7 +20,7 @@ interface EmotionService {
     ): BaseResponse<RegisterEmotionResponse>
 
     @GET("/api/v2/emotion-marbles/{searchDate}")
-    suspend fun fetchTodayEmotion(
+    suspend fun fetchDailyEmotion(
         @Path("searchDate") date: String,
-    ): BaseResponse<TodayEmotionResponseDto>
+    ): BaseResponse<DailyEmotionResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/file/datasource/FileDataSource.kt

@@ -1,12 +1,12 @@
 package com.threegap.bitnagil.data.file.datasource
 
-import com.threegap.bitnagil.data.file.model.request.FileInfoRequestDto
+import com.threegap.bitnagil.data.file.model.request.FileInfoRequest
 
 interface FileDataSource {
     /**
      * presigned URL 요청
      * @param fileInfos 파일 정보 리스트 (prefix + fileName)
      * @return key: S3 경로, value: presigned URL
      */
-    suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequestDto>): Result<Map<String, String>>
+    suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequest>): Result<Map<String, String>>
 }

data/src/main/java/com/threegap/bitnagil/data/file/datasourceImpl/FileDataSourceImpl.kt

@@ -2,14 +2,14 @@ package com.threegap.bitnagil.data.file.datasourceImpl
 
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.file.datasource.FileDataSource
-import com.threegap.bitnagil.data.file.model.request.FileInfoRequestDto
+import com.threegap.bitnagil.data.file.model.request.FileInfoRequest
 import com.threegap.bitnagil.data.file.service.FileService
 import javax.inject.Inject
 
 class FileDataSourceImpl @Inject constructor(
     private val fileService: FileService,
 ) : FileDataSource {
-    override suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequestDto>): Result<Map<String, String>> {
+    override suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequest>): Result<Map<String, String>> {
         return safeApiCall { fileService.fetchPresignedUrls(fileInfos) }
     }
 }

data/src/main/java/com/threegap/bitnagil/data/file/model/request/FileInfoRequestDto.kt → data/src/main/java/com/threegap/bitnagil/data/file/model/request/FileInfoRequest.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class FileInfoRequestDto(
+data class FileInfoRequest(
     @SerialName("prefix")
     val prefix: String,
     @SerialName("fileName")

data/src/main/java/com/threegap/bitnagil/data/file/repositoryImpl/FileRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.threegap.bitnagil.data.file.repositoryImpl
 
 import com.threegap.bitnagil.data.file.datasource.FileDataSource
-import com.threegap.bitnagil.data.file.model.request.FileInfoRequestDto
+import com.threegap.bitnagil.data.file.model.request.FileInfoRequest
 import com.threegap.bitnagil.data.file.uploader.ImageUploader
 import com.threegap.bitnagil.domain.file.model.ImageFile
 import com.threegap.bitnagil.domain.file.repository.FileRepository
@@ -17,7 +17,7 @@ class FileRepositoryImpl @Inject constructor(
     override suspend fun uploadImages(imageFiles: List<ImageFile>): Result<List<String>> {
         return runCatching {
             val fileInfos = imageFiles.map { imageFile ->
-                FileInfoRequestDto(prefix = imageFile.prefix, fileName = imageFile.name)
+                FileInfoRequest(prefix = imageFile.prefix, fileName = imageFile.name)
             }
 
             val presignedUrlMap: Map<String, String> = fileDataSource