From c8c8c93182238d3275938d4aa7e0d6a4061dc4f2 Mon Sep 17 00:00:00 2001 From: JSPark <48265129+pknujsp@users.noreply.github.com> Date: Mon, 11 Mar 2024 16:56:16 +0900 Subject: [PATCH] =?UTF-8?q?#219=20UserInfoDataSource=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=82=AD=EC=A0=9C,=20UserData?= =?UTF-8?q?SourceImpl=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/user/UserDataSourceImpl.kt | 57 +++++++------------ .../datasource/user/UserInfoDataSource.kt | 9 --- .../datasource/user/UserInfoDataSourceImpl.kt | 23 -------- .../core/network/module/ServerNetwork.kt | 2 - 4 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSource.kt delete mode 100644 core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSourceImpl.kt diff --git a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserDataSourceImpl.kt b/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserDataSourceImpl.kt index d52cba690..d6ee6de95 100644 --- a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserDataSourceImpl.kt +++ b/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserDataSourceImpl.kt @@ -17,46 +17,31 @@ import javax.inject.Inject class UserDataSourceImpl @Inject constructor( private val awsNetworkApi: AwsNetworkApi, private val aesCoder: AesCoder, -) : - UserDataSource { +) : UserDataSource { - /** - * 닉네임 변경 - */ - override suspend fun changeNickname(changeNicknameParameter: ChangeNicknameParameter): Flow> = - channelFlow { - awsNetworkApi.changeNickname(changeNicknameParameter).onResponse() - .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }) - .also { trySend(it) } - } + override suspend fun changeNickname(changeNicknameParameter: ChangeNicknameParameter): Flow> = channelFlow { + awsNetworkApi.changeNickname(changeNicknameParameter).onResponse() + .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { trySend(it) } + } + + override suspend fun changePassword(changePasswordParameter: ChangePasswordParameter): Flow> = channelFlow { + val password = WeakReference(aesCoder.encodePassword(changePasswordParameter.email, changePasswordParameter.newPassword)).get()!! + awsNetworkApi.changePassword(ChangePasswordParameter(password.toCharArray())).onResponse() + .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { trySend(it) } + } - /** - * 비밀번호 변경 - */ - override suspend fun changePassword(changePasswordParameter: ChangePasswordParameter): Flow> = - channelFlow { - val password = WeakReference(aesCoder.encodePassword(changePasswordParameter.email, changePasswordParameter.newPassword)).get()!! - awsNetworkApi.changePassword(ChangePasswordParameter(password.toCharArray())).onResponse() - .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }) - .also { trySend(it) } - } - /** - * 회원 탈퇴 - */ override suspend fun withdrawal(): Flow> = channelFlow { Log.d("wap", "UserDataSource : withdrawal()") - awsNetworkApi.withdrawal().onResponse() - .fold( - onSuccess = { - Log.d("wap", "dataSource : 성공") - Result.success(it) - }, - onFailure = { - Log.d("wap", "dataSource : 실패 에러내용 : $it") - Result.failure(it) - }, - ) - .also { trySend(it) } + awsNetworkApi.withdrawal().onResponse().fold( + onSuccess = { + Log.d("wap", "dataSource : 성공") + Result.success(it) + }, + onFailure = { + Log.d("wap", "dataSource : 실패 에러내용 : $it") + Result.failure(it) + }, + ).also { trySend(it) } } } diff --git a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSource.kt b/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSource.kt deleted file mode 100644 index 5b8b40d5c..000000000 --- a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSource.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.android.mediproject.core.network.datasource.user - -import com.android.mediproject.core.model.user.remote.UserResponse -import kotlinx.coroutines.flow.Flow - -interface UserInfoDataSource { - - fun getUserInfo(): Flow> -} \ No newline at end of file diff --git a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSourceImpl.kt b/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSourceImpl.kt deleted file mode 100644 index 086d52f92..000000000 --- a/core/network/src/main/java/com/android/mediproject/core/network/datasource/user/UserInfoDataSourceImpl.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.android.mediproject.core.network.datasource.user - -import com.android.mediproject.core.model.user.remote.UserResponse -import com.android.mediproject.core.network.module.AwsNetworkApi -import com.android.mediproject.core.network.onResponse -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.flow -import javax.inject.Inject - -class UserInfoDataSourceImpl @Inject constructor( - private val awsNetworkApi: AwsNetworkApi -) : UserInfoDataSource { - override fun getUserInfo(): Flow> = flow { - awsNetworkApi.getUserInfo().onResponse().fold(onSuccess = { response -> - Result.success(response) - }, onFailure = { - Result.failure(it) - }).also { - emit(it) - } - - } -} \ No newline at end of file diff --git a/core/network/src/main/java/com/android/mediproject/core/network/module/ServerNetwork.kt b/core/network/src/main/java/com/android/mediproject/core/network/module/ServerNetwork.kt index 176a15466..6eda7f95b 100644 --- a/core/network/src/main/java/com/android/mediproject/core/network/module/ServerNetwork.kt +++ b/core/network/src/main/java/com/android/mediproject/core/network/module/ServerNetwork.kt @@ -37,8 +37,6 @@ import com.android.mediproject.core.network.datasource.sign.SignInOutAWSImpl import com.android.mediproject.core.network.datasource.sign.SignUpAWSImpl import com.android.mediproject.core.network.datasource.user.UserDataSource import com.android.mediproject.core.network.datasource.user.UserDataSourceImpl -import com.android.mediproject.core.network.datasource.user.UserInfoDataSource -import com.android.mediproject.core.network.datasource.user.UserInfoDataSourceImpl import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module import dagger.Provides