mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-23 09:56:00 +03:00
adding lateinit user property factory for use when calling the initial identify tracking
- this will allow us send the pending onboarding properties once consent is given
This commit is contained in:
parent
6c4f389342
commit
580ecc9c44
5 changed files with 189 additions and 0 deletions
|
@ -0,0 +1,36 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.features.analytics.impl
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import im.vector.app.ActiveSessionDataSource
|
||||||
|
import im.vector.app.core.extensions.vectorStore
|
||||||
|
import im.vector.app.features.analytics.extensions.toTrackingValue
|
||||||
|
import im.vector.app.features.analytics.plan.UserProperties
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
class LateInitUserPropertiesFactory @Inject constructor(
|
||||||
|
private val activeSessionDataSource: ActiveSessionDataSource,
|
||||||
|
private val context: Context,
|
||||||
|
) {
|
||||||
|
suspend fun createUserProperties(): UserProperties? {
|
||||||
|
val useCase = activeSessionDataSource.currentValue?.orNull()?.vectorStore(context)?.readUseCase()
|
||||||
|
return useCase?.let {
|
||||||
|
UserProperties(ftueUseCaseSelection = it.toTrackingValue())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,73 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.features.analytics.impl
|
||||||
|
|
||||||
|
import im.vector.app.features.analytics.plan.UserProperties
|
||||||
|
import im.vector.app.features.onboarding.FtueUseCase
|
||||||
|
import im.vector.app.test.fakes.FakeActiveSessionDataSource
|
||||||
|
import im.vector.app.test.fakes.FakeContext
|
||||||
|
import im.vector.app.test.fakes.FakeSession
|
||||||
|
import im.vector.app.test.fakes.FakeVectorStore
|
||||||
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
|
import kotlinx.coroutines.test.runBlockingTest
|
||||||
|
import org.amshove.kluent.shouldBeEqualTo
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
@ExperimentalCoroutinesApi
|
||||||
|
class LateInitUserPropertiesFactoryTest {
|
||||||
|
|
||||||
|
private val fakeActiveSessionDataSource = FakeActiveSessionDataSource()
|
||||||
|
private val fakeVectorStore = FakeVectorStore()
|
||||||
|
private val fakeContext = FakeContext()
|
||||||
|
private val fakeSession = FakeSession().also {
|
||||||
|
it.givenVectorStore(fakeVectorStore.instance)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val lateInitUserProperties = LateInitUserPropertiesFactory(
|
||||||
|
fakeActiveSessionDataSource.instance,
|
||||||
|
fakeContext.instance
|
||||||
|
)
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `given no active session when creating properties then returns null`() = runBlockingTest {
|
||||||
|
val result = lateInitUserProperties.createUserProperties()
|
||||||
|
|
||||||
|
result shouldBeEqualTo null
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `given no use case set on an active session when creating properties then returns null`() = runBlockingTest {
|
||||||
|
fakeVectorStore.givenUseCase(null)
|
||||||
|
fakeSession.givenVectorStore(fakeVectorStore.instance)
|
||||||
|
fakeActiveSessionDataSource.setActiveSession(fakeSession)
|
||||||
|
|
||||||
|
val result = lateInitUserProperties.createUserProperties()
|
||||||
|
|
||||||
|
result shouldBeEqualTo null
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `given use case set on an active session when creating properties then includes the use case`() = runBlockingTest {
|
||||||
|
fakeVectorStore.givenUseCase(FtueUseCase.TEAMS)
|
||||||
|
fakeActiveSessionDataSource.setActiveSession(fakeSession)
|
||||||
|
val result = lateInitUserProperties.createUserProperties()
|
||||||
|
|
||||||
|
result shouldBeEqualTo UserProperties(
|
||||||
|
ftueUseCaseSelection = UserProperties.FtueUseCaseSelection.WorkMessaging
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.test.fakes
|
||||||
|
|
||||||
|
import arrow.core.Option
|
||||||
|
import im.vector.app.ActiveSessionDataSource
|
||||||
|
import org.matrix.android.sdk.api.session.Session
|
||||||
|
|
||||||
|
class FakeActiveSessionDataSource {
|
||||||
|
|
||||||
|
val instance = ActiveSessionDataSource()
|
||||||
|
|
||||||
|
fun setActiveSession(session: Session) {
|
||||||
|
instance.post(Option.just(session))
|
||||||
|
}
|
||||||
|
}
|
|
@ -16,8 +16,12 @@
|
||||||
|
|
||||||
package im.vector.app.test.fakes
|
package im.vector.app.test.fakes
|
||||||
|
|
||||||
|
import im.vector.app.core.extensions.vectorStore
|
||||||
|
import im.vector.app.features.session.VectorSessionStore
|
||||||
import im.vector.app.test.testCoroutineDispatchers
|
import im.vector.app.test.testCoroutineDispatchers
|
||||||
|
import io.mockk.coEvery
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
|
import io.mockk.mockkStatic
|
||||||
import org.matrix.android.sdk.api.session.Session
|
import org.matrix.android.sdk.api.session.Session
|
||||||
|
|
||||||
class FakeSession(
|
class FakeSession(
|
||||||
|
@ -25,7 +29,19 @@ class FakeSession(
|
||||||
val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService()
|
val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService()
|
||||||
) : Session by mockk(relaxed = true) {
|
) : Session by mockk(relaxed = true) {
|
||||||
|
|
||||||
|
init {
|
||||||
|
mockkStatic("im.vector.app.core.extensions.SessionKt")
|
||||||
|
}
|
||||||
|
|
||||||
override fun cryptoService() = fakeCryptoService
|
override fun cryptoService() = fakeCryptoService
|
||||||
override val sharedSecretStorageService = fakeSharedSecretStorageService
|
override val sharedSecretStorageService = fakeSharedSecretStorageService
|
||||||
override val coroutineDispatchers = testCoroutineDispatchers
|
override val coroutineDispatchers = testCoroutineDispatchers
|
||||||
|
|
||||||
|
fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
|
||||||
|
coEvery {
|
||||||
|
this@FakeSession.vectorStore(any())
|
||||||
|
} coAnswers {
|
||||||
|
vectorSessionStore
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.test.fakes
|
||||||
|
|
||||||
|
import im.vector.app.features.onboarding.FtueUseCase
|
||||||
|
import im.vector.app.features.session.VectorSessionStore
|
||||||
|
import io.mockk.coEvery
|
||||||
|
import io.mockk.mockk
|
||||||
|
|
||||||
|
class FakeVectorStore {
|
||||||
|
val instance = mockk<VectorSessionStore>()
|
||||||
|
|
||||||
|
fun givenUseCase(useCase: FtueUseCase?) {
|
||||||
|
coEvery {
|
||||||
|
instance.readUseCase()
|
||||||
|
} coAnswers {
|
||||||
|
useCase
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue