-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
91 additions
and
34 deletions.
There are no files selected for viewing
22 changes: 0 additions & 22 deletions
22
...l/src/main/java/com/android/mediproject/core/model/favorites/FavoriteMedicinesResponse.kt
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
.../favorites/AddFavoriteMedicineResponse.kt → ...Medicine/AddInterestedMedicineResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| package com.android.mediproject.core.model.favorites | ||
| package com.android.mediproject.core.model.medicine.InterestedMedicine | ||
|
|
||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class AddFavoriteMedicineResponse( | ||
| data class AddInterestedMedicineResponse( | ||
| @SerialName("favoriteMedicineID") val favoriteMedicineID: Int, // 86 | ||
| @SerialName("message") val message: String | ||
| ) |
4 changes: 2 additions & 2 deletions
4
...vorites/DeleteFavoriteMedicineResponse.kt → ...icine/DeleteInterestedMedicineResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| package com.android.mediproject.core.model.favorites | ||
| package com.android.mediproject.core.model.medicine.InterestedMedicine | ||
|
|
||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class DeleteFavoriteMedicineResponse( | ||
| data class DeleteInterestedMedicineResponse( | ||
| @SerialName("message") val message: String | ||
| ) |
5 changes: 2 additions & 3 deletions
5
...l/favorites/IsFavoriteMedicineResponse.kt → ...dMedicine/IsInterestedMedicineResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| package com.android.mediproject.core.model.favorites | ||
|
|
||
| package com.android.mediproject.core.model.medicine.InterestedMedicine | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class IsFavoriteMedicineResponse( | ||
| data class IsInterestedMedicineResponse( | ||
| @SerialName("isFavorite") val isFavorite: Boolean, // false | ||
| @SerialName("message") val message: String | ||
| ) |
8 changes: 8 additions & 0 deletions
8
...va/com/android/mediproject/core/model/requestparameters/AddInterestedMedicineParameter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.android.mediproject.core.model.requestparameters | ||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class AddInterestedMedicineParameter( | ||
| val medicineId: Long | ||
| ) |
21 changes: 20 additions & 1 deletion
21
...id/mediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,28 @@ | ||
| 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.requestparameters.AddInterestedMedicineParameter | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| interface InterestedMedicineDataSource { | ||
| suspend fun getInterestedMedicineList() : Flow<Result<InterestedMedicineListResponse>> | ||
| suspend fun getInterestedMedicineList(): Flow<Result<InterestedMedicineListResponse>> | ||
|
|
||
| /** | ||
| * 관심 약 추가 | ||
| */ | ||
| fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<AddInterestedMedicineResponse>> | ||
|
|
||
| /** | ||
| * 관심 약 삭제 | ||
| */ | ||
| fun deleteInterestedMedicine(medicineId: Long): Flow<Result<DeleteInterestedMedicineResponse>> | ||
|
|
||
| /** | ||
| * 관심 약 여부 확인 | ||
| */ | ||
| fun isInterestedMedicine(medicineId: Long): Flow<Result<IsInterestedMedicineResponse>> | ||
| } |
32 changes: 28 additions & 4 deletions
32
...ediproject/core/network/datasource/interestedmedicine/InterestedMedicineDataSourceImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,43 @@ | ||
| 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.requestparameters.AddInterestedMedicineParameter | ||
| import com.android.mediproject.core.network.module.AwsNetworkApi | ||
| import com.android.mediproject.core.network.onResponse | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.channelFlow | ||
| import javax.inject.Inject | ||
|
|
||
| class InterestedMedicineDataSourceImpl @Inject constructor(private val awsNetworkApi: AwsNetworkApi) : | ||
| InterestedMedicineDataSource { | ||
| override suspend fun getInterestedMedicineList(): Flow<Result<InterestedMedicineListResponse>> = | ||
| class InterestedMedicineDataSourceImpl @Inject constructor(private val awsNetworkApi: AwsNetworkApi) : InterestedMedicineDataSource { | ||
| override suspend fun getInterestedMedicineList(): Flow<Result<InterestedMedicineListResponse>> = channelFlow { | ||
| awsNetworkApi.getInterestedMedicineList().onResponse().fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }) | ||
| .also { | ||
| trySend(it) | ||
| } | ||
| } | ||
|
|
||
| override fun addInterestedMedicine(addInterestedMedicineParameter: AddInterestedMedicineParameter): Flow<Result<AddInterestedMedicineResponse>> = | ||
| channelFlow { | ||
| awsNetworkApi.getInterestedMedicineList().onResponse() | ||
| awsNetworkApi.addInterestedMedicine(addInterestedMedicineParameter).onResponse() | ||
| .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { | ||
| trySend(it) | ||
| } | ||
| } | ||
|
|
||
| override fun deleteInterestedMedicine(medicineId: Long): Flow<Result<DeleteInterestedMedicineResponse>> = channelFlow { | ||
| awsNetworkApi.deleteInterestedMedicine(medicineId).onResponse() | ||
| .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { | ||
| trySend(it) | ||
| } | ||
| } | ||
|
|
||
| override fun isInterestedMedicine(medicineId: Long): Flow<Result<IsInterestedMedicineResponse>> = channelFlow { | ||
| awsNetworkApi.isInterestedMedicine(medicineId).onResponse() | ||
| .fold(onSuccess = { Result.success(it) }, onFailure = { Result.failure(it) }).also { | ||
| trySend(it) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters