[#21] Rebase

blyscuit · Dec 16, 2022 · 243739f · 243739f
1 parent 1a0b08c
commit 243739f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/model/UserApiModel.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/model/UserApiModel.kt
@@ -1,5 +1,6 @@
 package co.nimblehq.blisskmmic.data.model
 
+import co.nimblehq.blisskmmic.domain.model.Survey
 import co.nimblehq.blisskmmic.domain.model.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -11,10 +12,9 @@ data class UserApiModel(
     val email: String,
     val name: String,
     @SerialName("avatar_url") val avatarUrl: String
-) {
+)
 
-    fun toUser(): User = User(
-        name,
-        avatarUrl
-    )
-}
+fun UserApiModel.toUser() = User(
+    name,
+    avatarUrl
+)
diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/repository/UserRepositoryImpl.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/repository/UserRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package co.nimblehq.blisskmmic.data.repository
 
+import co.nimblehq.blisskmmic.data.model.toUser
 import co.nimblehq.blisskmmic.data.network.datasource.NetworkDataSource
 import co.nimblehq.blisskmmic.data.network.target.UserProfileTargetType
 import co.nimblehq.blisskmmic.domain.model.User

diff --git a/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/extension/StringRegexTest.kt b/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/extension/StringRegexTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 class StringRegexTest {
 
     @Test
-    fun `When calling isValidEmail emails, it returns correct validity`() {
+    fun `When calling isValidEmail emails- it returns correct validity`() {
         "a@a.co.uk".isValidEmail() shouldBe true
         "ab.cd@abc.org".isValidEmail() shouldBe true
         "a@a.com".isValidEmail() shouldBe true

diff --git a/...commonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/login/LoginViewModelTest.kt b/...commonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/login/LoginViewModelTest.kt
@@ -77,7 +77,7 @@ class LoginViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling login with an invalid email, it changes viewState to error`() = runTest {
+    fun `When calling login with an invalid email- it changes viewState to error`() = runTest {
         loginViewModel.login("invalid", password)
 
         val result = loginViewModel
@@ -88,7 +88,7 @@ class LoginViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling login with an empty password, it changes viewState to error`() = runTest {
+    fun `When calling login with an empty password- it changes viewState to error`() = runTest {
         loginViewModel.login(email, "")
 
         val result = loginViewModel