From e5146c2d0ff031d0667972a7e1b2a88b81d36ca0 Mon Sep 17 00:00:00 2001 From: JSPark <48265129+pknujsp@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:00:14 +0900 Subject: [PATCH] =?UTF-8?q?#219=20AppDataStore=EB=82=B4=20=EA=B3=84?= =?UTF-8?q?=EC=A0=95ID=20=EA=B4=80=EB=A0=A8=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20ServerNetwork=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EB=82=B4=20=EC=93=B0=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8A=94=20?= =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EC=A0=9C=EA=B3=B5?= =?UTF-8?q?=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/datastore/AppDataStore.kt | 1 - .../core/datastore/AppDataStoreImpl.kt | 13 +----------- .../core/datastore/DataStoreModule.kt | 1 - .../core/network/module/ServerNetwork.kt | 20 ++----------------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStore.kt b/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStore.kt index 82f3e9d0..32b161fc 100644 --- a/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStore.kt +++ b/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStore.kt @@ -6,7 +6,6 @@ interface AppDataStore { val userEmail: Flow val nickName: Flow val skipIntro: Flow - val myAccountId: Flow suspend fun saveMyAccountInfo(email: String, nickName: String) suspend fun saveNickName(nickName: String) suspend fun saveSkipIntro(skipIntro: Boolean) diff --git a/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStoreImpl.kt b/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStoreImpl.kt index 389520c2..3b86f4da 100644 --- a/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStoreImpl.kt +++ b/core/datastore/src/main/java/com/android/mediproject/core/datastore/AppDataStoreImpl.kt @@ -3,16 +3,14 @@ package com.android.mediproject.core.datastore import android.content.Context import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit -import androidx.datastore.preferences.core.longPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class AppDataStoreImpl @Inject constructor( +class AppDataStoreImpl( @ApplicationContext private val context: Context, ) : AppDataStore { private val Context.dataStore by preferencesDataStore("user_preferences") @@ -20,8 +18,6 @@ class AppDataStoreImpl @Inject constructor( private val KEY_USER_EMAIL = stringPreferencesKey("user_email") private val KEY_NICK_NAME = stringPreferencesKey("nick_name") private val KEY_SKIP_INTRO = booleanPreferencesKey("skip_intro") - private val KEY_MY_ACCOUNT_ID = longPreferencesKey("my_account_id") - override val userEmail: Flow = context.dataStore.data.map { it[KEY_USER_EMAIL] ?: "" } @@ -31,16 +27,10 @@ class AppDataStoreImpl @Inject constructor( it[KEY_SKIP_INTRO] ?: false } - override val myAccountId: Flow = context.dataStore.data.map { - it[KEY_MY_ACCOUNT_ID] ?: 0L - } - - override suspend fun saveMyAccountInfo(email: String, nickName: String) { context.dataStore.edit { it[KEY_USER_EMAIL] = email it[KEY_NICK_NAME] = nickName - it[KEY_MY_ACCOUNT_ID] = myAccountId } } @@ -56,7 +46,6 @@ class AppDataStoreImpl @Inject constructor( context.dataStore.edit { it[KEY_USER_EMAIL] = "" it[KEY_NICK_NAME] = "" - it[KEY_MY_ACCOUNT_ID] = 0 it[KEY_SKIP_INTRO] = false } } diff --git a/core/datastore/src/main/java/com/android/mediproject/core/datastore/DataStoreModule.kt b/core/datastore/src/main/java/com/android/mediproject/core/datastore/DataStoreModule.kt index 5f4a4221..9ecda429 100644 --- a/core/datastore/src/main/java/com/android/mediproject/core/datastore/DataStoreModule.kt +++ b/core/datastore/src/main/java/com/android/mediproject/core/datastore/DataStoreModule.kt @@ -12,7 +12,6 @@ import javax.inject.Singleton @InstallIn(SingletonComponent::class) object DataStoreModule { - @Provides @Singleton fun providesAppDataStore( 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 6eda7f95..4cec5b1e 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 @@ -23,7 +23,6 @@ import com.android.mediproject.core.model.requestparameters.GetMedicineIdParamet import com.android.mediproject.core.model.requestparameters.NewCommentParameter import com.android.mediproject.core.model.user.remote.ChangeNicknameResponse import com.android.mediproject.core.model.user.remote.ChangePasswordResponse -import com.android.mediproject.core.model.user.remote.UserResponse import com.android.mediproject.core.model.user.remote.WithdrawalResponse import com.android.mediproject.core.network.datasource.comments.CommentsDataSource import com.android.mediproject.core.network.datasource.comments.CommentsDataSourceImpl @@ -35,6 +34,7 @@ import com.android.mediproject.core.network.datasource.sign.SignDataSource import com.android.mediproject.core.network.datasource.sign.SignDataSourceImpl 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.sign.VerifyEmailImpl import com.android.mediproject.core.network.datasource.user.UserDataSource import com.android.mediproject.core.network.datasource.user.UserDataSourceImpl import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory @@ -94,27 +94,17 @@ object ServerNetwork { context, BuildConfig.AWS_USER_POOL, BuildConfig.AWS_USER_CLIENT_ID, BuildConfig.AWS_USER_CLIENT_SECRET, Regions.US_EAST_2, ) - return SignDataSourceImpl(SignInOutAWSImpl(userPool), SignUpAWSImpl(userPool)) + return SignDataSourceImpl(SignInOutAWSImpl(userPool), SignUpAWSImpl(userPool), VerifyEmailImpl(userPool)) } @Provides @Singleton fun providesGetMedicineIdDataSource(awsNetworkApi: AwsNetworkApi): MedicineIdDataSource = MedicineIdDataSourceImpl(awsNetworkApi) - @Provides - @Singleton - fun providesUserInfosDataSource(awsNetworkApi: AwsNetworkApi): UserInfoDataSource = UserInfoDataSourceImpl(awsNetworkApi) - @Provides @Singleton fun providesUserDataSource(awsNetworkApi: AwsNetworkApi, aesCoder: AesCoder): UserDataSource = UserDataSourceImpl(awsNetworkApi, aesCoder) - /* @Provides - @Singleton - fun providesTokenDataSource( - awsNetworkApi: AwsNetworkApi, - tokenServer: TokenServer, - ): TokenDataSource = TokenDataSourceImpl(awsNetworkApi, tokenServer)*/ } interface AwsNetworkApi { @@ -227,12 +217,6 @@ interface AwsNetworkApi { @Body getMedicineIdParameter: GetMedicineIdParameter, ): Response - /** - * 유저 정보 조회 - */ - @GET(value = "user") - suspend fun getUserInfo(): Response - /** * 관심 약 조회 */