Skip to content

Commit a2467d0

Browse files
LaurentTreguierLaurentTreguier
committed
Let UI initiate ViewModel actions
1 parent 2d3cc9b commit a2467d0

File tree

6 files changed

+54
-52
lines changed

6 files changed

+54
-52
lines changed

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/SettingsScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.material3.ListItem
2121
import androidx.compose.material3.Text
2222
import androidx.compose.material3.TextField
2323
import androidx.compose.runtime.Composable
24+
import androidx.compose.runtime.LaunchedEffect
2425
import androidx.compose.runtime.getValue
2526
import androidx.compose.ui.Modifier
2627
import androidx.compose.ui.res.dimensionResource
@@ -30,14 +31,12 @@ import androidx.compose.ui.tooling.preview.Preview
3031
import androidx.hilt.navigation.compose.hiltViewModel
3132
import androidx.lifecycle.SavedStateHandle
3233
import androidx.lifecycle.compose.collectAsStateWithLifecycle
33-
import app.fyreplace.api.data.User
3434
import app.fyreplace.fyreplace.R
3535
import app.fyreplace.fyreplace.extensions.codePointCount
3636
import app.fyreplace.fyreplace.fakes.FakeApiResolver
3737
import app.fyreplace.fyreplace.fakes.FakeEventBus
3838
import app.fyreplace.fyreplace.fakes.FakeResourceResolver
3939
import app.fyreplace.fyreplace.fakes.FakeStoreResolver
40-
import app.fyreplace.fyreplace.fakes.placeholder
4140
import app.fyreplace.fyreplace.ui.theme.AppTheme
4241
import app.fyreplace.fyreplace.ui.views.settings.AvatarListItem
4342
import app.fyreplace.fyreplace.ui.views.settings.LinkListItem
@@ -135,6 +134,10 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel()) {
135134
icon = Icons.Outlined.Code
136135
)
137136
}
137+
138+
LaunchedEffect(viewModel) {
139+
viewModel.loadCurrentUser()
140+
}
138141
}
139142
}
140143

@@ -144,10 +147,7 @@ fun SettingsScreenPreview() {
144147
AppTheme {
145148
SettingsScreen(
146149
viewModel = SettingsViewModel(
147-
SavedStateHandle().apply {
148-
this[SettingsViewModel::currentUser.name] = User.placeholder
149-
this[SettingsViewModel::bio.name] = User.placeholder.bio
150-
},
150+
SavedStateHandle(),
151151
FakeEventBus(),
152152
FakeResourceResolver(mapOf(R.integer.bio_max_length to 100)),
153153
FakeStoreResolver(),

‎app/src/main/kotlin/app/fyreplace/fyreplace/viewmodels/screens/SettingsViewModel.kt

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import app.fyreplace.fyreplace.viewmodels.ApiViewModelBase
1717
import dagger.hilt.android.lifecycle.HiltViewModel
1818
import kotlinx.coroutines.flow.StateFlow
1919
import kotlinx.coroutines.flow.combine
20-
import kotlinx.coroutines.flow.distinctUntilChanged
21-
import kotlinx.coroutines.flow.filter
22-
import kotlinx.coroutines.flow.map
2320
import kotlinx.coroutines.launch
2421
import java.io.File
2522
import javax.inject.Inject
@@ -44,19 +41,10 @@ class SettingsViewModel @Inject constructor(
4441
}
4542
.asState(false)
4643

47-
init {
48-
viewModelScope.launch {
49-
storeResolver.secretsStore.data
50-
.map { it.token }
51-
.distinctUntilChanged()
52-
.filter { !it.isEmpty }
53-
.collect {
54-
call(apiResolver::users) {
55-
state[::currentUser.name] = getCurrentUser().require()
56-
state[::bio.name] = currentUser.value?.bio.orEmpty()
57-
}
58-
}
59-
}
44+
45+
fun loadCurrentUser() = call(apiResolver::users) {
46+
state[::currentUser.name] = getCurrentUser().require()
47+
state[::bio.name] = currentUser.value?.bio.orEmpty()
6048
}
6149

6250
fun updateAvatar(file: File) = call(apiResolver::users) {

‎app/src/test/kotlin/app/fyreplace/fyreplace/test/screens/LoginViewModelTests.kt renamed to ‎app/src/test/kotlin/app/fyreplace/fyreplace/test/viewmodels/LoginViewModelTests.kt

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.fyreplace.fyreplace.test.screens
1+
package app.fyreplace.fyreplace.test.viewmodels
22

33
import androidx.lifecycle.SavedStateHandle
44
import app.fyreplace.fyreplace.R
@@ -16,7 +16,6 @@ import app.fyreplace.fyreplace.viewmodels.screens.LoginViewModel
1616
import kotlinx.coroutines.ExperimentalCoroutinesApi
1717
import kotlinx.coroutines.flow.collect
1818
import kotlinx.coroutines.launch
19-
import kotlinx.coroutines.test.TestScope
2019
import kotlinx.coroutines.test.runCurrent
2120
import kotlinx.coroutines.test.runTest
2221
import org.junit.Assert.assertEquals
@@ -30,7 +29,11 @@ class LoginViewModelTests : TestsBase() {
3029
fun `Identifier must have correct length`() = runTest {
3130
val minLength = 5
3231
val maxLength = 100
33-
val viewModel = makeViewModel(FakeEventBus(), minLength, maxLength, 8)
32+
val viewModel = makeViewModel(
33+
identifierMinLength = minLength,
34+
identifierMaxLength = maxLength,
35+
randomCodeMinLength = 8
36+
)
3437
backgroundScope.launch { viewModel.canSubmit.collect() }
3538

3639
for (i in 0..<minLength) {
@@ -79,7 +82,7 @@ class LoginViewModelTests : TestsBase() {
7982
runCurrent()
8083
viewModel.submit()
8184
runCurrent()
82-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
85+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
8386
assertTrue(viewModel.isWaitingForRandomCode.value)
8487
}
8588

@@ -102,7 +105,11 @@ class LoginViewModelTests : TestsBase() {
102105
@Test
103106
fun `Random code must have correct length`() = runTest {
104107
val minLength = 10
105-
val viewModel = makeViewModel(FakeEventBus(), 3, 50, minLength)
108+
val viewModel = makeViewModel(
109+
identifierMinLength = 3,
110+
identifierMaxLength = 50,
111+
randomCodeMinLength = minLength
112+
)
106113
backgroundScope.launch { viewModel.canSubmit.collect() }
107114

108115
viewModel.updateIdentifier(FakeUsersEndpointApi.GOOD_USERNAME)
@@ -154,11 +161,11 @@ class LoginViewModelTests : TestsBase() {
154161
runCurrent()
155162
viewModel.submit()
156163
runCurrent()
157-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
164+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
158165
}
159166

160-
private fun TestScope.makeViewModel(
161-
eventBus: EventBus,
167+
private fun makeViewModel(
168+
eventBus: EventBus = FakeEventBus(),
162169
identifierMinLength: Int,
163170
identifierMaxLength: Int,
164171
randomCodeMinLength: Int
@@ -175,5 +182,5 @@ class LoginViewModelTests : TestsBase() {
175182
storeResolver = FakeStoreResolver(),
176183
secretsHandler = FakeSecretsHandler(),
177184
apiResolver = FakeApiResolver()
178-
).also { runCurrent() }
185+
)
179186
}

‎app/src/test/kotlin/app/fyreplace/fyreplace/test/screens/MainViewModelTests.kt renamed to ‎app/src/test/kotlin/app/fyreplace/fyreplace/test/viewmodels/MainViewModelTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.fyreplace.fyreplace.test.screens
1+
package app.fyreplace.fyreplace.test.viewmodels
22

33
import androidx.lifecycle.SavedStateHandle
44
import app.fyreplace.fyreplace.events.Event

‎app/src/test/kotlin/app/fyreplace/fyreplace/test/screens/RegisterViewModelTests.kt renamed to ‎app/src/test/kotlin/app/fyreplace/fyreplace/test/viewmodels/RegisterViewModelTests.kt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.fyreplace.fyreplace.test.screens
1+
package app.fyreplace.fyreplace.test.viewmodels
22

33
import androidx.lifecycle.SavedStateHandle
44
import app.fyreplace.fyreplace.R
@@ -16,7 +16,6 @@ import app.fyreplace.fyreplace.viewmodels.screens.RegisterViewModel
1616
import kotlinx.coroutines.ExperimentalCoroutinesApi
1717
import kotlinx.coroutines.flow.collect
1818
import kotlinx.coroutines.launch
19-
import kotlinx.coroutines.test.TestScope
2019
import kotlinx.coroutines.test.runCurrent
2120
import kotlinx.coroutines.test.runTest
2221
import org.junit.Assert.assertEquals
@@ -28,7 +27,7 @@ import org.junit.Test
2827
class RegisterViewModelTests : TestsBase() {
2928
@Test
3029
fun `Username must have correct length`() = runTest {
31-
val (minLength, maxLength, viewModel) = makeViewModel(FakeEventBus())
30+
val (minLength, maxLength, viewModel) = makeViewModel()
3231
viewModel.updateEmail(FakeUsersEndpointApi.GOOD_EMAIL)
3332
viewModel.updateHasAcceptedTerms(true)
3433
backgroundScope.launch { viewModel.canSubmit.collect() }
@@ -53,7 +52,7 @@ class RegisterViewModelTests : TestsBase() {
5352

5453
@Test
5554
fun `Email must have correct length`() = runTest {
56-
val (minLength, maxLength, viewModel) = makeViewModel(FakeEventBus())
55+
val (minLength, maxLength, viewModel) = makeViewModel()
5756
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
5857
viewModel.updateHasAcceptedTerms(true)
5958
backgroundScope.launch { viewModel.canSubmit.collect() }
@@ -78,7 +77,7 @@ class RegisterViewModelTests : TestsBase() {
7877

7978
@Test
8079
fun `Email must have @`() = runTest {
81-
val (_, _, viewModel) = makeViewModel(FakeEventBus())
80+
val (_, _, viewModel) = makeViewModel()
8281
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
8382
viewModel.updateHasAcceptedTerms(true)
8483
backgroundScope.launch { viewModel.canSubmit.collect() }
@@ -94,7 +93,7 @@ class RegisterViewModelTests : TestsBase() {
9493

9594
@Test
9695
fun `Terms must be accepted`() = runTest {
97-
val (_, _, viewModel) = makeViewModel(FakeEventBus())
96+
val (_, _, viewModel) = makeViewModel()
9897
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
9998
viewModel.updateEmail(FakeUsersEndpointApi.GOOD_EMAIL)
10099
backgroundScope.launch { viewModel.canSubmit.collect() }
@@ -170,13 +169,13 @@ class RegisterViewModelTests : TestsBase() {
170169
runCurrent()
171170
viewModel.submit()
172171
runCurrent()
173-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
172+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
174173
assertTrue(viewModel.isWaitingForRandomCode.value)
175174
}
176175

177176
@Test
178177
fun `Random code must have correct length`() = runTest {
179-
val (minLength, _, viewModel) = makeViewModel(FakeEventBus())
178+
val (minLength, _, viewModel) = makeViewModel()
180179
backgroundScope.launch { viewModel.canSubmit.collect() }
181180

182181
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
@@ -231,10 +230,10 @@ class RegisterViewModelTests : TestsBase() {
231230
runCurrent()
232231
viewModel.submit()
233232
runCurrent()
234-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
233+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
235234
}
236235

237-
private fun TestScope.makeViewModel(eventBus: EventBus): Triple<Int, Int, RegisterViewModel> {
236+
private fun makeViewModel(eventBus: EventBus = FakeEventBus()): Triple<Int, Int, RegisterViewModel> {
238237
val minLength = 5
239238
val maxLength = 100
240239
val resources = FakeResourceResolver(
@@ -254,7 +253,6 @@ class RegisterViewModelTests : TestsBase() {
254253
secretsHandler = FakeSecretsHandler(),
255254
apiResolver = FakeApiResolver()
256255
)
257-
runCurrent()
258256
return Triple(minLength, maxLength, viewModel)
259257
}
260258
}

‎app/src/test/kotlin/app/fyreplace/fyreplace/test/screens/SettingsViewModelTests.kt renamed to ‎app/src/test/kotlin/app/fyreplace/fyreplace/test/viewmodels/SettingsViewModelTests.kt

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.fyreplace.fyreplace.test.screens
1+
package app.fyreplace.fyreplace.test.viewmodels
22

33
import androidx.lifecycle.SavedStateHandle
44
import app.fyreplace.fyreplace.R
@@ -28,19 +28,22 @@ import org.junit.Test
2828
@OptIn(ExperimentalCoroutinesApi::class)
2929
class SettingsViewModelTests : TestsBase() {
3030
@Test
31-
fun `ViewModel retrieves current user`() = runTest {
31+
fun `Loading current user produces no failures`() = runTest {
3232
val eventBus = FakeEventBus()
3333
val viewModel = makeViewModel(eventBus)
3434
backgroundScope.launch { viewModel.currentUser.collect() }
3535

36+
viewModel.loadCurrentUser()
3637
runCurrent()
38+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
3739
assertNotNull(viewModel.currentUser.value)
3840
}
3941

4042
@Test
4143
fun `Updating avatar with a too large image produces a failure`() = runTest {
4244
val eventBus = FakeEventBus()
4345
val viewModel = makeViewModel(eventBus)
46+
viewModel.loadCurrentUser()
4447
runCurrent()
4548
backgroundScope.launch { viewModel.currentUser.collect() }
4649

@@ -54,6 +57,7 @@ class SettingsViewModelTests : TestsBase() {
5457
fun `Updating avatar with an invalid produces a failure`() = runTest {
5558
val eventBus = FakeEventBus()
5659
val viewModel = makeViewModel(eventBus)
60+
viewModel.loadCurrentUser()
5761
runCurrent()
5862
backgroundScope.launch { viewModel.currentUser.collect() }
5963

@@ -67,12 +71,13 @@ class SettingsViewModelTests : TestsBase() {
6771
fun `Updating avatar with a valid image produces no failures`() = runTest {
6872
val eventBus = FakeEventBus()
6973
val viewModel = makeViewModel(eventBus)
74+
viewModel.loadCurrentUser()
7075
runCurrent()
7176
backgroundScope.launch { viewModel.currentUser.collect() }
7277

7378
viewModel.updateAvatar(FakeUsersEndpointApi.NORMAL_IMAGE_FILE)
7479
runCurrent()
75-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
80+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
7681
assertEquals(
7782
FakeUsersEndpointApi.NORMAL_IMAGE_FILE.path,
7883
viewModel.currentUser.value?.avatar
@@ -83,20 +88,22 @@ class SettingsViewModelTests : TestsBase() {
8388
fun `Removing avatar produces no failures`() = runTest {
8489
val eventBus = FakeEventBus()
8590
val viewModel = makeViewModel(eventBus)
86-
runCurrent()
91+
viewModel.loadCurrentUser()
8792
viewModel.updateAvatar(FakeUsersEndpointApi.NORMAL_IMAGE_FILE)
93+
runCurrent()
8894
backgroundScope.launch { viewModel.currentUser.collect() }
8995

9096
viewModel.removeAvatar()
9197
runCurrent()
92-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
98+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
9399
assertEquals("", viewModel.currentUser.value?.avatar)
94100
}
95101

96102
@Test
97103
fun `Bio must have correct length`() = runTest {
98104
val maxLength = 30
99-
val viewModel = makeViewModel(FakeEventBus(), maxLength)
105+
val viewModel = makeViewModel(bioMaxLength = maxLength)
106+
viewModel.loadCurrentUser()
100107
runCurrent()
101108
backgroundScope.launch { viewModel.canUpdateBio.collect() }
102109

@@ -113,7 +120,8 @@ class SettingsViewModelTests : TestsBase() {
113120

114121
@Test
115122
fun `Bio must be different`() = runTest {
116-
val viewModel = makeViewModel(FakeEventBus())
123+
val viewModel = makeViewModel()
124+
viewModel.loadCurrentUser()
117125
runCurrent()
118126
backgroundScope.launch { viewModel.canUpdateBio.collect() }
119127

@@ -129,17 +137,18 @@ class SettingsViewModelTests : TestsBase() {
129137
fun `Updating bio produces no failures`() = runTest {
130138
val eventBus = FakeEventBus()
131139
val viewModel = makeViewModel(eventBus)
140+
viewModel.loadCurrentUser()
132141
runCurrent()
133142
backgroundScope.launch { viewModel.currentUser.collect() }
134143

135144
viewModel.updatePendingBio("Hello")
136145
viewModel.updateBio()
137146
runCurrent()
138-
assertEquals(0, eventBus.storedEvents.filterIsInstance<Event.Failure>().count())
147+
assertTrue(eventBus.storedEvents.filterIsInstance<Event.Failure>().isEmpty())
139148
assertEquals("Hello", viewModel.currentUser.value?.bio)
140149
}
141150

142-
private suspend fun makeViewModel(eventBus: EventBus, bioMaxLength: Int = 100) =
151+
private suspend fun makeViewModel(eventBus: EventBus = FakeEventBus(), bioMaxLength: Int = 100) =
143152
SettingsViewModel(
144153
SavedStateHandle(),
145154
eventBus,

0 commit comments

Comments
 (0)