[AN/USER] feat: 북마크 추가 버튼 기능 구현 및 API 연동(#922)

android/festago/data/src/main/java/com/festago/festago/data/di/singletonscope/RepositoryModule.kt

@@ -1,12 +1,12 @@
 package com.festago.festago.data.di.singletonscope
 
 import com.festago.festago.data.repository.DefaultArtistRepository
+import com.festago.festago.data.repository.DefaultBookmarkRepository
 import com.festago.festago.data.repository.DefaultFestivalRepository
 import com.festago.festago.data.repository.DefaultRecentSearchRepository
 import com.festago.festago.data.repository.DefaultSchoolRepository
 import com.festago.festago.data.repository.DefaultSearchRepository
 import com.festago.festago.data.repository.DefaultUserRepository
-import com.festago.festago.data.repository.FakeBookmarkRepository
 import com.festago.festago.domain.repository.ArtistRepository
 import com.festago.festago.domain.repository.BookmarkRepository
 import com.festago.festago.domain.repository.FestivalRepository
@@ -45,7 +45,7 @@ interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun bindsBookmarkRepository(bookmarkRepository: FakeBookmarkRepository): BookmarkRepository
+    fun bindsBookmarkRepository(bookmarkRepository: DefaultBookmarkRepository): BookmarkRepository
 
     @Binds
     @Singleton

android/festago/data/src/main/java/com/festago/festago/data/di/singletonscope/ServiceModule.kt

@@ -51,7 +51,7 @@ object ServiceModule {
     @Provides
     @Singleton
     fun providesBookmarkRetrofitService(
-        @NormalRetrofitQualifier retrofit: Retrofit,
+        @AuthRetrofitQualifier retrofit: Retrofit,
     ): BookmarkRetrofitService {
         return retrofit.create(BookmarkRetrofitService::class.java)
     }

android/festago/data/src/main/java/com/festago/festago/data/repository/DefaultBookmarkRepository.kt

@@ -39,9 +39,11 @@ class DefaultBookmarkRepository @Inject constructor(
     }
 
     override suspend fun deleteFestivalBookmark(festivalId: Long): Result<Unit> {
-        return runCatchingResponse {
+        val result = runCatchingResponse {
             bookmarkRetrofitService.deleteBookmark(festivalId, BookmarkType.FESTIVAL)
         }
+        result.onFailure { if (it.message?.contains("204") == true) return Result.success(Unit) }
+        return result
     }
 
     override suspend fun addSchoolBookmark(schoolId: Long): Result<Unit> {
@@ -59,9 +61,11 @@ class DefaultBookmarkRepository @Inject constructor(
     }
 
     override suspend fun deleteSchoolBookmark(schoolId: Long): Result<Unit> {
-        return runCatchingResponse {
+        val result = runCatchingResponse {
             bookmarkRetrofitService.deleteBookmark(schoolId, BookmarkType.SCHOOL)
         }
+        result.onFailure { if (it.message?.contains("204") == true) return Result.success(Unit) }
+        return result
     }
 
     override suspend fun addArtistBookmark(artistId: Long): Result<Unit> {
@@ -81,8 +85,10 @@ class DefaultBookmarkRepository @Inject constructor(
     }
 
     override suspend fun deleteArtistBookmark(artistId: Long): Result<Unit> {
-        return runCatchingResponse {
+        val result = runCatchingResponse {
             bookmarkRetrofitService.deleteBookmark(artistId, BookmarkType.ARTIST)
         }
+        result.onFailure { if (it.message?.contains("204") == true) return Result.success(Unit) }
+        return result
     }
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailEvent.kt

@@ -4,4 +4,6 @@ sealed interface ArtistDetailEvent {
     class ShowArtistDetail(val artistId: Long) : ArtistDetailEvent
 
     class ShowFestivalDetail(val festivalId: Long) : ArtistDetailEvent
+
+    class FailedToFetchBookmarkList(val message: String) : ArtistDetailEvent
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -53,9 +54,7 @@ class ArtistDetailFragment : Fragment() {
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }
 
-        binding.cvBookmark.setOnClickListener {
-            binding.ivBookmark.isSelected = !binding.ivBookmark.isSelected
-        }
+        binding.cvBookmark.isSelected
     }
 
     private fun initObserve() {
@@ -81,6 +80,8 @@ class ArtistDetailFragment : Fragment() {
     private fun handleSuccess(uiState: ArtistDetailUiState.Success) {
         binding.successUiState = uiState
 
+        binding.ivBookmark.isSelected = uiState.bookMarked
+
         val items: List<Any> = if (uiState.isLast) {
             uiState.festivals
         } else {
@@ -117,6 +118,11 @@ class ArtistDetailFragment : Fragment() {
                 ),
             )
         }
+
+        is ArtistDetailEvent.FailedToFetchBookmarkList -> {
+            Toast.makeText(requireContext(), "최대 북마크 갯수를 초과했습니다", Toast.LENGTH_SHORT)
+                .show()
+        }
     }
 
     private fun startBrowser(url: String) {

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailViewModel.kt

@@ -6,6 +6,8 @@ import com.festago.festago.common.analytics.AnalyticsHelper
 import com.festago.festago.common.analytics.logNetworkFailure
 import com.festago.festago.domain.model.festival.FestivalsPage
 import com.festago.festago.domain.repository.ArtistRepository
+import com.festago.festago.domain.repository.BookmarkRepository
+import com.festago.festago.presentation.ui.artistdetail.ArtistDetailEvent.FailedToFetchBookmarkList
 import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistDetailUiState
 import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistUiState
 import com.festago.festago.presentation.ui.artistdetail.uistate.FestivalItemUiState
@@ -24,6 +26,7 @@ import javax.inject.Inject
 @HiltViewModel
 class ArtistDetailViewModel @Inject constructor(
     private val artistRepository: ArtistRepository,
+    private val bookmarkRepository: BookmarkRepository,
     private val analyticsHelper: AnalyticsHelper,
 ) : ViewModel() {
     private val _event: MutableSharedFlow<ArtistDetailEvent> = MutableSharedFlow()
@@ -40,12 +43,17 @@ class ArtistDetailViewModel @Inject constructor(
             runCatching {
                 val deferredArtistDetail = async { artistRepository.loadArtistDetail(id) }
                 val deferredFestivals = async { artistRepository.loadArtistFestivals(id, 10) }
+                val deferredBookmarks = async { bookmarkRepository.getArtistBookmarks() }
+                val artist = deferredArtistDetail.await().getOrThrow()
                 val festivalPage = deferredFestivals.await().getOrThrow()
+                val artistBookmarks = deferredBookmarks.await().getOrThrow()
 
                 _uiState.value = ArtistDetailUiState.Success(
-                    deferredArtistDetail.await().getOrThrow(),
-                    festivalPage.toUiState(),
-                    festivalPage.isLastPage,
+                    artist = artist,
+                    bookMarked = artistBookmarks.firstOrNull { it.artist.id == artist.id.toLong() } != null,
+                    festivals = festivalPage.toUiState(),
+                    isLast = festivalPage.isLastPage,
+                    onBookmarkClick = ::toggleArtistBookmark,
                 )
 
                 if (festivalPage.festivals.isEmpty()) {
@@ -85,6 +93,21 @@ class ArtistDetailViewModel @Inject constructor(
         }
     }
 
+    private fun toggleArtistBookmark(artistId: Int) {
+        viewModelScope.launch {
+            val uiState = uiState.value as? ArtistDetailUiState.Success ?: return@launch
+
+            if (uiState.bookMarked) {
+                bookmarkRepository.deleteArtistBookmark(artistId.toLong())
+                    .onSuccess { _uiState.value = uiState.copy(bookMarked = false) }
+                    .onFailure { _event.emit(FailedToFetchBookmarkList("최대 북마크 갯수를 초과했습니다")) }
+            } else {
+                bookmarkRepository.addArtistBookmark(artistId.toLong())
+                    .onSuccess { _uiState.value = uiState.copy(bookMarked = true) }
+                    .onFailure { _event.emit(FailedToFetchBookmarkList("최대 북마크 갯수를 초과했습니다")) }
+            }
+        }
+    }
     private fun handleFailure(key: String, throwable: Throwable) {
         _uiState.value = ArtistDetailUiState.Error {
             _uiState.value = ArtistDetailUiState.Loading

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/uistate/ArtistDetailUiState.kt

@@ -7,8 +7,10 @@ sealed interface ArtistDetailUiState {
 
     data class Success(
         val artist: ArtistDetail,
+        val bookMarked: Boolean,
         val festivals: List<FestivalItemUiState>,
         val isLast: Boolean,
+        val onBookmarkClick: (Int) -> Unit,
     ) : ArtistDetailUiState
 
     class Error(val refresh: (id: Long) -> Unit) : ArtistDetailUiState

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailEvent.kt

@@ -3,4 +3,5 @@ package com.festago.festago.presentation.ui.festivaldetail
 sealed interface FestivalDetailEvent {
     class ShowArtistDetail(val artistId: Long) : FestivalDetailEvent
     class ShowSchoolDetail(val schoolId: Long) : FestivalDetailEvent
+    class FailedToFetchBookmarkList(val message: String) : FestivalDetailEvent
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt

@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -56,9 +57,6 @@ class FestivalDetailFragment : Fragment() {
         binding.ivBack.setOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }
-        binding.cvBookmark.setOnClickListener {
-            binding.ivBookmark.isSelected = !binding.ivBookmark.isSelected
-        }
     }
 
     private fun initObserve() {
@@ -85,6 +83,7 @@ class FestivalDetailFragment : Fragment() {
 
     private fun handleSuccess(uiState: FestivalDetailUiState.Success) {
         binding.successUiState = uiState
+        binding.ivBookmark.isSelected = uiState.bookmarked
         binding.tvFestivalDDay.setFestivalDDay(uiState.festival.startDate, uiState.festival.endDate)
         binding.ivFestivalBackground.setColorFilter(Color.parseColor("#66000000"))
         adapter.submitList(uiState.stages)
@@ -160,6 +159,10 @@ class FestivalDetailFragment : Fragment() {
                     ),
                 )
             }
+
+            is FestivalDetailEvent.FailedToFetchBookmarkList -> {
+                Toast.makeText(requireContext(), event.message, Toast.LENGTH_SHORT).show()
+            }
         }
     }
 

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailViewModel.kt

@@ -7,7 +7,9 @@ import com.festago.festago.common.analytics.logNetworkFailure
 import com.festago.festago.domain.model.artist.Artist
 import com.festago.festago.domain.model.festival.FestivalDetail
 import com.festago.festago.domain.model.stage.Stage
+import com.festago.festago.domain.repository.BookmarkRepository
 import com.festago.festago.domain.repository.FestivalRepository
+import com.festago.festago.presentation.ui.festivaldetail.FestivalDetailEvent.FailedToFetchBookmarkList
 import com.festago.festago.presentation.ui.festivaldetail.uiState.ArtistItemUiState
 import com.festago.festago.presentation.ui.festivaldetail.uiState.FestivalDetailUiState
 import com.festago.festago.presentation.ui.festivaldetail.uiState.FestivalUiState
@@ -25,6 +27,7 @@ import javax.inject.Inject
 @HiltViewModel
 class FestivalDetailViewModel @Inject constructor(
     private val festivalRepository: FestivalRepository,
+    private val bookmarkRepository: BookmarkRepository,
     private val analyticsHelper: AnalyticsHelper,
 ) : ViewModel() {
 
@@ -38,8 +41,15 @@ class FestivalDetailViewModel @Inject constructor(
         if (!refresh && _uiState.value is FestivalDetailUiState.Success) return
 
         viewModelScope.launch {
-            festivalRepository.loadFestivalDetail(festivalId).onSuccess { festivalDetail ->
+            val deferredFestivalDetail = festivalRepository.loadFestivalDetail(festivalId)
+            val deferredBookmarks = bookmarkRepository.getFestivalBookmarkIds()
+
+            runCatching {
+                val festivalDetail = deferredFestivalDetail.getOrThrow()
+                val festivalBookmarkIds = deferredBookmarks.getOrThrow()
+
                 _uiState.value = festivalDetail.toSuccessUiState()
+                    .copy(bookmarked = festivalBookmarkIds.contains(festivalId))
             }.onFailure {
                 _uiState.value = FestivalDetailUiState.Error { festivalId ->
                     _uiState.value = FestivalDetailUiState.Loading
@@ -53,20 +63,37 @@ class FestivalDetailViewModel @Inject constructor(
         }
     }
 
-    private fun FestivalDetail.toSuccessUiState() =
-        FestivalDetailUiState.Success(
-            FestivalUiState(
-                id = id,
-                name = name,
-                startDate = startDate,
-                endDate = endDate,
-                posterImageUrl = posterImageUrl,
-                school = school,
-                onSchoolClick = ::showSchoolDetail,
-                socialMedias = socialMedias,
-            ),
-            stages = stages.map { it.toUiState() },
-        )
+    private fun FestivalDetail.toSuccessUiState() = FestivalDetailUiState.Success(
+        festival = FestivalUiState(
+            id = id,
+            name = name,
+            startDate = startDate,
+            endDate = endDate,
+            posterImageUrl = posterImageUrl,
+            school = school,
+            onSchoolClick = ::showSchoolDetail,
+            socialMedias = socialMedias,
+        ),
+        bookmarked = false,
+        stages = stages.map { it.toUiState() },
+        onBookmarkClick = { festivalId -> toggleFestivalBookmark(festivalId) },
+    )
+
+    private fun toggleFestivalBookmark(festivalId: Long) {
+        viewModelScope.launch {
+            val uiState = _uiState.value as? FestivalDetailUiState.Success ?: return@launch
+
+            if (uiState.bookmarked) {
+                bookmarkRepository.deleteFestivalBookmark(festivalId)
+                    .onSuccess { _uiState.value = uiState.copy(bookmarked = false) }
+                    .onFailure { _event.emit(FailedToFetchBookmarkList("최대 북마크 갯수를 초과했습니다")) }
+            } else {
+                bookmarkRepository.addFestivalBookmark(festivalId)
+                    .onSuccess { _uiState.value = uiState.copy(bookmarked = true) }
+                    .onFailure { _event.emit(FailedToFetchBookmarkList("최대 북마크 갯수를 초과했습니다")) }
+            }
+        }
+    }
 
     private fun Stage.toUiState() = StageItemUiState(
         id = id,

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/uiState/FestivalDetailUiState.kt

@@ -5,7 +5,9 @@ interface FestivalDetailUiState {
 
     data class Success(
         val festival: FestivalUiState,
+        val bookmarked: Boolean,
         val stages: List<StageItemUiState>,
+        val onBookmarkClick: (Long) -> Unit,
     ) : FestivalDetailUiState
 
     class Error(val refresh: (id: Long) -> Unit) : FestivalDetailUiState

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkViewModel.kt

@@ -32,17 +32,21 @@ class FestivalBookmarkViewModel @Inject constructor(
     fun fetchBookmarkList() {
         viewModelScope.launch {
             _uiState.value = FestivalBookmarkUiState.Loading
-            bookmarkRepository.getFestivalBookmarkIds().onSuccess { bookmarkIds ->
-                bookmarkRepository.getFestivalBookmarks(bookmarkIds, FestivalBookmarkOrder.FESTIVAL)
-                    .onSuccess { festivalBookmarks ->
-                        _uiState.value =
-                            FestivalBookmarkUiState.Success(festivalBookmarks.map { it.toUiState() })
-                    }.onFailure {
-                        _uiState.value = FestivalBookmarkUiState.Error
-                    }
-            }.onFailure {
-                _uiState.value = FestivalBookmarkUiState.Error
+            val bookmarkIds = bookmarkRepository.getFestivalBookmarkIds()
+                .getOrElse { _uiState.value = FestivalBookmarkUiState.Error; return@launch }
+
+            if (bookmarkIds.isEmpty()) {
+                _uiState.value = FestivalBookmarkUiState.Success(emptyList())
+                return@launch
             }
+
+            bookmarkRepository.getFestivalBookmarks(bookmarkIds, FestivalBookmarkOrder.FESTIVAL)
+                .onSuccess { festivalBookmarks ->
+                    _uiState.value =
+                        FestivalBookmarkUiState.Success(festivalBookmarks.map { it.toUiState() })
+                }.onFailure {
+                    _uiState.value = FestivalBookmarkUiState.Error
+                }
         }
     }
 

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailEvent.kt

@@ -4,4 +4,6 @@ sealed interface SchoolDetailEvent {
     class ShowArtistDetail(val artistId: Long) : SchoolDetailEvent
 
     class ShowFestivalDetail(val festivalId: Long) : SchoolDetailEvent
+
+    class FailedToFetchBookmarkList(val message: String) : SchoolDetailEvent
 }