[TECHNICAL] Technical improvements for user quota #4525
Conversation
joragua
force-pushed
the
technical/technical_improvements_for_quota
branch
from
8e7bfe9 to
2f0df52
Compare
…dQuotaAsStreamUseCase`)
… remove unnecessary ones from `DrawerViewModelTest`
joragua
force-pushed
the
technical/technical_improvements_for_quota
branch
from
1f95f15 to
8d5c35f
Compare
| useCase = getStoredQuotaUseCase, | ||
| useCaseParams = GetStoredQuotaUseCase.Params(accountName = accountName) | ||
| ) | ||
| val userQuota: Flow<UserQuota> = getStoredQuotaAsStreamUseCase(GetStoredQuotaAsStreamUseCase.Params(accountName)) |
There was a problem hiding this comment.
Hm, not sure if I like this... I think it would be better being encapsulated with a private variable. Otherwise everytime we access userQuota, the use case might be executed, and that's not what we want. Check for example SettingsPictureUploadsViewModel to see how this is done with the pictureUploads variable 👍
| private val drawerViewModel by viewModel<DrawerViewModel>() | ||
| private val drawerViewModel by viewModel<DrawerViewModel> { | ||
| parametersOf( | ||
| account?.name |
There was a problem hiding this comment.
What if account is null? Did you check where this value is set in BaseActivity?
| is UIResult.Loading -> getAccountQuotaText()?.text = getString(R.string.drawer_loading_quota) | ||
| is UIResult.Error -> getAccountQuotaText()?.text = getString(R.string.drawer_unavailable_used_storage) |
There was a problem hiding this comment.
We're losing these 2 cases!! We shouldn't, they are so necessary
| getAccountQuotaStatusText()?.visibility = View.GONE | ||
| } | ||
| } | ||
| collectLatestLifecycleFlow(drawerViewModel.userQuota) { userQuota -> |
There was a problem hiding this comment.
I did some changes in all these lines in the Detekt branch, I think just for the MaxLineLength rule. Try to keep them in the new place for these lines so that we don't duplicate work
| @Query(SELECT_QUOTA) | ||
| fun getQuotaForAccountAsFlow( | ||
| accountName: String | ||
| ): Flow<UserQuotaEntity> |
There was a problem hiding this comment.
Why with the same SQL query you have a nullable result in the previous method but not here?
|
|
||
| ocLocalUserDataSource.deleteQuotaForAccount(OC_ACCOUNT_NAME) | ||
| val userQuota = ocLocalUserDataSource.getQuotaForAccountAsFlow(OC_ACCOUNT_NAME).first() | ||
| assertEquals(userQuotaEntity.toModel(), userQuota) |
There was a problem hiding this comment.
| assertEquals(userQuotaEntity.toModel(), userQuota) | |
| assertEquals(OC_USER_QUOTA, userQuota) |
| } returns flowOf(listOf(userQuotaEntity)) | ||
|
|
||
| val listOfUserQuotas = ocLocalUserDataSource.getAllUserQuotasAsFlow().first() | ||
| assertEquals(listOf(userQuotaEntity.toModel()), listOfUserQuotas) |
There was a problem hiding this comment.
| assertEquals(listOf(userQuotaEntity.toModel()), listOfUserQuotas) | |
| assertEquals(listOf(OC_USER_QUOTA), listOfUserQuotas) |
There was a problem hiding this comment.
Same as previous comment 😄
Related Issues
App: #4521
ReleaseNotesViewModel.ktcreating a newReleaseNote()with String resources (if required)QA