Merge pull request #7175 from thundernest/rename_account_state_reposi…

…tory_save_methods Rename AccountStateRepository save to set function names
thunderbird · Sep 15, 2023 · e84354c · e84354c
2 parents bfe82bf + 69c373e
commit e84354c
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 39 deletions.
diff --git a/.../src/main/kotlin/app/k9mail/feature/account/common/data/InMemoryAccountStateRepository.kt b/.../src/main/kotlin/app/k9mail/feature/account/common/data/InMemoryAccountStateRepository.kt
@@ -15,27 +15,27 @@ class InMemoryAccountStateRepository(
         return state
     }
 
-    override fun save(accountState: AccountState) {
+    override fun setState(accountState: AccountState) {
         state = accountState
     }
 
-    override fun saveEmailAddress(emailAddress: String) {
+    override fun setEmailAddress(emailAddress: String) {
         state = state.copy(emailAddress = emailAddress)
     }
 
-    override fun saveIncomingServerSettings(serverSettings: ServerSettings) {
+    override fun setIncomingServerSettings(serverSettings: ServerSettings) {
         state = state.copy(incomingServerSettings = serverSettings)
     }
 
-    override fun saveOutgoingServerSettings(serverSettings: ServerSettings) {
+    override fun setOutgoingServerSettings(serverSettings: ServerSettings) {
         state = state.copy(outgoingServerSettings = serverSettings)
     }
 
-    override fun saveAuthorizationState(authorizationState: AuthorizationState) {
+    override fun setAuthorizationState(authorizationState: AuthorizationState) {
         state = state.copy(authorizationState = authorizationState)
     }
 
-    override fun saveOptions(options: AccountOptions) {
+    override fun setOptions(options: AccountOptions) {
         state = state.copy(options = options)
     }
 

diff --git a/.../common/src/main/kotlin/app/k9mail/feature/account/common/domain/AccountDomainContract.kt b/.../common/src/main/kotlin/app/k9mail/feature/account/common/domain/AccountDomainContract.kt
@@ -10,17 +10,17 @@ interface AccountDomainContract {
     interface AccountStateRepository {
         fun getState(): AccountState
 
-        fun save(accountState: AccountState)
+        fun setState(accountState: AccountState)
 
-        fun saveEmailAddress(emailAddress: String)
+        fun setEmailAddress(emailAddress: String)
 
-        fun saveIncomingServerSettings(serverSettings: ServerSettings)
+        fun setIncomingServerSettings(serverSettings: ServerSettings)
 
-        fun saveOutgoingServerSettings(serverSettings: ServerSettings)
+        fun setOutgoingServerSettings(serverSettings: ServerSettings)
 
-        fun saveAuthorizationState(authorizationState: AuthorizationState)
+        fun setAuthorizationState(authorizationState: AuthorizationState)
 
-        fun saveOptions(options: AccountOptions)
+        fun setOptions(options: AccountOptions)
 
         fun clear()
     }

diff --git a/...main/kotlin/app/k9mail/feature/account/common/ui/preview/PreviewAccountStateRepository.kt b/...main/kotlin/app/k9mail/feature/account/common/ui/preview/PreviewAccountStateRepository.kt
@@ -9,6 +9,7 @@ import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ServerSettings
 
 class PreviewAccountStateRepository : AccountDomainContract.AccountStateRepository {
+
     override fun getState(): AccountState = AccountState(
         emailAddress = "[email protected]",
         incomingServerSettings = ServerSettings(
@@ -33,17 +34,17 @@ class PreviewAccountStateRepository : AccountDomainContract.AccountStateReposito
         ),
     )
 
-    override fun save(accountState: AccountState) = Unit
+    override fun setState(accountState: AccountState) = Unit
 
-    override fun saveEmailAddress(emailAddress: String) = Unit
+    override fun setEmailAddress(emailAddress: String) = Unit
 
-    override fun saveIncomingServerSettings(serverSettings: ServerSettings) = Unit
+    override fun setIncomingServerSettings(serverSettings: ServerSettings) = Unit
 
-    override fun saveOutgoingServerSettings(serverSettings: ServerSettings) = Unit
+    override fun setOutgoingServerSettings(serverSettings: ServerSettings) = Unit
 
-    override fun saveAuthorizationState(authorizationState: AuthorizationState) = Unit
+    override fun setAuthorizationState(authorizationState: AuthorizationState) = Unit
 
-    override fun saveOptions(options: AccountOptions) = Unit
+    override fun setOptions(options: AccountOptions) = Unit
 
     override fun clear() = Unit
 }
diff --git a/.../test/kotlin/app/k9mail/feature/account/common/data/InMemoryAccountStateRepositoryTest.kt b/.../test/kotlin/app/k9mail/feature/account/common/data/InMemoryAccountStateRepositoryTest.kt
@@ -31,7 +31,7 @@ class InMemoryAccountStateRepositoryTest {
     }
 
     @Test
-    fun `should save state`() {
+    fun `should set state`() {
         val testSubject = InMemoryAccountStateRepository(
             AccountState(
                 uuid = "uuid",
@@ -58,56 +58,56 @@ class InMemoryAccountStateRepositoryTest {
             ),
         )
 
-        testSubject.save(newState)
+        testSubject.setState(newState)
 
         assertThat(testSubject.getState()).isEqualTo(newState)
     }
 
     @Test
-    fun `should save email address`() {
+    fun `should set email address`() {
         val testSubject = InMemoryAccountStateRepository()
 
-        testSubject.saveEmailAddress("emailAddress")
+        testSubject.setEmailAddress("emailAddress")
 
         assertThat(testSubject.getState().emailAddress)
             .isEqualTo("emailAddress")
     }
 
     @Test
-    fun `should save incoming server settings`() {
+    fun `should set incoming server settings`() {
         val testSubject = InMemoryAccountStateRepository()
 
-        testSubject.saveIncomingServerSettings(INCOMING_SERVER_SETTINGS)
+        testSubject.setIncomingServerSettings(INCOMING_SERVER_SETTINGS)
 
         assertThat(testSubject.getState().incomingServerSettings)
             .isEqualTo(INCOMING_SERVER_SETTINGS)
     }
 
     @Test
-    fun `should save outgoing server settings`() {
+    fun `should set outgoing server settings`() {
         val testSubject = InMemoryAccountStateRepository()
 
-        testSubject.saveOutgoingServerSettings(OUTGOING_SERVER_SETTINGS)
+        testSubject.setOutgoingServerSettings(OUTGOING_SERVER_SETTINGS)
 
         assertThat(testSubject.getState().outgoingServerSettings)
             .isEqualTo(OUTGOING_SERVER_SETTINGS)
     }
 
     @Test
-    fun `should save authorization state`() {
+    fun `should set authorization state`() {
         val testSubject = InMemoryAccountStateRepository()
 
-        testSubject.saveAuthorizationState(AuthorizationState("authorizationState"))
+        testSubject.setAuthorizationState(AuthorizationState("authorizationState"))
 
         assertThat(testSubject.getState().authorizationState)
             .isEqualTo(AuthorizationState("authorizationState"))
     }
 
     @Test
-    fun `should save options`() {
+    fun `should set options`() {
         val testSubject = InMemoryAccountStateRepository()
 
-        testSubject.saveOptions(OPTIONS)
+        testSubject.setOptions(OPTIONS)
 
         assertThat(testSubject.getState().options)
             .isEqualTo(OPTIONS)

diff --git a/...app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsViewModel.kt b/...app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsViewModel.kt
@@ -115,7 +115,7 @@ class IncomingServerSettingsViewModel(
         }
 
         if (!hasError) {
-            accountStateRepository.saveIncomingServerSettings(state.value.toServerSettings())
+            accountStateRepository.setIncomingServerSettings(state.value.toServerSettings())
             navigateNext()
         }
     }

diff --git a/...app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsViewModel.kt b/...app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsViewModel.kt
@@ -78,7 +78,7 @@ class OutgoingServerSettingsViewModel(
         }
 
         if (!hasError) {
-            accountStateRepository.saveOutgoingServerSettings(state.value.toServerSettings())
+            accountStateRepository.setOutgoingServerSettings(state.value.toServerSettings())
             navigateNext()
         }
     }

diff --git a/...k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsViewModelTest.kt b/...k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsViewModelTest.kt
@@ -56,7 +56,7 @@ class IncomingServerSettingsViewModelTest {
         )
         val turbines = turbinesWithInitialStateCheck(testSubject, State())
 
-        repository.save(accountState)
+        repository.setState(accountState)
 
         testSubject.event(Event.LoadAccountState)
 

diff --git a/...k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsViewModelTest.kt b/...k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsViewModelTest.kt
@@ -54,7 +54,7 @@ class OutgoingServerSettingsViewModelTest {
         )
         val turbines = turbinesWithInitialStateCheck(testSubject, State())
 
-        repository.save(accountState)
+        repository.setState(accountState)
 
         testSubject.event(Event.LoadAccountState)
 

diff --git a/...n/kotlin/app/k9mail/feature/account/server/validation/ui/BaseServerValidationViewModel.kt b/...n/kotlin/app/k9mail/feature/account/server/validation/ui/BaseServerValidationViewModel.kt
@@ -102,7 +102,7 @@ abstract class BaseServerValidationViewModel(
 
     private fun onOAuthResult(result: OAuthResult) {
         if (result is OAuthResult.Success) {
-            accountStateRepository.saveAuthorizationState(result.authorizationState)
+            accountStateRepository.setAuthorizationState(result.authorizationState)
             updateState {
                 it.copy(
                     needsAuthorization = false,

diff --git a/...ccount/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModel.kt b/...ccount/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModel.kt
@@ -104,7 +104,7 @@ class AccountSetupViewModel(
 
     private fun changeToSetupStep(setupStep: SetupStep) {
         if (setupStep == SetupStep.AUTO_CONFIG) {
-            accountStateRepository.saveAuthorizationState(AuthorizationState(null))
+            accountStateRepository.setAuthorizationState(AuthorizationState(null))
         }
 
         updateState {

diff --git a/...kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/AccountAutoDiscoveryViewModel.kt b/...kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/AccountAutoDiscoveryViewModel.kt
@@ -250,7 +250,7 @@ internal class AccountAutoDiscoveryViewModel(
     private fun navigateBack() = emitEffect(Effect.NavigateBack)
 
     private fun navigateNext(isAutomaticConfig: Boolean) {
-        accountStateRepository.save(state.value.toAccountState())
+        accountStateRepository.setState(state.value.toAccountState())
 
         emitEffect(Effect.NavigateNext(isAutomaticConfig))
     }

diff --git a/...up/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsViewModel.kt b/...up/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsViewModel.kt
@@ -89,7 +89,7 @@ internal class AccountOptionsViewModel(
         }
 
         if (!hasError) {
-            accountStateRepository.saveOptions(state.value.toAccountOptions())
+            accountStateRepository.setOptions(state.value.toAccountOptions())
             navigateNext()
         }
     }

diff --git a/...nt/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModelTest.kt b/...nt/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModelTest.kt
@@ -132,7 +132,7 @@ class AccountSetupViewModelTest {
             prop(State::setupStep).isEqualTo(SetupStep.OPTIONS)
         }
 
-        accountStateRepository.save(expectedAccountState)
+        accountStateRepository.setState(expectedAccountState)
 
         viewModel.event(AccountSetupContract.Event.OnNext)