diff --git a/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepository.kt b/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepository.kt index 9376f40c7..e8a74c837 100644 --- a/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepository.kt +++ b/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepository.kt @@ -1,17 +1,17 @@ package com.android.mediproject.core.data.remote.interestedmedicine -import com.android.mediproject.core.model.medicine.interestedMedicine.AddInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.DeleteInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineListResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.DeleteInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineListResponse +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.NewInterestedMedicineResponse import com.android.mediproject.core.model.requestparameters.AddInterestedMedicineParameter import kotlinx.coroutines.flow.Flow interface InterestedMedicineRepository { suspend fun getInterestedMedicineList(): Flow>> - fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> + fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> fun deleteInterestedMedicine(medicineId: Long): Flow> diff --git a/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepositoryImpl.kt b/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepositoryImpl.kt index 4e957770c..b46bcefc4 100644 --- a/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepositoryImpl.kt +++ b/core/data/src/main/java/com/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepositoryImpl.kt @@ -1,9 +1,9 @@ package com.android.mediproject.core.data.remote.interestedmedicine -import com.android.mediproject.core.model.medicine.interestedMedicine.AddInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.DeleteInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineListResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.DeleteInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineListResponse +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.NewInterestedMedicineResponse import com.android.mediproject.core.model.requestparameters.AddInterestedMedicineParameter import com.android.mediproject.core.network.datasource.interestedmedicine.InterestedMedicineDataSource import kotlinx.coroutines.flow.Flow @@ -21,7 +21,7 @@ class InterestedMedicineRepositoryImpl @Inject constructor(private val intereste }.collectLatest { trySend(it) } } - override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> = + override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> = interestedMedicineDataSource.addInterestedMedicine(addInterestedMedicineParameter) override fun deleteInterestedMedicine(medicineId: Long): Flow> = diff --git a/core/domain/src/main/java/com/android/mediproject/core/domain/GetInterestedMedicineUseCase.kt b/core/domain/src/main/java/com/android/mediproject/core/domain/GetInterestedMedicineUseCase.kt index 991f26f4c..ae2166bab 100644 --- a/core/domain/src/main/java/com/android/mediproject/core/domain/GetInterestedMedicineUseCase.kt +++ b/core/domain/src/main/java/com/android/mediproject/core/domain/GetInterestedMedicineUseCase.kt @@ -1,8 +1,8 @@ package com.android.mediproject.core.domain import com.android.mediproject.core.data.remote.interestedmedicine.InterestedMedicineRepository -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.toInterestedMedicineDto +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.toInterestedMedicineDto import com.android.mediproject.core.model.requestparameters.AddInterestedMedicineParameter import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow diff --git a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/DeleteInterestedMedicineResponse.kt b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/DeleteInterestedMedicineResponse.kt similarity index 73% rename from core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/DeleteInterestedMedicineResponse.kt rename to core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/DeleteInterestedMedicineResponse.kt index 0bbb4ec6f..9a40bccf8 100644 --- a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/DeleteInterestedMedicineResponse.kt +++ b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/DeleteInterestedMedicineResponse.kt @@ -1,4 +1,4 @@ -package com.android.mediproject.core.model.medicine.interestedMedicine +package com.android.mediproject.core.model.interestedmedicine import kotlinx.serialization.SerialName diff --git a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineDto.kt b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineDto.kt similarity index 55% rename from core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineDto.kt rename to core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineDto.kt index f886499b7..0ca1214c5 100644 --- a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineDto.kt +++ b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineDto.kt @@ -1,4 +1,4 @@ -package com.android.mediproject.core.model.medicine.interestedMedicine +package com.android.mediproject.core.model.interestedmedicine data class InterestedMedicineDto( val itemSeq: String, diff --git a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineListResponse.kt b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineListResponse.kt similarity index 92% rename from core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineListResponse.kt rename to core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineListResponse.kt index a7d2d705d..77203e082 100644 --- a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/InterestedMedicineListResponse.kt +++ b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/InterestedMedicineListResponse.kt @@ -1,4 +1,4 @@ -package com.android.mediproject.core.model.medicine.interestedMedicine +package com.android.mediproject.core.model.interestedmedicine import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/IsInterestedMedicineResponse.kt b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/IsInterestedMedicineResponse.kt similarity index 77% rename from core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/IsInterestedMedicineResponse.kt rename to core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/IsInterestedMedicineResponse.kt index ef9cfd952..f4bbc44b4 100644 --- a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/IsInterestedMedicineResponse.kt +++ b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/IsInterestedMedicineResponse.kt @@ -1,4 +1,4 @@ -package com.android.mediproject.core.model.medicine.interestedMedicine +package com.android.mediproject.core.model.interestedmedicine import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/AddInterestedMedicineResponse.kt b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/NewInterestedMedicineResponse.kt similarity index 66% rename from core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/AddInterestedMedicineResponse.kt rename to core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/NewInterestedMedicineResponse.kt index 27d4e9f0c..24ffe5f47 100644 --- a/core/model/src/main/java/com/android/mediproject/core/model/medicine/interestedMedicine/AddInterestedMedicineResponse.kt +++ b/core/model/src/main/java/com/android/mediproject/core/model/interestedmedicine/NewInterestedMedicineResponse.kt @@ -1,11 +1,11 @@ -package com.android.mediproject.core.model.medicine.interestedMedicine +package com.android.mediproject.core.model.interestedmedicine import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable -data class AddInterestedMedicineResponse( +data class NewInterestedMedicineResponse( @SerialName("favoriteMedicineID") val favoriteMedicineID: Int, // 86 @SerialName("message") val message: String ) \ No newline at end of file diff --git a/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt b/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt index c0b1e1dee..e39be547d 100644 --- a/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt +++ b/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt @@ -1,9 +1,9 @@ package com.android.mediproject.core.network.datasource.interestedmedicine -import com.android.mediproject.core.model.medicine.interestedMedicine.AddInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.DeleteInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineListResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.DeleteInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineListResponse +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.NewInterestedMedicineResponse import com.android.mediproject.core.model.requestparameters.AddInterestedMedicineParameter import kotlinx.coroutines.flow.Flow @@ -13,7 +13,7 @@ interface InterestedMedicineDataSource { /** * 관심 약 추가 */ - fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> + fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> /** * 관심 약 삭제 diff --git a/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt b/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt index 03dea152d..75b5d589e 100644 --- a/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt +++ b/core/network/src/main/java/com/android/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt @@ -1,9 +1,9 @@ package com.android.mediproject.core.network.datasource.interestedmedicine -import com.android.mediproject.core.model.medicine.interestedMedicine.AddInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.DeleteInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineListResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.DeleteInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineListResponse +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.NewInterestedMedicineResponse import com.android.mediproject.core.model.requestparameters.AddInterestedMedicineParameter import com.android.mediproject.core.network.module.AwsNetworkApi import com.android.mediproject.core.network.onResponse @@ -19,7 +19,7 @@ class InterestedMedicineDataSourceImpl @Inject constructor(private val awsNetwor } } - override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> = + override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow> = channelFlow { awsNetworkApi.addInterestedMedicine(addInterestedMedicineParameter).onResponse() .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { diff --git a/core/network/src/main/java/com/android/mediproject/core/network/module/AwsNetwork.kt b/core/network/src/main/java/com/android/mediproject/core/network/module/AwsNetwork.kt index 8ded7bd56..4ffb50030 100644 --- a/core/network/src/main/java/com/android/mediproject/core/network/module/AwsNetwork.kt +++ b/core/network/src/main/java/com/android/mediproject/core/network/module/AwsNetwork.kt @@ -6,11 +6,11 @@ import com.android.mediproject.core.datastore.TokenDataSourceImpl import com.android.mediproject.core.model.comments.CommentChangedResponse import com.android.mediproject.core.model.comments.CommentListResponse import com.android.mediproject.core.model.comments.LikeResponse +import com.android.mediproject.core.model.interestedmedicine.DeleteInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineListResponse +import com.android.mediproject.core.model.interestedmedicine.IsInterestedMedicineResponse +import com.android.mediproject.core.model.interestedmedicine.NewInterestedMedicineResponse import com.android.mediproject.core.model.medicine.MedicineIdResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.AddInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.DeleteInterestedMedicineResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineListResponse -import com.android.mediproject.core.model.medicine.interestedMedicine.IsInterestedMedicineResponse import com.android.mediproject.core.model.remote.sign.SignInResponse import com.android.mediproject.core.model.remote.sign.SignUpResponse import com.android.mediproject.core.model.remote.token.ReissueTokenResponse @@ -244,7 +244,7 @@ interface AwsNetworkApi { @POST(value = "medicine/favorite") suspend fun addInterestedMedicine( @Body addInterestedMedicineParameter: AddInterestedMedicineParameter - ): Response + ): Response /** * 관심 약 삭제 diff --git a/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterestedMedicineFragment.kt b/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterestedMedicineFragment.kt index 1943f40ad..6eb8e6070 100644 --- a/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterestedMedicineFragment.kt +++ b/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterestedMedicineFragment.kt @@ -11,7 +11,7 @@ import androidx.core.content.ContextCompat import androidx.core.net.toUri import androidx.fragment.app.viewModels import androidx.navigation.findNavController -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineDto +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineDto import com.android.mediproject.core.model.remote.token.CurrentTokenDto import com.android.mediproject.core.model.remote.token.TokenState import com.android.mediproject.core.ui.R diff --git a/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterstedMedicineViewModel.kt b/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterstedMedicineViewModel.kt index a98c58dbe..e47927da9 100644 --- a/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterstedMedicineViewModel.kt +++ b/feature/interestedmedicine/src/main/java/com/android/mediproject/feature/interestedmedicine/InterstedMedicineViewModel.kt @@ -3,7 +3,7 @@ package com.android.mediproject.feature.interestedmedicine import androidx.lifecycle.viewModelScope import com.android.mediproject.core.domain.GetInterestedMedicineUseCase import com.android.mediproject.core.domain.GetTokenUseCase -import com.android.mediproject.core.model.medicine.interestedMedicine.InterestedMedicineDto +import com.android.mediproject.core.model.interestedmedicine.InterestedMedicineDto import com.android.mediproject.core.model.remote.token.CurrentTokenDto import com.android.mediproject.core.model.remote.token.TokenState import com.android.mediproject.core.ui.base.BaseViewModel