[feat] #23 Profile API 연동을 위한 모듈 분리

app/src/main/java/com/dongguk/telepigeon/di/DataSourceModule.kt

@@ -2,7 +2,9 @@ package com.dongguk.telepigeon.di
 
 import com.dongguk.telepigeon.data.local.datasource.TelePigeonLocalDataSource
 import com.dongguk.telepigeon.data.local.datasourceimpl.TelePigeonLocalDataSourceImpl
+import com.dongguk.telepigeon.data.remote.datasource.ProfileRemoteDataSource
 import com.dongguk.telepigeon.data.remote.datasource.RoomRemoteDataSource
+import com.dongguk.telepigeon.data.remote.datasourceimpl.ProfileRemoteDataSourceImpl
 import com.dongguk.telepigeon.data.remote.datasourceimpl.RoomRemoteDataSourceImpl
 import dagger.Binds
 import dagger.Module
@@ -17,6 +19,10 @@ abstract class DataSourceModule {
     @Singleton
     abstract fun bindsTelePigeonLocalDataSource(telePigeonLocalDataSourceImpl: TelePigeonLocalDataSourceImpl): TelePigeonLocalDataSource
 
+    @Binds
+    @Singleton
+    abstract fun bindsProfileRemoteDataSource(profileRemoteDataSourceImpl: ProfileRemoteDataSourceImpl): ProfileRemoteDataSource
+
     @Binds
     @Singleton
     abstract fun bindsRoomRemoteDataSource(roomRemoteDataSourceImpl: RoomRemoteDataSourceImpl): RoomRemoteDataSource

app/src/main/java/com/dongguk/telepigeon/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package com.dongguk.telepigeon.di
 
+import com.dongguk.telepigeon.data.repositoryimpl.ProfileRepositoryImpl
 import com.dongguk.telepigeon.data.repositoryimpl.RoomRepositoryImpl
 import com.dongguk.telepigeon.data.repositoryimpl.TelePigeonRepositoryImpl
+import com.dongguk.telepigeon.domain.repository.ProfileRepository
 import com.dongguk.telepigeon.domain.repository.RoomRepository
 import com.dongguk.telepigeon.domain.repository.TelePigeonRepository
 import dagger.Binds
@@ -17,6 +19,10 @@ abstract class RepositoryModule {
     @Singleton
     abstract fun bindsTelePigeonRepository(telePigeonRepositoryImpl: TelePigeonRepositoryImpl): TelePigeonRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindsProfileRepository(profileRepositoryImpl: ProfileRepositoryImpl): ProfileRepository
+
     @Binds
     @Singleton
     abstract fun bindsRoomRepository(roomRepositoryImpl: RoomRepositoryImpl): RoomRepository

app/src/main/java/com/dongguk/telepigeon/di/ServiceModule.kt

@@ -1,5 +1,6 @@
 package com.dongguk.telepigeon.di
 
+import com.dongguk.telepigeon.data.remote.service.ProfileService
 import com.dongguk.telepigeon.data.remote.service.RoomService
 import com.dongguk.telepigeon.di.qualifier.TelePigeon
 import dagger.Module
@@ -12,6 +13,13 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object ServiceModule {
+    @Provides
+    @Singleton
+    fun providesProfileService(
+        @TelePigeon retrofit: Retrofit
+    ): ProfileService =
+        retrofit.create(ProfileService::class.java)
+
     @Provides
     @Singleton
     fun providesRoomService(

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/datasource/ProfileRemoteDataSource.kt

@@ -0,0 +1,13 @@
+package com.dongguk.telepigeon.data.remote.datasource
+
+import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto
+import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto
+import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto
+
+interface ProfileRemoteDataSource {
+    suspend fun getRoomKeywords(roomId: Int): BaseResponseDto<ResponseGetRoomKeywordsDto>
+    suspend fun getRoomExtra(roomId: Int): BaseResponseDto<ResponseGetRoomExtraDto>
+    suspend fun putRoomKeywordsExtra(roomId: Int, requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto): NullableBaseResponseDto<Unit>
+}

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/datasourceimpl/ProfileRemoteDataSourceImpl.kt

@@ -0,0 +1,20 @@
+package com.dongguk.telepigeon.data.remote.datasourceimpl
+
+import com.dongguk.telepigeon.data.remote.datasource.ProfileRemoteDataSource
+import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto
+import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto
+import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto
+import com.dongguk.telepigeon.data.remote.service.ProfileService
+import javax.inject.Inject
+
+class ProfileRemoteDataSourceImpl @Inject constructor(
+    private val profileService: ProfileService
+) : ProfileRemoteDataSource {
+    override suspend fun getRoomKeywords(roomId: Int): BaseResponseDto<ResponseGetRoomKeywordsDto> = profileService.getRoomKeywords(roomId = roomId)
+
+    override suspend fun getRoomExtra(roomId: Int): BaseResponseDto<ResponseGetRoomExtraDto> = profileService.getRoomExtra(roomId = roomId)
+
+    override suspend fun putRoomKeywordsExtra(roomId: Int, requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto): NullableBaseResponseDto<Unit> = profileService.putRoomKeywordsExtra(roomId = roomId, requestPutRoomKeywordsExtraDto = requestPutRoomKeywordsExtraDto)
+}

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/model/request/RequestPutRoomKeywordsExtraDto.kt

@@ -0,0 +1,16 @@
+package com.dongguk.telepigeon.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestPutRoomKeywordsExtraDto(
+    @SerialName("keywords")
+    val keywords: List<String>,
+    @SerialName("gender")
+    val gender: String,
+    @SerialName("ageRange")
+    val ageRange: String,
+    @SerialName("relation")
+    val relation: String
+)

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/model/response/ResponseGetRoomExtraDto.kt

@@ -0,0 +1,14 @@
+package com.dongguk.telepigeon.data.remote.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetRoomExtraDto(
+    @SerialName("gender")
+    val gender: String,
+    @SerialName("ageRange")
+    val ageRange: String,
+    @SerialName("relation")
+    val relation: String
+)

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/model/response/ResponseGetRoomKeywordsDto.kt

@@ -0,0 +1,10 @@
+package com.dongguk.telepigeon.data.remote.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetRoomKeywordsDto(
+    @SerialName("keywords")
+    val keywords: List<String>
+)

data-remote/src/main/java/com/dongguk/telepigeon/data/remote/service/ProfileService.kt

@@ -0,0 +1,36 @@
+package com.dongguk.telepigeon.data.remote.service
+
+import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto
+import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto
+import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PUT
+import retrofit2.http.Path
+
+interface ProfileService {
+    @GET("$ROOMS/{$ROOM_ID}/$KEYWORDS")
+    suspend fun getRoomKeywords(
+        @Path("${ROOM_ID}") roomId: Int,
+    ): BaseResponseDto<ResponseGetRoomKeywordsDto>
+
+    @GET("$ROOMS/{$ROOM_ID}/$EXTRA")
+    suspend fun getRoomExtra(
+        @Path("${ROOM_ID}") roomId: Int,
+    ): BaseResponseDto<ResponseGetRoomExtraDto>
+
+    @PUT("$ROOMS/${ROOM_ID}")
+    suspend fun putRoomKeywordsExtra(
+        @Path("${ROOM_ID}") roomId: Int,
+        @Body requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto
+    ): NullableBaseResponseDto<Unit>
+
+    companion object {
+        const val ROOMS = "rooms"
+        const val ROOM_ID = "roomId"
+        const val KEYWORDS = "keywords"
+        const val EXTRA = "extra"
+    }
+}

data/src/main/java/com/dongguk/telepigeon/data/mapper/ResponseGetRoomExtraDtoMapper.kt

@@ -0,0 +1,10 @@
+package com.dongguk.telepigeon.data.mapper
+
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto
+import com.dongguk.telepigeon.domain.model.RoomExtraModel
+
+fun ResponseGetRoomExtraDto.toRoomKeywordExtraModel() = RoomExtraModel(
+    gender = this.gender,
+    ageRange = this.ageRange,
+    relation = this.relation
+)

data/src/main/java/com/dongguk/telepigeon/data/mapper/ResponseGetRoomKeywordsDtoMapper.kt

@@ -0,0 +1,8 @@
+package com.dongguk.telepigeon.data.mapper
+
+import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto
+import com.dongguk.telepigeon.domain.model.RoomKeywordModel
+
+fun ResponseGetRoomKeywordsDto.toRoomKeywordModel() = RoomKeywordModel(
+    keywords = this.keywords.joinToString { ", " }
+)

data/src/main/java/com/dongguk/telepigeon/data/mapper/RoomKeywordsExtraModelMapper.kt

@@ -0,0 +1,11 @@
+package com.dongguk.telepigeon.data.mapper
+
+import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto
+import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel
+
+fun RoomKeywordsExtraModel.toRequestPutRoomKeywordsExtraDto() = RequestPutRoomKeywordsExtraDto(
+    keywords = this.keywords,
+    gender = this.gender,
+    ageRange = this.ageRange,
+    relation = this.relation
+)

data/src/main/java/com/dongguk/telepigeon/data/repositoryimpl/ProfileRepositoryImpl.kt

@@ -0,0 +1,27 @@
+package com.dongguk.telepigeon.data.repositoryimpl
+
+import com.dongguk.telepigeon.data.mapper.toRequestPutRoomKeywordsExtraDto
+import com.dongguk.telepigeon.data.mapper.toRoomKeywordExtraModel
+import com.dongguk.telepigeon.data.mapper.toRoomKeywordModel
+import com.dongguk.telepigeon.data.remote.datasource.ProfileRemoteDataSource
+import com.dongguk.telepigeon.domain.model.RoomExtraModel
+import com.dongguk.telepigeon.domain.model.RoomKeywordModel
+import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel
+import com.dongguk.telepigeon.domain.repository.ProfileRepository
+import javax.inject.Inject
+
+class ProfileRepositoryImpl @Inject constructor(
+    private val profileRemoteDataSource: ProfileRemoteDataSource
+) : ProfileRepository {
+    override suspend fun getRoomKeywords(roomId: Int): Result<RoomKeywordModel> = runCatching {
+        profileRemoteDataSource.getRoomKeywords(roomId = roomId).data.toRoomKeywordModel()
+    }
+
+    override suspend fun getRoomExtra(roomId: Int): Result<RoomExtraModel> = runCatching {
+        profileRemoteDataSource.getRoomExtra(roomId = roomId).data.toRoomKeywordExtraModel()
+    }
+
+    override suspend fun putRoomKeywordExtra(roomId: Int, roomKeywordsExtraModel: RoomKeywordsExtraModel): Result<Unit> = runCatching {
+        profileRemoteDataSource.putRoomKeywordsExtra(roomId = roomId, requestPutRoomKeywordsExtraDto = roomKeywordsExtraModel.toRequestPutRoomKeywordsExtraDto())
+    }
+}

domain/src/main/java/com/dongguk/telepigeon/domain/model/RoomKeywordExtraModel.kt → domain/src/main/java/com/dongguk/telepigeon/domain/model/RoomExtraModel.kt

@@ -1,6 +1,6 @@
 package com.dongguk.telepigeon.domain.model
 
-data class RoomKeywordExtraModel(
+data class RoomExtraModel(
     val gender: String,
     val ageRange: String,
     val relation: String,

domain/src/main/java/com/dongguk/telepigeon/domain/model/RoomKeywordsExtraModel.kt

@@ -0,0 +1,8 @@
+package com.dongguk.telepigeon.domain.model
+
+data class RoomKeywordsExtraModel(
+    val keywords: List<String>,
+    val gender: String,
+    val ageRange: String,
+    val relation: String,
+)

domain/src/main/java/com/dongguk/telepigeon/domain/repository/ProfileRepository.kt

@@ -0,0 +1,11 @@
+package com.dongguk.telepigeon.domain.repository
+
+import com.dongguk.telepigeon.domain.model.RoomExtraModel
+import com.dongguk.telepigeon.domain.model.RoomKeywordModel
+import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel
+
+interface ProfileRepository {
+    suspend fun getRoomKeywords(roomId: Int): Result<RoomKeywordModel>
+    suspend fun getRoomExtra(roomId: Int): Result<RoomExtraModel>
+    suspend fun putRoomKeywordExtra(roomId: Int, roomKeywordsExtraModel: RoomKeywordsExtraModel): Result<Unit>
+}

domain/src/main/java/com/dongguk/telepigeon/domain/usecase/GetRoomExtraUseCase.kt

@@ -0,0 +1,12 @@
+package com.dongguk.telepigeon.domain.usecase
+
+import com.dongguk.telepigeon.domain.repository.ProfileRepository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GetRoomExtraUseCase @Inject constructor(
+    private val profileRepository: ProfileRepository
+) {
+    suspend operator fun invoke(roomId: Int) = profileRepository.getRoomExtra(roomId = roomId)
+}

domain/src/main/java/com/dongguk/telepigeon/domain/usecase/GetRoomKeywordsUseCase.kt

@@ -0,0 +1,12 @@
+package com.dongguk.telepigeon.domain.usecase
+
+import com.dongguk.telepigeon.domain.repository.ProfileRepository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GetRoomKeywordsUseCase @Inject constructor(
+    private val profileRepository: ProfileRepository
+){
+    suspend operator fun invoke(roomId: Int) = profileRepository.getRoomKeywords(roomId = roomId)
+}

domain/src/main/java/com/dongguk/telepigeon/domain/usecase/PutRoomKeywordExtraUseCase.kt

@@ -0,0 +1,13 @@
+package com.dongguk.telepigeon.domain.usecase
+
+import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel
+import com.dongguk.telepigeon.domain.repository.ProfileRepository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PutRoomKeywordExtraUseCase @Inject constructor(
+    private val profileRepository: ProfileRepository
+) {
+    suspend operator fun invoke(roomId: Int, roomKeywordsExtraModel: RoomKeywordsExtraModel) = profileRepository.putRoomKeywordExtra(roomId = roomId, roomKeywordsExtraModel = roomKeywordsExtraModel)
+}

feature/src/main/java/com/dongguk/telepigeon/feature/setting/setting/SettingFragment.kt

@@ -53,9 +53,9 @@ class SettingFragment : BindingFragment<FragmentSettingBinding>({ FragmentSettin
             // TODO 서버통신 구현 후 collectData 함수로 해당 로직 이동
             etSettingKeyWordCurrent.editText.setText(settingViewModel.dummyRoomKeywordModel.keywords)
 
-            tvSettingKeyWordExtraGenderContent.text = settingViewModel.dummyRoomKeywordExtraModel.gender
-            tvSettingKeyWordAgeGroupContent.text = settingViewModel.dummyRoomKeywordExtraModel.ageRange
-            tvSettingKeyWordRelationshipContent.text = settingViewModel.dummyRoomKeywordExtraModel.relation
+            tvSettingKeyWordExtraGenderContent.text = settingViewModel.dummyRoomExtraModel.gender
+            tvSettingKeyWordAgeGroupContent.text = settingViewModel.dummyRoomExtraModel.ageRange
+            tvSettingKeyWordRelationshipContent.text = settingViewModel.dummyRoomExtraModel.relation
         }
     }
 

feature/src/main/java/com/dongguk/telepigeon/feature/setting/setting/SettingViewModel.kt

@@ -3,7 +3,7 @@ package com.dongguk.telepigeon.feature.setting.setting
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.dongguk.telepigeon.domain.model.RoomInfoModel
-import com.dongguk.telepigeon.domain.model.RoomKeywordExtraModel
+import com.dongguk.telepigeon.domain.model.RoomExtraModel
 import com.dongguk.telepigeon.domain.model.RoomKeywordModel
 import com.dongguk.telepigeon.domain.model.RoomWorryModel
 import com.dongguk.telepigeon.domain.usecase.GetRoomIdUseCase
@@ -41,8 +41,8 @@ class SettingViewModel
                 keywords = "운동, 영양제, 밥",
             )
 
-        val dummyRoomKeywordExtraModel =
-            RoomKeywordExtraModel(
+        val dummyRoomExtraModel =
+            RoomExtraModel(
                 gender = "남성",
                 ageRange = "20대",
                 relation = "자식",