feat: 북마크에서 로그인이 필요하면 로그인 화면을 띄운다

woowacourse-teams · May 2, 2024 · 89d7eed · 89d7eed
1 parent 1c12ad6
commit 89d7eed
Show file tree

Hide file tree

Showing 20 changed files with 199 additions and 124 deletions.
diff --git a/...m/festago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkEvent.kt b/...m/festago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkEvent.kt
@@ -2,4 +2,5 @@ package com.festago.festago.presentation.ui.home.bookmarklist.artistbookmark
 
 sealed interface ArtistBookmarkEvent {
     class ShowArtistDetail(val artist: ArtistBookmarkUiState) : ArtistBookmarkEvent
+    object ShowSignIn : ArtistBookmarkEvent
 }
diff --git a/...estago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkFragment.kt b/...estago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.fragment.findNavController
 import com.festago.festago.presentation.databinding.FragmentArtistBookmarkBinding
 import com.festago.festago.presentation.ui.artistdetail.ArtistDetailArgs
 import com.festago.festago.presentation.ui.home.bookmarklist.BookmarkListFragmentDirections
+import com.festago.festago.presentation.ui.signin.SignInActivity
 import com.festago.festago.presentation.util.repeatOnStarted
 import com.festago.festago.presentation.util.safeNavigate
 import dagger.hilt.android.AndroidEntryPoint
@@ -44,31 +45,29 @@ class ArtistBookmarkFragment : Fragment() {
         binding.uiState = vm.uiState.value
 
         binding.refreshListener = { vm.fetchBookmarkList() }
+        binding.loginListener = { vm.logIn() }
 
         artistBookmarkAdapter = ArtistBookmarkAdapter()
         binding.rvArtistBookmarkList.adapter = artistBookmarkAdapter
     }
 
     private fun initObserve() {
-        repeatOnStarted(this) {
+        repeatOnStarted(viewLifecycleOwner) {
             vm.uiState.collect { uiState ->
                 binding.uiState = uiState
                 when (uiState) {
-                    is ArtistBookmarkListUiState.Loading -> {
-                        // Handle loading
-                    }
+                    is ArtistBookmarkListUiState.NotLoggedIn,
+                    is ArtistBookmarkListUiState.Loading,
+                    is ArtistBookmarkListUiState.Error,
+                    -> Unit
 
                     is ArtistBookmarkListUiState.Success -> {
                         artistBookmarkAdapter.submitList(uiState.artistBookmarks)
                     }
-
-                    is ArtistBookmarkListUiState.Error -> {
-                        // Handle error
-                    }
                 }
             }
         }
-        repeatOnStarted(this) {
+        repeatOnStarted(viewLifecycleOwner) {
             vm.uiEvent.collect { event ->
                 when (event) {
                     is ArtistBookmarkEvent.ShowArtistDetail -> {
@@ -80,6 +79,10 @@ class ArtistBookmarkFragment : Fragment() {
                             ),
                         )
                     }
+
+                    is ArtistBookmarkEvent.ShowSignIn -> {
+                        startActivity(SignInActivity.getIntent(requireContext()))
+                    }
                 }
             }
         }

diff --git a/...ago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkListUiState.kt b/...ago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkListUiState.kt
@@ -1,7 +1,7 @@
 package com.festago.festago.presentation.ui.home.bookmarklist.artistbookmark
 
-interface ArtistBookmarkListUiState {
-    object NotLoggedIn : ArtistBookmarkListUiState
+sealed interface ArtistBookmarkListUiState {
+    class NotLoggedIn(val logIn: () -> Unit) : ArtistBookmarkListUiState
 
     object Loading : ArtistBookmarkListUiState
 

diff --git a/...stago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkViewModel.kt b/...stago/festago/presentation/ui/home/bookmarklist/artistbookmark/ArtistBookmarkViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.festago.festago.domain.model.bookmark.ArtistBookmark
 import com.festago.festago.domain.repository.BookmarkRepository
+import com.festago.festago.domain.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -16,6 +17,7 @@ import javax.inject.Inject
 @HiltViewModel
 class ArtistBookmarkViewModel @Inject constructor(
     private val bookmarkRepository: BookmarkRepository,
+    private val userRepository: UserRepository,
 ) : ViewModel() {
     private val _uiState =
         MutableStateFlow<ArtistBookmarkListUiState>(ArtistBookmarkListUiState.Loading)
@@ -27,6 +29,12 @@ class ArtistBookmarkViewModel @Inject constructor(
     fun fetchBookmarkList() {
         viewModelScope.launch {
             _uiState.value = ArtistBookmarkListUiState.Loading
+
+            if (!userRepository.isSigned()) {
+                _uiState.value = ArtistBookmarkListUiState.NotLoggedIn(::logIn)
+                return@launch
+            }
+
             bookmarkRepository.getArtistBookmarks().onSuccess { artistBookmarks ->
                 _uiState.value = ArtistBookmarkListUiState.Success(
                     artistBookmarks.map { it.toUiState() },
@@ -37,6 +45,12 @@ class ArtistBookmarkViewModel @Inject constructor(
         }
     }
 
+    fun logIn() {
+        viewModelScope.launch {
+            _uiEvent.emit(ArtistBookmarkEvent.ShowSignIn)
+        }
+    }
+
     private fun ArtistBookmark.toUiState(): ArtistBookmarkUiState {
         return ArtistBookmarkUiState(
             id = artist.id,

diff --git a/...stago/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkEvent.kt b/...stago/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkEvent.kt
@@ -6,4 +6,5 @@ import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.ui
 sealed interface FestivalBookmarkEvent {
     class ShowFestivalDetail(val festival: FestivalBookmarkItemUiState) : FestivalBookmarkEvent
     class ShowArtistDetail(val artist: ArtistUiState) : FestivalBookmarkEvent
+    object ShowSignIn : FestivalBookmarkEvent
 }
diff --git a/...go/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkFragment.kt b/...go/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkFragment.kt
@@ -13,6 +13,7 @@ import com.festago.festago.presentation.ui.festivaldetail.FestivalDetailArgs
 import com.festago.festago.presentation.ui.home.bookmarklist.BookmarkListFragmentDirections
 import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.adapater.FestivalBookmarkViewAdapter
 import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.uistate.FestivalBookmarkUiState
+import com.festago.festago.presentation.ui.signin.SignInActivity
 import com.festago.festago.presentation.util.repeatOnStarted
 import com.festago.festago.presentation.util.safeNavigate
 import dagger.hilt.android.AndroidEntryPoint
@@ -50,13 +51,15 @@ class FestivalBookmarkFragment : Fragment() {
         binding.uiState = vm.uiState.value
 
         binding.refreshListener = { vm.fetchBookmarkList() }
+        binding.loginListener = { vm.logIn() }
     }
 
     private fun initObserve() {
-        repeatOnStarted(this) {
+        repeatOnStarted(viewLifecycleOwner) {
             vm.uiState.collect { uiState ->
                 binding.uiState = uiState
                 when (uiState) {
+                    is FestivalBookmarkUiState.NotLoggedIn,
                     is FestivalBookmarkUiState.Loading,
                     is FestivalBookmarkUiState.Error,
                     -> Unit
@@ -67,8 +70,8 @@ class FestivalBookmarkFragment : Fragment() {
             }
         }
 
-        repeatOnStarted(this) {
-            vm.uiEvent.collect { event ->
+        repeatOnStarted(viewLifecycleOwner) {
+            vm.event.collect { event ->
                 when (event) {
                     is FestivalBookmarkEvent.ShowFestivalDetail -> {
                         findNavController().safeNavigate(
@@ -85,6 +88,10 @@ class FestivalBookmarkFragment : Fragment() {
                             ),
                         )
                     }
+
+                    is FestivalBookmarkEvent.ShowSignIn -> {
+                        startActivity(SignInActivity.getIntent(requireContext()))
+                    }
                 }
             }
         }

diff --git a/...o/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkViewModel.kt b/...o/festago/presentation/ui/home/bookmarklist/festivalbookmark/FestivalBookmarkViewModel.kt
@@ -6,6 +6,7 @@ import com.festago.festago.domain.model.artist.Artist
 import com.festago.festago.domain.model.bookmark.FestivalBookmark
 import com.festago.festago.domain.model.bookmark.FestivalBookmarkOrder
 import com.festago.festago.domain.repository.BookmarkRepository
+import com.festago.festago.domain.repository.UserRepository
 import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.artistadapter.ArtistUiState
 import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.uistate.FestivalBookmarkItemUiState
 import com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.uistate.FestivalBookmarkUiState
@@ -21,19 +22,29 @@ import javax.inject.Inject
 @HiltViewModel
 class FestivalBookmarkViewModel @Inject constructor(
     private val bookmarkRepository: BookmarkRepository,
+    private val userRepository: UserRepository,
 ) : ViewModel() {
     private val _uiState =
         MutableStateFlow<FestivalBookmarkUiState>(FestivalBookmarkUiState.Loading)
     val uiState: StateFlow<FestivalBookmarkUiState> = _uiState.asStateFlow()
 
-    private val _uiEvent = MutableSharedFlow<FestivalBookmarkEvent>()
-    val uiEvent = _uiEvent.asSharedFlow()
+    private val _event = MutableSharedFlow<FestivalBookmarkEvent>()
+    val event = _event.asSharedFlow()
 
     fun fetchBookmarkList() {
         viewModelScope.launch {
             _uiState.value = FestivalBookmarkUiState.Loading
+
+            if (!userRepository.isSigned()) {
+                _uiState.value = FestivalBookmarkUiState.NotLoggedIn
+                return@launch
+            }
+
             val bookmarkIds = bookmarkRepository.getFestivalBookmarkIds()
-                .getOrElse { _uiState.value = FestivalBookmarkUiState.Error; return@launch }
+                .getOrElse {
+                    _uiState.value = FestivalBookmarkUiState.Error
+                    return@launch
+                }
 
             if (bookmarkIds.isEmpty()) {
                 _uiState.value = FestivalBookmarkUiState.Success(emptyList())
@@ -50,6 +61,12 @@ class FestivalBookmarkViewModel @Inject constructor(
         }
     }
 
+    fun logIn() {
+        viewModelScope.launch {
+            _event.emit(FestivalBookmarkEvent.ShowSignIn)
+        }
+    }
+
     private fun FestivalBookmark.toUiState(): FestivalBookmarkItemUiState {
         return FestivalBookmarkItemUiState(
             id = festival.id,
@@ -60,7 +77,7 @@ class FestivalBookmarkViewModel @Inject constructor(
             artists = festival.artists.map { it.toUiState() },
             onFestivalDetail = { festival ->
                 viewModelScope.launch {
-                    _uiEvent.emit(FestivalBookmarkEvent.ShowFestivalDetail(festival))
+                    _event.emit(FestivalBookmarkEvent.ShowFestivalDetail(festival))
                 }
             },
         )
@@ -73,7 +90,7 @@ class FestivalBookmarkViewModel @Inject constructor(
             imageUrl = imageUrl,
             onArtistDetail = { artist ->
                 viewModelScope.launch {
-                    _uiEvent.emit(FestivalBookmarkEvent.ShowArtistDetail(artist))
+                    _event.emit(FestivalBookmarkEvent.ShowArtistDetail(artist))
                 }
             },
         )

diff --git a/...ago/presentation/ui/home/bookmarklist/festivalbookmark/uistate/FestivalBookmarkUiState.kt b/...ago/presentation/ui/home/bookmarklist/festivalbookmark/uistate/FestivalBookmarkUiState.kt
@@ -1,6 +1,6 @@
 package com.festago.festago.presentation.ui.home.bookmarklist.festivalbookmark.uistate
 
-interface FestivalBookmarkUiState {
+sealed interface FestivalBookmarkUiState {
     object NotLoggedIn : FestivalBookmarkUiState
     object Loading : FestivalBookmarkUiState
 

diff --git a/...m/festago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkEvent.kt b/...m/festago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkEvent.kt
@@ -2,4 +2,5 @@ package com.festago.festago.presentation.ui.home.bookmarklist.schoolbookmark
 
 sealed interface SchoolBookmarkEvent {
     class ShowSchoolDetail(val school: SchoolBookmarkUiState) : SchoolBookmarkEvent
+    object ShowSignIn : SchoolBookmarkEvent
 }
diff --git a/...estago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkFragment.kt b/...estago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.fragment.findNavController
 import com.festago.festago.presentation.databinding.FragmentSchoolBookmarkBinding
 import com.festago.festago.presentation.ui.home.bookmarklist.BookmarkListFragmentDirections
 import com.festago.festago.presentation.ui.schooldetail.SchoolDetailArgs
+import com.festago.festago.presentation.ui.signin.SignInActivity
 import com.festago.festago.presentation.util.repeatOnStarted
 import com.festago.festago.presentation.util.safeNavigate
 import dagger.hilt.android.AndroidEntryPoint
@@ -44,31 +45,28 @@ class SchoolBookmarkFragment : Fragment() {
         binding.uiState = vm.uiState.value
 
         binding.refreshListener = { vm.fetchBookmarkList() }
-
+        binding.loginListener = { vm.logIn() }
         schoolBookmarkAdapter = SchoolBookmarkAdapter()
         binding.rvSchoolBookmarkList.adapter = schoolBookmarkAdapter
     }
 
     private fun initObserve() {
-        repeatOnStarted(this) {
+        repeatOnStarted(viewLifecycleOwner) {
             vm.uiState.collect { uiState ->
                 binding.uiState = uiState
                 when (uiState) {
-                    is SchoolBookmarkListUiState.Loading -> {
-                        // Handle loading
-                    }
+                    is SchoolBookmarkListUiState.Loading,
+                    is SchoolBookmarkListUiState.Error,
+                    is SchoolBookmarkListUiState.NotLoggedIn,
+                    -> Unit
 
                     is SchoolBookmarkListUiState.Success -> {
                         schoolBookmarkAdapter.submitList(uiState.schoolBookmarks)
                     }
-
-                    is SchoolBookmarkListUiState.Error -> {
-                        // Handle error
-                    }
                 }
             }
         }
-        repeatOnStarted(this) {
+        repeatOnStarted(viewLifecycleOwner) {
             vm.uiEvent.collect { event ->
                 when (event) {
                     is SchoolBookmarkEvent.ShowSchoolDetail -> {
@@ -78,6 +76,10 @@ class SchoolBookmarkFragment : Fragment() {
                             ),
                         )
                     }
+
+                    is SchoolBookmarkEvent.ShowSignIn -> {
+                        startActivity(SignInActivity.getIntent(requireContext()))
+                    }
                 }
             }
         }

diff --git a/...ago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkListUiState.kt b/...ago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkListUiState.kt
@@ -1,6 +1,6 @@
 package com.festago.festago.presentation.ui.home.bookmarklist.schoolbookmark
 
-interface SchoolBookmarkListUiState {
+sealed interface SchoolBookmarkListUiState {
     object NotLoggedIn : SchoolBookmarkListUiState
     object Loading : SchoolBookmarkListUiState
 

diff --git a/...stago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkViewModel.kt b/...stago/festago/presentation/ui/home/bookmarklist/schoolbookmark/SchoolBookmarkViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.festago.festago.domain.model.bookmark.SchoolBookmark
 import com.festago.festago.domain.repository.BookmarkRepository
+import com.festago.festago.domain.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -16,6 +17,7 @@ import javax.inject.Inject
 @HiltViewModel
 class SchoolBookmarkViewModel @Inject constructor(
     private val bookmarkRepository: BookmarkRepository,
+    private val userRepository: UserRepository,
 ) : ViewModel() {
     private val _uiState =
         MutableStateFlow<SchoolBookmarkListUiState>(SchoolBookmarkListUiState.Loading)
@@ -27,6 +29,10 @@ class SchoolBookmarkViewModel @Inject constructor(
     fun fetchBookmarkList() {
         viewModelScope.launch {
             _uiState.value = SchoolBookmarkListUiState.Loading
+            if (!userRepository.isSigned()) {
+                _uiState.value = SchoolBookmarkListUiState.NotLoggedIn
+                return@launch
+            }
             bookmarkRepository.getSchoolBookmarks().onSuccess { schoolBookmarks ->
                 _uiState.value = SchoolBookmarkListUiState.Success(
                     schoolBookmarks.map { it.toUiState() },
@@ -37,6 +43,12 @@ class SchoolBookmarkViewModel @Inject constructor(
         }
     }
 
+    fun logIn() {
+        viewModelScope.launch {
+            _uiEvent.emit(SchoolBookmarkEvent.ShowSignIn)
+        }
+    }
+
     private fun SchoolBookmark.toUiState(): SchoolBookmarkUiState {
         return SchoolBookmarkUiState(
             id = school.id,

diff --git a/...o/presentation/src/main/java/com/festago/festago/presentation/ui/signin/SignInActivity.kt b/...o/presentation/src/main/java/com/festago/festago/presentation/ui/signin/SignInActivity.kt
@@ -89,8 +89,8 @@ class SignInActivity : AppCompatActivity() {
     }
 
     private fun navigateToHome() {
+        finishAffinity()
         startActivity(HomeActivity.getIntent(this))
-        finish()
     }
 
     private fun handleSignInFailure() {

diff --git a/android/festago/presentation/src/main/res/layout/fragment_artist_bookmark.xml b/android/festago/presentation/src/main/res/layout/fragment_artist_bookmark.xml
@@ -51,7 +51,7 @@
             visibility="@{uiState.shouldShowEmpty}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/fragmentl_bookmark_artist_bookmark"
+            android:text="@string/bookmark_list_tv_artist_bookmark"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"