mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-11-22 06:37:30 +00:00
Add update favorite logic in ProfileFragmentViewModel and corresponding test
This commit is contained in:
parent
edb03ba3d8
commit
63df44624e
@ -3,7 +3,6 @@ package awais.instagrabber.fragments.main;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
@ -54,7 +53,6 @@ import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import awais.instagrabber.R;
|
||||
import awais.instagrabber.UserSearchNavGraphDirections;
|
||||
import awais.instagrabber.activities.MainActivity;
|
||||
import awais.instagrabber.adapters.FeedAdapterV2;
|
||||
import awais.instagrabber.adapters.HighlightsAdapter;
|
||||
@ -69,8 +67,6 @@ import awais.instagrabber.db.repositories.FavoriteRepository;
|
||||
import awais.instagrabber.dialogs.PostsLayoutPreferencesDialogFragment;
|
||||
import awais.instagrabber.dialogs.ProfilePicDialogFragment;
|
||||
import awais.instagrabber.fragments.PostViewV2Fragment;
|
||||
import awais.instagrabber.fragments.UserSearchFragment;
|
||||
import awais.instagrabber.fragments.UserSearchFragmentDirections;
|
||||
import awais.instagrabber.managers.DirectMessagesManager;
|
||||
import awais.instagrabber.managers.InboxManager;
|
||||
import awais.instagrabber.models.HighlightModel;
|
||||
@ -750,7 +746,9 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
||||
if (throwable != null || favorite == null) {
|
||||
profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_outline_star_plus_24);
|
||||
profileDetailsBinding.favChip.setText(R.string.add_to_favorites);
|
||||
if (throwable != null) {
|
||||
Log.e(TAG, "setProfileDetails: ", throwable);
|
||||
}
|
||||
return;
|
||||
}
|
||||
profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
|
||||
|
@ -1,15 +1,19 @@
|
||||
package awais.instagrabber.viewmodels
|
||||
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.*
|
||||
import androidx.savedstate.SavedStateRegistryOwner
|
||||
import awais.instagrabber.db.entities.Favorite
|
||||
import awais.instagrabber.db.repositories.AccountRepository
|
||||
import awais.instagrabber.db.repositories.FavoriteRepository
|
||||
import awais.instagrabber.managers.DirectMessagesManager
|
||||
import awais.instagrabber.models.Resource
|
||||
import awais.instagrabber.models.enums.FavoriteType
|
||||
import awais.instagrabber.repositories.responses.User
|
||||
import awais.instagrabber.repositories.responses.directmessages.RankedRecipient
|
||||
import awais.instagrabber.utils.ControlledRunner
|
||||
import awais.instagrabber.utils.extensions.TAG
|
||||
import awais.instagrabber.webservices.*
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
@ -22,14 +26,16 @@ class ProfileFragmentViewModel(
|
||||
mediaRepository: MediaRepository,
|
||||
graphQLRepository: GraphQLRepository,
|
||||
accountRepository: AccountRepository,
|
||||
favoriteRepository: FavoriteRepository,
|
||||
private val favoriteRepository: FavoriteRepository,
|
||||
ioDispatcher: CoroutineDispatcher,
|
||||
) : ViewModel() {
|
||||
private val _currentUser = MutableLiveData<Resource<User?>>(Resource.loading(null))
|
||||
private val _isFavorite = MutableLiveData(false)
|
||||
private var messageManager: DirectMessagesManager? = null
|
||||
|
||||
val currentUser: LiveData<Resource<User?>> = _currentUser
|
||||
val isLoggedIn: LiveData<Boolean> = currentUser.map { it.data != null }
|
||||
val isFavorite: LiveData<Boolean> = _isFavorite
|
||||
|
||||
private val currentUserAndStateUsernameLiveData: LiveData<Pair<Resource<User?>, Resource<String?>>> =
|
||||
object : MediatorLiveData<Pair<Resource<User?>, Resource<String?>>>() {
|
||||
@ -78,12 +84,40 @@ class ProfileFragmentViewModel(
|
||||
}
|
||||
}
|
||||
emit(Resource.success(fetchedUser))
|
||||
if (fetchedUser != null) {
|
||||
checkAndInsertFavorite(fetchedUser)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
emit(Resource.error(e.message, null))
|
||||
Log.e(TAG, "fetching user: ", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun checkAndInsertFavorite(fetchedUser: User) {
|
||||
try {
|
||||
val favorite = favoriteRepository.getFavorite(fetchedUser.username, FavoriteType.USER)
|
||||
if (favorite == null) {
|
||||
_isFavorite.postValue(false)
|
||||
return
|
||||
}
|
||||
_isFavorite.postValue(true)
|
||||
favoriteRepository.insertOrUpdateFavorite(
|
||||
Favorite(
|
||||
favorite.id,
|
||||
fetchedUser.username,
|
||||
FavoriteType.USER,
|
||||
fetchedUser.fullName,
|
||||
fetchedUser.profilePicUrl,
|
||||
favorite.dateAdded
|
||||
)
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
_isFavorite.postValue(false)
|
||||
Log.e(TAG, "checkAndInsertFavorite: ", e)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Username of profile without '`@`'
|
||||
*/
|
||||
|
@ -157,27 +157,15 @@ open class AccountDaoAdapter : AccountDao {
|
||||
}
|
||||
|
||||
open class FavoriteDaoAdapter : FavoriteDao {
|
||||
override suspend fun getAllFavorites(): List<Favorite> {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun getAllFavorites(): List<Favorite> = emptyList()
|
||||
|
||||
override suspend fun findFavoriteByQueryAndType(query: String, type: FavoriteType): Favorite? {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun findFavoriteByQueryAndType(query: String, type: FavoriteType): Favorite? = null
|
||||
|
||||
override suspend fun insertFavorites(vararg favorites: Favorite) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun insertFavorites(vararg favorites: Favorite) {}
|
||||
|
||||
override suspend fun updateFavorites(vararg favorites: Favorite) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun updateFavorites(vararg favorites: Favorite) {}
|
||||
|
||||
override suspend fun deleteFavorites(vararg favorites: Favorite) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun deleteFavorites(vararg favorites: Favorite) {}
|
||||
|
||||
override suspend fun deleteAllFavorites() {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
override suspend fun deleteAllFavorites() {}
|
||||
}
|
@ -7,10 +7,12 @@ import awais.instagrabber.MainCoroutineScopeRule
|
||||
import awais.instagrabber.common.*
|
||||
import awais.instagrabber.db.datasources.AccountDataSource
|
||||
import awais.instagrabber.db.datasources.FavoriteDataSource
|
||||
import awais.instagrabber.db.entities.Favorite
|
||||
import awais.instagrabber.db.repositories.AccountRepository
|
||||
import awais.instagrabber.db.repositories.FavoriteRepository
|
||||
import awais.instagrabber.getOrAwaitValue
|
||||
import awais.instagrabber.models.Resource
|
||||
import awais.instagrabber.models.enums.FavoriteType
|
||||
import awais.instagrabber.repositories.responses.FriendshipStatus
|
||||
import awais.instagrabber.repositories.responses.User
|
||||
import awais.instagrabber.webservices.*
|
||||
@ -18,9 +20,9 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import org.json.JSONException
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Assertions.assertNull
|
||||
import org.junit.jupiter.api.Assertions.*
|
||||
import org.junit.runner.RunWith
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
internal class ProfileFragmentViewModelTest {
|
||||
@ -233,4 +235,50 @@ internal class ProfileFragmentViewModelTest {
|
||||
}
|
||||
assertEquals(testPublicUser1, profile.data)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `should update favorite in db if fetched user is a favorite`() {
|
||||
val state = SavedStateHandle(
|
||||
mutableMapOf<String, Any?>(
|
||||
"username" to testPublicUser.username
|
||||
)
|
||||
)
|
||||
val favorite = Favorite(
|
||||
1,
|
||||
testPublicUser.username,
|
||||
FavoriteType.USER,
|
||||
testPublicUser.username,
|
||||
"test url",
|
||||
LocalDateTime.now()
|
||||
)
|
||||
val graphQLRepository = object : GraphQLRepository(GraphQLServiceAdapter()) {
|
||||
override suspend fun fetchUser(username: String): User = testPublicUser
|
||||
}
|
||||
var updateFavoriteCalled = false
|
||||
val favoriteRepository = FavoriteRepository(FavoriteDataSource(object : FavoriteDaoAdapter() {
|
||||
override suspend fun findFavoriteByQueryAndType(query: String, type: FavoriteType): Favorite = favorite
|
||||
override suspend fun updateFavorites(vararg favorites: Favorite) {
|
||||
updateFavoriteCalled = true
|
||||
}
|
||||
}))
|
||||
val viewModel = ProfileFragmentViewModel(
|
||||
state,
|
||||
UserRepository(UserServiceAdapter()),
|
||||
FriendshipRepository(FriendshipServiceAdapter()),
|
||||
StoriesRepository(StoriesServiceAdapter()),
|
||||
MediaRepository(MediaServiceAdapter()),
|
||||
graphQLRepository,
|
||||
AccountRepository(AccountDataSource(AccountDaoAdapter())),
|
||||
favoriteRepository,
|
||||
coroutineScope.dispatcher,
|
||||
)
|
||||
viewModel.setCurrentUser(Resource.success(null))
|
||||
assertEquals(false, viewModel.isLoggedIn.getOrAwaitValue())
|
||||
var profile = viewModel.profile.getOrAwaitValue()
|
||||
while (profile.status == Resource.Status.LOADING) {
|
||||
profile = viewModel.profile.getOrAwaitValue()
|
||||
}
|
||||
assertTrue(updateFavoriteCalled)
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user