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

[AN/USER] fix: 상세 화면 축제 목록 요청 로직 변경 및 Throwable 예외 처리 제거(#986) #987

Merged
merged 9 commits into from
May 20, 2024
Merged

[AN/USER] fix: 상세 화면 축제 목록 요청 로직 변경 및 Throwable 예외 처리 제거(#986) #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
736fb52
fix: 상세 페이지 요청 분기 재작성
SeongHoonC May 19, 2024
75f4c61
fix: Throwable 을 throw 하지 않도록 변경
SeongHoonC May 19, 2024
a8aa2a7
feat: 마이페이지 개인정보처리약관 사이트 주소 변경
SeongHoonC May 20, 2024
c1241a5
feat(MyPage): 로그인 유무와 상관없이 기본 이미지를 프로필로 보여준다
SeongHoonC May 20, 2024
5e80a24
feat(Bookmark): 북마크 탭 선택된 아이템만 진하게 표시
SeongHoonC May 20, 2024
3c69967
fix(ArtistDetail): 로그인 유무로 데이터가 잘못 들어오는 것 수정
SeongHoonC May 20, 2024
6e9de31
feat: 대학교 이미지를 디폴트 값으로 변경한다
SeongHoonC May 20, 2024
befb4c6
feat: 라인업이 공개되지 않았어요 로직을 뷰바인딩으로 변경
SeongHoonC May 20, 2024
fdf3a1d
refactor: ktlint check
SeongHoonC May 20, 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
1 change: 0 additions & 1 deletion android/festago/data/src/main/java/com/festago/festago/data/util/ResponseExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,5 @@ private fun <T> handleBadRequestException(response: Response<T>) {
throw BookmarkLimitExceededException()
}
}
throw Throwable("400 Bad Request")
}
}
27 changes: 16 additions & 11 deletions ...n/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ class ArtistDetailViewModel @Inject constructor(
runCatching {
val deferredArtistDetail =
async { artistRepository.loadArtistDetail(id, delayTimeMillis) }
val deferredFestivals = async { artistRepository.loadArtistFestivals(id, 10) }
val deferredFestivals = async {
artistRepository.loadArtistFestivals(id = id, size = FESTIVAL_PAGE_SIZE)
}

val artist = deferredArtistDetail.await().getOrThrow()
val festivalPage = deferredFestivals.await().getOrThrow()

Expand All @@ -66,7 +69,7 @@ class ArtistDetailViewModel @Inject constructor(
artist = artist,
bookMarked = isBookmarked,
festivals = festivalPage.toUiState(),
userRepository.isSigned(),
festivalPage.isLastPage,
onBookmarkClick = ::toggleArtistBookmark,
)

Expand All @@ -89,18 +92,19 @@ class ArtistDetailViewModel @Inject constructor(

viewModelScope.launch {
val currentFestivals = successUiState.festivals
val lastItem = successUiState.festivals.lastOrNull()
val isPast = when {
lastItem == null -> true
lastItem.endDate < LocalDate.now() -> true
successUiState.isLast -> true
else -> false
}
val lastItem = currentFestivals.lastOrNull()
val isPast =
lastItem?.endDate?.isBefore(LocalDate.now()) ?: true || successUiState.isLast

val lastFestivalId = if (successUiState.isLast) null else lastItem?.id
val lastStartDate = if (successUiState.isLast) null else lastItem?.startDate

artistRepository.loadArtistFestivals(
id = artistId,
lastFestivalId = currentFestivals.lastOrNull()?.id,
lastStartDate = currentFestivals.lastOrNull()?.startDate,
lastFestivalId = lastFestivalId,
lastStartDate = lastStartDate,
isPast = isPast,
size = FESTIVAL_PAGE_SIZE,
).onSuccess { festivalsPage ->
_uiState.value = successUiState.copy(
festivals = currentFestivals + festivalsPage.toUiState(),
Expand Down Expand Up @@ -189,6 +193,7 @@ class ArtistDetailViewModel @Inject constructor(
}

companion object {
private const val FESTIVAL_PAGE_SIZE = 20
private const val KEY_LOAD_ARTIST_DETAIL = "KEY_LOAD_ARTIST_DETAIL"
private const val KEY_LOAD_MORE_ARTIST_FESTIVAL = "KEY_LOAD_MORE_ARTIST_FESTIVAL"
}
Expand Down
1 change: 1 addition & 0 deletions ...o/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class ArtistDetailFestivalViewHolder(
fun bind(item: FestivalItemUiState) {
binding.item = item
artistAdapter.submitList(item.artists)
binding.tvEmptyStage.visibility = if (item.artists.isEmpty()) View.VISIBLE else View.GONE
bindDDayView(item)
}

Expand Down
1 change: 1 addition & 0 deletions ...presentation/ui/home/bookmarklist/festivalbookmark/adapater/FestivalBookmarkViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class FestivalBookmarkViewHolder(
fun bind(item: FestivalBookmarkItemUiState) {
binding.item = item
artistAdapter.submitList(item.artists)
binding.tvEmptyStage.visibility = if (item.artists.isEmpty()) View.VISIBLE else View.GONE
bindDDayView(item)
}

Expand Down
1 change: 1 addition & 0 deletions ...tago/festago/presentation/ui/home/festivallist/festival/FestivalListFestivalViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class FestivalListFestivalViewHolder(
fun bind(item: FestivalItemUiState) {
binding.item = item
artistAdapter.submitList(item.artists)
binding.tvEmptyStage.visibility = if (item.artists.isEmpty()) View.VISIBLE else View.GONE
bindDDayView(item)
}

Expand Down
2 changes: 1 addition & 1 deletion ...sentation/src/main/java/com/festago/festago/presentation/ui/home/mypage/MyPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class MyPageFragment : Fragment() {
binding.tvPersonalInfoPolicy.setOnClickListener {
val intent = Intent(Intent.ACTION_VIEW)
intent.data =
Uri.parse("https://wooteco-ash.notion.site/fe0ca28535044db999d998eb4ea37e83")
Uri.parse("https://sites.google.com/view/privacy-festago")
startActivity(intent)
}
}
Expand Down
1 change: 1 addition & 0 deletions ...n/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFestivalViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class SchoolDetailFestivalViewHolder(
fun bind(item: FestivalItemUiState) {
binding.item = item
artistAdapter.submitList(item.artists)
binding.tvEmptyStage.visibility = if (item.artists.isEmpty()) View.VISIBLE else View.GONE
bindDDayView(item)
}

Expand Down
3 changes: 0 additions & 3 deletions ...on/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import com.festago.festago.presentation.R
import com.festago.festago.presentation.databinding.FragmentSchoolDetailBinding
import com.festago.festago.presentation.databinding.ItemMediaBinding
import com.festago.festago.presentation.ui.artistdetail.ArtistDetailArgs
import com.festago.festago.presentation.ui.bindingadapter.setImage
import com.festago.festago.presentation.ui.festivaldetail.FestivalDetailArgs
import com.festago.festago.presentation.ui.schooldetail.uistate.MoreItemUiState
import com.festago.festago.presentation.ui.schooldetail.uistate.SchoolDetailUiState
Expand Down Expand Up @@ -74,7 +73,6 @@ class SchoolDetailFragment : Fragment() {

private fun loadSchoolDetail() {
binding.tvSchoolName.text = args.school.name
binding.ivSchoolLogoImage.setImage(args.school.profileImageUrl)
val delayTimeMillis = resources.getInteger(R.integer.nav_Anim_time).toLong()
vm.loadSchoolDetail(args.school.id, delayTimeMillis)
}
Expand All @@ -97,7 +95,6 @@ class SchoolDetailFragment : Fragment() {
binding.successUiState = uiState
binding.ivBookmark.isSelected = uiState.bookmarked
binding.tvSchoolName.text = uiState.schoolInfo.schoolName
binding.ivSchoolLogoImage.setImage(uiState.schoolInfo.logoUrl)
val items: List<Any> = if (uiState.isLast) {
uiState.festivals
} else {
Expand Down
22 changes: 12 additions & 10 deletions ...n/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ class SchoolDetailViewModel @Inject constructor(
viewModelScope.launch {
val deferredSchoolInfo =
async { schoolRepository.loadSchoolInfo(schoolId, delayTimeMillis) }
val deferredFestivalPage = async { schoolRepository.loadSchoolFestivals(schoolId) }
val deferredFestivalPage = async {
schoolRepository.loadSchoolFestivals(schoolId = schoolId, size = FESTIVAL_PAGE_SIZE)
}

runCatching {
val schoolInfo = deferredSchoolInfo.await().getOrThrow()
Expand Down Expand Up @@ -87,18 +89,17 @@ class SchoolDetailViewModel @Inject constructor(

viewModelScope.launch {
val currentFestivals = successUiState.festivals
val lastItem = successUiState.festivals.lastOrNull()
val isPast = when {
lastItem == null -> true
lastItem.endDate > LocalDate.now() -> true
successUiState.isLast -> true
else -> false
}
val lastItem = currentFestivals.lastOrNull()
val isPast =
lastItem?.endDate?.isBefore(LocalDate.now()) ?: true || successUiState.isLast
val lastFestivalId = if (successUiState.isLast) null else lastItem?.id
val lastStartDate = if (successUiState.isLast) null else lastItem?.startDate
schoolRepository.loadSchoolFestivals(
schoolId = schoolId,
lastFestivalId = currentFestivals.lastOrNull()?.id?.toInt(),
lastStartDate = currentFestivals.lastOrNull()?.startDate,
lastFestivalId = lastFestivalId?.toInt(),
lastStartDate = lastStartDate,
isPast = isPast,
size = FESTIVAL_PAGE_SIZE,
).onSuccess { festivalsPage ->
_uiState.value = successUiState.copy(
festivals = currentFestivals + festivalsPage.festivals.map { it.toUiState() },
Expand Down Expand Up @@ -185,6 +186,7 @@ class SchoolDetailViewModel @Inject constructor(
)

companion object {
private const val FESTIVAL_PAGE_SIZE = 20
private const val KEY_LOAD_SCHOOL_DETAIL = "KEY_LOAD_SCHOOL_DETAIL"
private const val KEY_LOAD_MORE_SCHOOL_FESTIVALS = "KEY_LOAD_MORE_SCHOOL_FESTIVALS"
}
Expand Down
1 change: 1 addition & 0 deletions ...ava/com/festago/festago/presentation/ui/search/festivalsearch/FestivalSearchViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class FestivalSearchViewHolder(
fun bind(item: FestivalSearchItemUiState) {
binding.item = item
artistAdapter.submitList(item.artists)
binding.tvEmptyStage.visibility = if (item.artists.isEmpty()) View.VISIBLE else View.GONE
binding.tvFestivalDDay.bindFestivalDday(item)
}

Expand Down
2 changes: 1 addition & 1 deletion android/festago/presentation/src/main/res/layout/fragment_bookmark_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
app:tabIndicatorHeight="2dp"
app:tabSelectedTextColor="@color/contents_gray_07"
app:tabTextAppearance="@style/H4Bold16Lh20"
app:tabTextColor="@color/contents_gray_07">
app:tabTextColor="@color/contents_gray_05">

<com.google.android.material.tabs.TabItem
android:id="@+id/tiBookmarkListFestival"
Expand Down
7 changes: 3 additions & 4 deletions android/festago/presentation/src/main/res/layout/fragment_my_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@
android:gravity="center_vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/tvMyPageAppbar"
android:visibility="gone">
app:layout_constraintTop_toBottomOf="@id/tvMyPageAppbar">

<androidx.cardview.widget.CardView
android:id="@+id/cvProfileImage"
Expand All @@ -92,10 +91,10 @@

<ImageView
android:id="@+id/ivProfileImage"
imageUrl="@{successUiState.userInfo.profileImageUrl}"
android:layout_width="60dp"
android:layout_height="60dp"
android:contentDescription="@null" />
android:contentDescription="@null"
android:src="@drawable/ic_user_profile_default" />

</androidx.cardview.widget.CardView>

Expand Down
1 change: 0 additions & 1 deletion android/festago/presentation/src/main/res/layout/item_artist_detail_festival.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
<TextView
android:id="@+id/tvEmptyStage"
style="@style/H5Bold14Lh16"
visibility="@{item.artists.isEmpty()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
Expand Down
1 change: 0 additions & 1 deletion android/festago/presentation/src/main/res/layout/item_festival_bookmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<TextView
android:id="@+id/tvEmptyStage"
style="@style/H5Bold14Lh16"
visibility="@{item.artists.isEmpty()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
Expand Down
1 change: 0 additions & 1 deletion android/festago/presentation/src/main/res/layout/item_festival_list_festival.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<TextView
android:id="@+id/tvEmptyStage"
style="@style/H5Bold14Lh16"
visibility="@{item.artists.isEmpty()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
Expand Down
3 changes: 1 addition & 2 deletions android/festago/presentation/src/main/res/layout/item_school_bookmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@

<ImageView
android:id="@+id/ivFestivalImage"
imageUrl="@{school.imageUrl}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/festival_list_iv_image"
android:scaleType="centerCrop"
tools:src="@color/background_gray_03" />
android:src="@drawable/img_default_school" />
</androidx.cardview.widget.CardView>

<TextView
Expand Down
1 change: 0 additions & 1 deletion android/festago/presentation/src/main/res/layout/item_school_detail_festival.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<TextView
android:id="@+id/tvEmptyStage"
style="@style/H5Bold14Lh16"
visibility="@{item.artists.isEmpty()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
Expand Down
11 changes: 7 additions & 4 deletions android/festago/presentation/src/main/res/layout/item_search_artist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,15 @@
style="@style/B2Medium14Lh20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_artist_tv_no_plan"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:includeFontPadding="false"
android:text="@string/search_artist_tv_no_plan"
android:textColor="@color/contents_gray_05"
app:layout_constraintBottom_toBottomOf="@id/tvTodayStageCount"
app:layout_constraintStart_toEndOf="@id/tvTodayStageCount"
app:layout_constraintTop_toTopOf="@id/tvTodayStageCount" />
app:layout_constraintBottom_toBottomOf="parent"

app:layout_constraintStart_toStartOf="@+id/tvArtistName"
app:layout_constraintTop_toBottomOf="@+id/tvArtistName" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
1 change: 0 additions & 1 deletion android/festago/presentation/src/main/res/layout/item_search_festival.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<TextView
android:id="@+id/tvEmptyStage"
style="@style/H5Bold14Lh16"
visibility="@{item.artists.isEmpty()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
Expand Down
4 changes: 2 additions & 2 deletions android/festago/presentation/src/main/res/layout/item_search_school.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@

<ImageView
android:id="@+id/ivSchoolLogoImage"
imageUrl="@{item.logoUrl}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:importantForAccessibility="no"
android:scaleType="centerCrop"
tools:src="@drawable/ic_launcher_foreground" />
android:src="@drawable/img_default_school"
tools:src="@drawable/img_default_school" />
</androidx.cardview.widget.CardView>

<TextView
Expand Down
Loading