#91 관심 약 관련 데이터 모델 패키지 오류 수정

pknu-wap · Jun 7, 2023 · 9b97aee · 9b97aee
1 parent 1f57020
commit 9b97aee
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 35 deletions.
diff --git a/...m/android/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepository.kt b/...m/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<Result<List<InterestedMedicineListResponse.Medicine>>>
 
-    fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<AddInterestedMedicineResponse>>
+    fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<NewInterestedMedicineResponse>>
 
     fun deleteInterestedMedicine(medicineId: Long): Flow<Result<DeleteInterestedMedicineResponse>>
 

diff --git a/...droid/mediproject/core/data/remote/interestedmedicine/InterestedMedicineRepositoryImpl.kt b/...droid/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<Result<AddInterestedMedicineResponse>> =
+    override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<NewInterestedMedicineResponse>> =
         interestedMedicineDataSource.addInterestedMedicine(addInterestedMedicineParameter)
 
     override fun deleteInterestedMedicine(medicineId: Long): Flow<Result<DeleteInterestedMedicineResponse>> =

diff --git a/.../domain/src/main/java/com/android/mediproject/core/domain/GetInterestedMedicineUseCase.kt b/.../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/...icine/DeleteInterestedMedicineResponse.kt → ...icine/DeleteInterestedMedicineResponse.kt b/...icine/DeleteInterestedMedicineResponse.kt → ...icine/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/...terestedMedicine/InterestedMedicineDto.kt → ...terestedmedicine/InterestedMedicineDto.kt b/...terestedMedicine/InterestedMedicineDto.kt → ...terestedmedicine/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/...edicine/InterestedMedicineListResponse.kt → ...edicine/InterestedMedicineListResponse.kt b/...edicine/InterestedMedicineListResponse.kt → ...edicine/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/...dMedicine/IsInterestedMedicineResponse.kt → ...dmedicine/IsInterestedMedicineResponse.kt b/...dMedicine/IsInterestedMedicineResponse.kt → ...dmedicine/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/...Medicine/AddInterestedMedicineResponse.kt → ...medicine/NewInterestedMedicineResponse.kt b/...Medicine/AddInterestedMedicineResponse.kt → ...medicine/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
 )
diff --git a/...id/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt b/...id/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<Result<AddInterestedMedicineResponse>>
+    fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<NewInterestedMedicineResponse>>
 
     /**
      * 관심 약 삭제

diff --git a/...ediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt b/...ediproject/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<Result<AddInterestedMedicineResponse>> =
+    override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<NewInterestedMedicineResponse>> =
         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
@@ -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<AddInterestedMedicineResponse>
+    ): Response<NewInterestedMedicineResponse>
 
     /**
      * 관심 약 삭제

diff --git a/...ain/java/com/android/mediproject/feature/interestedmedicine/InterestedMedicineFragment.kt b/...ain/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/...ain/java/com/android/mediproject/feature/interestedmedicine/InterstedMedicineViewModel.kt b/...ain/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