Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

knock requests : add tests to the feature

Browse source
This commit is contained in:
ganfra 2024-12-17 15:36:30 +01:00
parent 108253ca82
commit a6decdf697
8 changed files with 886 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt Normal file
View file

@ -0,0 +1,25 @@
/*
* Copyright 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
*/
package io.element.android.features.knockrequests.impl.data
import com.squareup.anvil.annotations.ContributesTo
import dagger.Module
import dagger.Provides
import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.di.SingleIn
import io.element.android.libraries.matrix.api.room.MatrixRoom
@Module
@ContributesTo(RoomScope::class)
object KnockRequestsModule {
@Provides
@SingleIn(RoomScope::class)
fun knockRequestsService(room: MatrixRoom): KnockRequestsService {
return KnockRequestsService(room.knockRequestsFlow, room.roomCoroutineScope)
}
}

19
features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt
View file

@ -8,13 +8,13 @@
package io.element.android.features.knockrequests.impl.data
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.di.SingleIn
import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.room.MatrixRoom
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
@ -22,23 +22,24 @@ import kotlinx.coroutines.flow.getAndUpdate
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.supervisorScope
import javax.inject.Inject
@SingleIn(RoomScope::class)
class KnockRequestsService @Inject constructor(room: MatrixRoom) {
class KnockRequestsService(
knockRequestsFlow: Flow<List<KnockRequest>>,
coroutineScope: CoroutineScope,
) {
// Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them.
private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet())
val knockRequestsFlow = combine(
room.wrappedKnockRequestsFlow(),
knockRequestsFlow.wrapped(),
handledKnockRequestIds,
) { knockRequests, handledKnockIds ->
val presentableKnockRequests = knockRequests
.filter { it.eventId !in handledKnockIds }
.toImmutableList()
AsyncData.Success(presentableKnockRequests)
}.stateIn(room.roomCoroutineScope, SharingStarted.Lazily, AsyncData.Loading())
}.stateIn(coroutineScope, SharingStarted.Lazily, AsyncData.Loading())
private fun knockRequestsList() = knockRequestsFlow.value.dataOrNull().orEmpty()
@ -129,7 +130,7 @@ class KnockRequestsService @Inject constructor(room: MatrixRoom) {
private fun knockRequestNotFoundResult() = Result.failure<Unit>(IllegalArgumentException("Knock request not found"))
private fun MatrixRoom.wrappedKnockRequestsFlow() = knockRequestsFlow.map { knockRequests ->
private fun Flow<List<KnockRequest>>.wrapped() = map { knockRequests ->
knockRequests.map { KnockRequestWrapper(it) }
}
}