-
Notifications
You must be signed in to change notification settings - Fork 0
[bugfix] 축제 제휴 데이터가 없는 경우에는 필터에서도 사라지도록 수정 #526
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.
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
Open
chlwhdtn03
wants to merge
1
commit into
develop
Choose a base branch
from
bugfix/festival_filter_not_disabled
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -40,6 +40,7 @@ data class MapState( | |||||||||||||||||||||
| val restaurantInfoList: List<RestaurantInfo> = emptyList(), | ||||||||||||||||||||||
| val storeType: StoreType? = null, | ||||||||||||||||||||||
| val selectedFilter: FilterType = FilterType.Mine, | ||||||||||||||||||||||
| val availableFilters: List<FilterType> = FilterType.entries, | ||||||||||||||||||||||
| val filterChangeResult: FilterChangeResult? = null, | ||||||||||||||||||||||
| ) { | ||||||||||||||||||||||
| sealed class FilterChangeResult { | ||||||||||||||||||||||
|
|
@@ -83,14 +84,24 @@ class MapViewModel @Inject constructor( | |||||||||||||||||||||
| _departmentId.value = newDepartmentId | ||||||||||||||||||||||
| _collegeId.value = newCollegeId | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| val hasFestival = allPartnerships.hasFestivalPartnership() | ||||||||||||||||||||||
| val availableFilters = if (hasFestival) { | ||||||||||||||||||||||
| FilterType.entries | ||||||||||||||||||||||
| } else { | ||||||||||||||||||||||
| listOf(FilterType.All, FilterType.Mine) | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
Comment on lines
+88
to
+92
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // Festival 제휴가 하나라도 있으면 Festival을 우선하고, 없으면 기존 기본 필터 규칙을 따른다. | ||||||||||||||||||||||
| val initialFilter = when { | ||||||||||||||||||||||
| allPartnerships.hasFestivalPartnership() -> FilterType.Festival | ||||||||||||||||||||||
| hasFestival -> FilterType.Festival | ||||||||||||||||||||||
| newDepartmentId == -1L -> FilterType.All | ||||||||||||||||||||||
| else -> FilterType.Mine | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| _uiState.value = UiState.Success( | ||||||||||||||||||||||
| MapState(selectedFilter = initialFilter), | ||||||||||||||||||||||
| MapState( | ||||||||||||||||||||||
| selectedFilter = initialFilter, | ||||||||||||||||||||||
| availableFilters = availableFilters, | ||||||||||||||||||||||
| ), | ||||||||||||||||||||||
| ) | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| when (initialFilter) { | ||||||||||||||||||||||
|
|
@@ -181,15 +192,9 @@ class MapViewModel @Inject constructor( | |||||||||||||||||||||
| if (prefetchedPartnerships == null) | ||||||||||||||||||||||
| _uiState.value = UiState.Loading | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| val partnerships = partnershipRepository.getAllPartnerships().mapNotNull { | ||||||||||||||||||||||
| val festivalInfos = | ||||||||||||||||||||||
| it.partnershipInfos.filter { info -> info.periodType == PeriodType.FESTIVAL } | ||||||||||||||||||||||
| if (festivalInfos.isEmpty()) return@mapNotNull null | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| it.copy( | ||||||||||||||||||||||
| partnershipInfos = festivalInfos | ||||||||||||||||||||||
| ) | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| val partnerships = | ||||||||||||||||||||||
| (prefetchedPartnerships ?: partnershipRepository.getAllPartnerships()) | ||||||||||||||||||||||
| .festivalPartnerships() | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| _uiState.value = UiState.Success( | ||||||||||||||||||||||
| currentData.copy( | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MapState의 초기값으로availableFilters가FilterType.entries로 설정되어 있습니다.fetchUserCollegeDepartment가 완료되기 전(UiState.Init또는Loading상태)에도 UI가 렌더링될 경우, 모든 필터가 잠시 노출되었다가 사라지는 현상이 발생할 수 있습니다. 초기값을 빈 리스트로 설정하거나, 항상 노출되는 기본 필터만 포함하는 것이 사용자 경험 측면에서 더 좋습니다.