fix: Ignore ConnectionRequest on backend disabled RC [WPB-7087]

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt

@@ -43,7 +43,9 @@ import com.wire.kalium.logic.di.MapperProvider
 import com.wire.kalium.logic.failure.InvalidMappingFailure
 import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.flatMap
+import com.wire.kalium.logic.functional.flatMapLeft
 import com.wire.kalium.logic.functional.isRight
+import com.wire.kalium.logic.functional.left
 import com.wire.kalium.logic.functional.map
 import com.wire.kalium.logic.functional.onFailure
 import com.wire.kalium.logic.functional.onSuccess
@@ -77,6 +79,7 @@ interface ConnectionRepository {
     suspend fun setAllConnectionsAsNotified()
     suspend fun deleteConnection(connection: Connection): Either<StorageFailure, Unit>
     suspend fun getConnection(conversationId: ConversationId): Either<StorageFailure, ConversationDetails.Connection>
+    suspend fun ignoreConnectionRequest(userId: UserId): Either<CoreFailure, Unit>
 }
 
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -127,22 +130,36 @@ internal class ConnectionDataSource(
         }.map { }
     }
 
-    override suspend fun updateConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, Connection> {
+    private suspend fun updateRemoteConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, ConnectionDTO> {
         val isValidConnectionState = isValidConnectionState(connectionState)
         val newConnectionStatus = connectionStatusMapper.toApiModel(connectionState)
         if (!isValidConnectionState || newConnectionStatus == null) {
             return Either.Left(InvalidMappingFailure)
         }
 
-        return wrapApiRequest {
-            connectionApi.updateConnection(userId.toApi(), newConnectionStatus)
-        }.map { connectionDTO ->
-            val connectionStatus = connectionDTO.copy(status = newConnectionStatus)
+        return wrapApiRequest { connectionApi.updateConnection(userId.toApi(), newConnectionStatus) }
+    }
+
+    override suspend fun updateConnectionStatus(userId: UserId, connectionState: ConnectionState): Either<CoreFailure, Connection> =
+        updateRemoteConnectionStatus(userId, connectionState).map { connectionDTO ->
+            val connectionStatus = connectionDTO.copy(status = connectionStatusMapper.toApiModel(connectionState)!!)
             val connectionModel = connectionMapper.fromApiToModel(connectionDTO)
             handleUserConnectionStatusPersistence(connectionMapper.fromApiToModel(connectionStatus))
             connectionModel
         }
-    }
+
+    override suspend fun ignoreConnectionRequest(userId: UserId): Either<CoreFailure, Unit> =
+        updateRemoteConnectionStatus(userId, IGNORED)
+            .flatMapLeft {
+                if (it is NetworkFailure.FederatedBackendFailure.FailedDomains)
+                    wrapStorageRequest { connectionDAO.getConnectionByUser(userId.toDao()) }
+                        .map { connectionEntity ->
+                            val updatedConnection = connectionMapper.fromDaoToModel(connectionEntity).copy(status = IGNORED)
+                            handleUserConnectionStatusPersistence(updatedConnection)
+                        }
+                else it.left()
+            }
+            .map { Unit }
 
     /**
      * Check if we can transition to the correct connection status

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/connection/IgnoreConnectionRequestUseCase.kt

@@ -20,7 +20,6 @@ package com.wire.kalium.logic.feature.connection
 
 import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.data.connection.ConnectionRepository
-import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.functional.fold
 import com.wire.kalium.logic.kaliumLogger
@@ -43,7 +42,7 @@ internal class IgnoreConnectionRequestUseCaseImpl(
 ) : IgnoreConnectionRequestUseCase {
 
     override suspend fun invoke(userId: UserId): IgnoreConnectionRequestUseCaseResult {
-        return connectionRepository.updateConnectionStatus(userId, ConnectionState.IGNORED)
+        return connectionRepository.ignoreConnectionRequest(userId)
             .fold({
                 kaliumLogger.e("An error occurred when ignoring the connection request to $userId")
                 IgnoreConnectionRequestUseCaseResult.Failure(it)

logic/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt

@@ -41,6 +41,7 @@ import com.wire.kalium.network.api.base.authenticated.connection.ConnectionRespo
 import com.wire.kalium.network.api.base.authenticated.connection.ConnectionStateDTO
 import com.wire.kalium.network.api.base.authenticated.userDetails.UserDetailsApi
 import com.wire.kalium.network.api.base.model.ConversationId
+import com.wire.kalium.network.api.base.model.FederationUnreachableResponse
 import com.wire.kalium.network.api.base.model.LegalHoldStatusDTO
 import com.wire.kalium.network.api.base.model.QualifiedID
 import com.wire.kalium.network.api.base.model.UserProfileDTO
@@ -67,6 +68,7 @@ import io.mockative.verify
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import kotlinx.datetime.toInstant
+import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
@@ -330,6 +332,25 @@ class ConnectionRepositoryTest {
         verify(arrangement.connectionDAO)
             .suspendFunction(arrangement.connectionDAO::getConnection)
             .with(eq(connection.qualifiedConversationId))
+    }
+
+    @Test
+    fun givenAConnectionRequestIgnore_WhenSendingAConnectionStatusValid_thenTheConnectionShouldBePersisted() = runTest {
+        // given
+        val userId = NetworkUserId("user_id", "domain_id")
+        val (arrangement, connectionRepository) = Arrangement().arrange()
+        arrangement
+            .withSuccessfulUpdateConnectionStatusResponse(userId)
+            .withSuccessfulFetchSelfUserConnectionsResponse(arrangement.stubUserProfileDTO)
+
+        // when
+        val result = connectionRepository.ignoreConnectionRequest(UserId(userId.value, userId.domain))
+        result.shouldSucceed { arrangement.stubConnectionOne }
+
+        // then
+        verify(arrangement.connectionApi)
+            .suspendFunction(arrangement.connectionApi::updateConnection)
+            .with(eq(userId), eq(ConnectionStateDTO.IGNORED))
             .wasInvoked(once)
     }
 
@@ -348,9 +369,53 @@ class ConnectionRepositoryTest {
         verify(arrangement.connectionDAO)
             .suspendFunction(arrangement.connectionDAO::getConnection)
             .with(eq(connection.qualifiedConversationId))
+    }
+
+    @Test
+    fun givenAConnectionRequestIgnore_WhenApiUpdateFailedWithFederatedFailedDomains_thenTheConnectionShouldBePersisted() = runTest {
+        // given
+        val userId = NetworkUserId("user_id", "domain_id")
+        val (arrangement, connectionRepository) = Arrangement().arrange()
+        arrangement
+            .withErrorUpdatingConnectionStatusResponse(
+                userId,
+                KaliumException.FederationUnreachableException(FederationUnreachableResponse())
+            )
+            .withConnectionEntityByUser()
+            .withSuccessfulFetchSelfUserConnectionsResponse(arrangement.stubUserProfileDTO)
+
+        // when
+        val result = connectionRepository.ignoreConnectionRequest(UserId(userId.value, userId.domain))
+        result.shouldSucceed { arrangement.stubConnectionOne }
+
+        // then
+        verify(arrangement.connectionApi)
+            .suspendFunction(arrangement.connectionApi::updateConnection)
+            .with(eq(userId), eq(ConnectionStateDTO.IGNORED))
             .wasInvoked(once)
     }
 
+    @Test
+    fun givenAConnectionRequestIgnore_WhenApiUpdateFailedWithNonFederatedFailedDomains_thenTheConnectionNotShouldBePersisted() =
+        runTest {
+            // given
+            val userId = NetworkUserId("user_id", "domain_id")
+            val (arrangement, connectionRepository) = Arrangement().arrange()
+            arrangement
+                .withErrorUpdatingConnectionStatusResponse(userId)
+                .withSuccessfulFetchSelfUserConnectionsResponse(arrangement.stubUserProfileDTO)
+
+            // when
+            val result = connectionRepository.ignoreConnectionRequest(UserId(userId.value, userId.domain))
+            result.shouldFail { arrangement.stubConnectionOne }
+
+            // then
+            verify(arrangement.connectionApi)
+                .suspendFunction(arrangement.connectionApi::updateConnection)
+                .with(eq(userId), eq(ConnectionStateDTO.IGNORED))
+                .wasInvoked(once)
+        }
+
     private class Arrangement :
         MemberDAOArrangement by MemberDAOArrangementImpl() {
         @Mock
@@ -435,6 +500,16 @@ class ConnectionRepositoryTest {
         val stubConversationID1 = QualifiedIDEntity("conversationId1", "domain")
         val stubConversationID2 = QualifiedIDEntity("conversationId2", "domain")
 
+        val connectionEntity = ConnectionEntity(
+            conversationId = "conversationId1",
+            from = "fromId",
+            lastUpdateDate = Instant.DISTANT_PAST,
+            qualifiedConversationId = ConversationIDEntity("conversationId1", "domain"),
+            qualifiedToId = QualifiedIDEntity("connectionId1", "domain"),
+            status = ConnectionEntity.State.ACCEPTED,
+            toId = "connectionId1"
+        )
+
         fun withSelfUserTeamId(either: Either<CoreFailure, TeamId?>): Arrangement {
             given(selfTeamIdProvider)
                 .suspendFunction(selfTeamIdProvider::invoke)
@@ -499,7 +574,7 @@ class ConnectionRepositoryTest {
         fun withSuccessfulUpdateConnectionStatusResponse(userId: NetworkUserId): Arrangement = apply {
             given(connectionApi)
                 .suspendFunction(connectionApi::updateConnection)
-                .whenInvokedWith(eq(userId), eq(ConnectionStateDTO.ACCEPTED))
+                .whenInvokedWith(eq(userId), any())
                 .then { _, _ -> NetworkResponse.Success(stubConnectionOne, mapOf(), 200) }
 
             withUpdateOrInsertOneOnOneMemberSuccess(
@@ -508,11 +583,14 @@ class ConnectionRepositoryTest {
             )
         }
 
-        fun withErrorUpdatingConnectionStatusResponse(userId: NetworkUserId): Arrangement = apply {
+        fun withErrorUpdatingConnectionStatusResponse(
+            userId: NetworkUserId,
+            exception: KaliumException = KaliumException.GenericError(RuntimeException("An error the server threw!"))
+        ): Arrangement = apply {
             given(connectionApi)
                 .suspendFunction(connectionApi::updateConnection)
                 .whenInvokedWith(eq(userId), any())
-                .then { _, _ -> NetworkResponse.Error(KaliumException.GenericError(RuntimeException("An error the server threw!"))) }
+                .then { _, _ -> NetworkResponse.Error(exception) }
         }
 
         fun withDeleteConnectionDataAndConversation(conversationId: QualifiedIDEntity): Arrangement = apply {
@@ -522,6 +600,13 @@ class ConnectionRepositoryTest {
                 .thenReturn(Unit)
         }
 
+        fun withConnectionEntityByUser(): Arrangement = apply {
+            given(connectionDAO)
+                .suspendFunction(connectionDAO::getConnectionByUser)
+                .whenInvokedWith(any())
+                .thenReturn(connectionEntity)
+        }
+
         fun withSuccessfulFetchSelfUserConnectionsResponse(stubUserProfileDTO: UserProfileDTO): Arrangement {
             given(connectionApi)
                 .suspendFunction(connectionApi::fetchSelfUserConnections)

logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/connection/IgnoreConnectionRequestUseCaseTest.kt

@@ -52,27 +52,27 @@ class IgnoreConnectionRequestUseCaseTest {
     fun givenAConnectionRequest_whenInvokingIgnoreConnectionRequestAndOk_thenShouldReturnsASuccessResult() = runTest {
         // given
         given(connectionRepository)
-            .suspendFunction(connectionRepository::updateConnectionStatus)
-            .whenInvokedWith(eq(userId), eq(ConnectionState.IGNORED))
-            .thenReturn(Either.Right(connection))
+            .suspendFunction(connectionRepository::ignoreConnectionRequest)
+            .whenInvokedWith(eq(userId))
+            .thenReturn(Either.Right(Unit))
 
         // when
         val resultOk = ignoreConnectionRequestUseCase(userId)
 
         // then
         assertEquals(IgnoreConnectionRequestUseCaseResult.Success, resultOk)
         verify(connectionRepository)
-            .suspendFunction(connectionRepository::updateConnectionStatus)
-            .with(eq(userId), eq(ConnectionState.IGNORED))
+            .suspendFunction(connectionRepository::ignoreConnectionRequest)
+            .with(eq(userId))
             .wasInvoked(once)
     }
 
     @Test
     fun givenAConnectionRequest_whenInvokingIgnoreConnectionRequestAndFails_thenShouldReturnsAFailureResult() = runTest {
         // given
         given(connectionRepository)
-            .suspendFunction(connectionRepository::updateConnectionStatus)
-            .whenInvokedWith(eq(userId), eq(ConnectionState.IGNORED))
+            .suspendFunction(connectionRepository::ignoreConnectionRequest)
+            .whenInvokedWith(eq(userId))
             .thenReturn(Either.Left(CoreFailure.Unknown(RuntimeException("Some error"))))
 
         // when
@@ -81,8 +81,8 @@ class IgnoreConnectionRequestUseCaseTest {
         // then
         assertEquals(IgnoreConnectionRequestUseCaseResult.Failure::class, resultFailure::class)
         verify(connectionRepository)
-            .suspendFunction(connectionRepository::updateConnectionStatus)
-            .with(eq(userId), eq(ConnectionState.IGNORED))
+            .suspendFunction(connectionRepository::ignoreConnectionRequest)
+            .with(eq(userId))
             .wasInvoked(once)
     }
 

logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/ConnectionRepositoryArrangement.kt

@@ -37,6 +37,7 @@ internal interface ConnectionRepositoryArrangement {
     fun withDeleteConnection(result: Either<StorageFailure, Unit>, connection: Matcher<Connection> = any())
     fun withConnectionList(connectionsFlow: Flow<List<ConversationDetails>>)
     fun withUpdateConnectionStatus(result: Either<CoreFailure, Connection>)
+    fun withIgnoreConnectionRequest(result: Either<CoreFailure, Unit>)
 }
 
 internal open class ConnectionRepositoryArrangementImpl : ConnectionRepositoryArrangement {
@@ -75,4 +76,11 @@ internal open class ConnectionRepositoryArrangementImpl : ConnectionRepositoryAr
             .whenInvokedWith(any(), any())
             .thenReturn(result)
     }
+
+    override fun withIgnoreConnectionRequest(result: Either<CoreFailure, Unit>) {
+        given(connectionRepository)
+            .suspendFunction(connectionRepository::ignoreConnectionRequest)
+            .whenInvokedWith(any())
+            .thenReturn(result)
+    }
 }

network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/ConnectionApiV4.kt

@@ -20,13 +20,17 @@ package com.wire.kalium.network.api.v4.authenticated
 
 import com.wire.kalium.network.AuthenticatedNetworkClient
 import com.wire.kalium.network.api.base.authenticated.connection.ConnectionDTO
+import com.wire.kalium.network.api.base.authenticated.connection.ConnectionStateDTO
+import com.wire.kalium.network.api.base.authenticated.connection.UpdateConnectionRequest
 import com.wire.kalium.network.api.base.model.UserId
 import com.wire.kalium.network.api.v3.authenticated.ConnectionApiV3
 import com.wire.kalium.network.exceptions.KaliumException
 import com.wire.kalium.network.utils.NetworkResponse
 import com.wire.kalium.network.utils.wrapFederationResponse
 import com.wire.kalium.network.utils.wrapKaliumResponse
 import io.ktor.client.request.post
+import io.ktor.client.request.put
+import io.ktor.client.request.setBody
 import io.ktor.utils.io.errors.IOException
 
 internal open class ConnectionApiV4 internal constructor(
@@ -40,4 +44,15 @@ internal open class ConnectionApiV4 internal constructor(
     } catch (e: IOException) {
         NetworkResponse.Error(KaliumException.GenericError(e))
     }
+
+    override suspend fun updateConnection(userId: UserId, connectionStatus: ConnectionStateDTO): NetworkResponse<ConnectionDTO> =
+        try {
+            httpClient.put("$PATH_CONNECTIONS_ENDPOINTS/${userId.domain}/${userId.value}") {
+                setBody(UpdateConnectionRequest(connectionStatus))
+            }.let { response ->
+                wrapFederationResponse(response) { wrapKaliumResponse { response } }
+            }
+        } catch (e: IOException) {
+            NetworkResponse.Error(KaliumException.GenericError(e))
+        }
 }

persistence/src/commonMain/db_user/com/wire/kalium/persistence/Connections.sq

@@ -56,3 +56,6 @@ SELECT * FROM Connection LEFT JOIN User ON Connection.qualified_to == User.quali
 
 selectConnection:
 SELECT * FROM Connection WHERE qualified_conversation = ?;
+
+selectConnectionRequestByUser:
+SELECT * FROM Connection LEFT JOIN User ON Connection.qualified_to == User.qualified_id WHERE Connection.qualified_to = :user_id;

persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAO.kt

@@ -71,4 +71,5 @@ interface ConnectionDAO {
     suspend fun updateNotificationFlag(flag: Boolean, userId: QualifiedIDEntity)
     suspend fun setAllConnectionsAsNotified()
     suspend fun getConnection(id: ConversationIDEntity): ConnectionEntity?
+    suspend fun getConnectionByUser(userId: QualifiedIDEntity): ConnectionEntity?
 }

persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAOImpl.kt

@@ -186,4 +186,10 @@ class ConnectionDAOImpl(
     override suspend fun setAllConnectionsAsNotified() = withContext(queriesContext) {
         connectionsQueries.setAllConnectionsAsNotified()
     }
+
+    override suspend fun getConnectionByUser(userId: QualifiedIDEntity): ConnectionEntity? {
+        return withContext(queriesContext) {
+            connectionsQueries.selectConnectionRequestByUser(userId, connectionMapper::toModel).executeAsOneOrNull()
+        }
+    }
 }