Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qa/128 보낸 봉투 검색 시 검색결과와 관계 없는 봉투가 보이는 현상 #2

Merged
merged 3 commits into from
Jul 8, 2024
Merged

Qa/128 보낸 봉투 검색 시 검색결과와 관계 없는 봉투가 보이는 현상 #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a5ddc5
fix: 빈 문자열의 이름으로 모든 친구가 검색되는 문제 해결
yangsooplus Jun 3, 2024
cb7bf64
refactor: 보낸 봉투 검색 시 이름 검색과 금액 검색을 병렬적으로 처리하도록 수정
yangsooplus Jun 3, 2024
97c4605
chore: ktlint check
yangsooplus Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions feature/sent/src/main/java/com/susu/feature/envelopesearch/SentEnvelopeSearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import com.susu.domain.usecase.friend.SearchFriendUseCase
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toPersistentList
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.launch
import javax.inject.Inject

Expand Down Expand Up @@ -52,35 +54,38 @@ class SentEnvelopeSearchViewModel @Inject constructor(
}

fun getEnvelopeList(search: String) = viewModelScope.launch {
if (search.isEmpty()) return@launch
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p5) 요 부분 제외하구 ... 아래 async 사용한건 로직상 동일해보이는데 맞나요!?
async + await 사용해서 응답속도가 더 빨라졌겠군요~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵~ 로직 자체는 동일합니다~!
case1) 숫자X 검색어로 친구가 검색됨 -> 친구 id로 검색
case2) 숫자O, 친구 검색 결과 X -> 금액으로만 검색
case3) 숫자O, 친구 검색 결과 O (친구 이름에 숫자가 들어가는 경우) -> 친구 id, 금액으로 모두 검색


val searchedFriends = searchFriendUseCase(search).getOrThrow()

// 친구 검색 결과가 존재하면 봉투 검색
val envelopesByFriend = if (searchedFriends.isNotEmpty()) {
searchSentEnvelopeListUseCase(
param = SearchSentEnvelopeListUseCase.Param(
friendIds = searchedFriends.map { it.friend.id.toInt() },
),
)
} else {
Result.success(emptyList())
val envelopesByFriend = async {
if (searchedFriends.isNotEmpty()) {
searchSentEnvelopeListUseCase(
param = SearchSentEnvelopeListUseCase.Param(
friendIds = searchedFriends.map { it.friend.id.toInt() },
),
).getOrDefault(emptyList())
} else {
emptyList()
}
}

// 숫자 형식일 경우는 금액으로 봉투 검색
val envelopesByAmount = search.toLongOrNull()?.let { amount ->
searchSentEnvelopeListUseCase(
param = SearchSentEnvelopeListUseCase.Param(
fromAmount = amount,
toAmount = amount,
),
)
} ?: Result.success(emptyList())
val envelopesByAmount = async {
search.toLongOrNull()?.let { amount ->
searchSentEnvelopeListUseCase(
param = SearchSentEnvelopeListUseCase.Param(
fromAmount = amount,
toAmount = amount,
),
).getOrDefault(emptyList())
} ?: emptyList()
}

// 두가지 조건을 검색 완료 시 결과를 통합 표시
if (envelopesByFriend.isSuccess && envelopesByAmount.isSuccess) {
val searchedEnvelopes =
envelopesByFriend.getOrDefault(emptyList()) + envelopesByAmount.getOrDefault(emptyList())
intent { copy(envelopeList = searchedEnvelopes.toPersistentList()) }
}
val result = awaitAll(envelopesByFriend, envelopesByAmount).flatten()
intent { copy(envelopeList = result.toPersistentList()) }
}

private fun updateRecentSearchList(searchList: List<String>) {
Expand Down
Loading