refactor: make interaction availability as extension function [WPB-31…

…76] (#2970) * refactor: make interaction availability as extension function * imports fix * review fixes
wireapp · Aug 28, 2024 · afb1b05 · afb1b05
1 parent 770f49f
commit afb1b05
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 47 deletions.
diff --git a/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt b/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt
@@ -30,6 +30,7 @@ import com.wire.kalium.logic.data.id.TeamId
 import com.wire.kalium.logic.data.message.MessagePreview
 import com.wire.kalium.logic.data.message.UnreadEventType
 import com.wire.kalium.logic.data.mls.CipherSuite
+import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.OtherUser
 import com.wire.kalium.logic.data.user.User
 import com.wire.kalium.logic.data.user.UserId
@@ -341,6 +342,57 @@ sealed class ConversationDetails(open val conversation: Conversation) {
     )
 }
 
+fun ConversationDetails.interactionAvailability(): InteractionAvailability {
+    val availability = when (this) {
+        is ConversationDetails.Connection -> InteractionAvailability.DISABLED
+        is ConversationDetails.Group -> {
+            if (isSelfUserMember) InteractionAvailability.ENABLED
+            else InteractionAvailability.NOT_MEMBER
+        }
+
+        is ConversationDetails.OneOne -> when {
+            otherUser.defederated -> InteractionAvailability.DISABLED
+            otherUser.deleted -> InteractionAvailability.DELETED_USER
+            otherUser.connectionStatus == ConnectionState.BLOCKED -> InteractionAvailability.BLOCKED_USER
+            conversation.legalHoldStatus == Conversation.LegalHoldStatus.DEGRADED ->
+                InteractionAvailability.LEGAL_HOLD
+
+            else -> InteractionAvailability.ENABLED
+        }
+
+        is ConversationDetails.Self, is ConversationDetails.Team -> InteractionAvailability.DISABLED
+    }
+    return availability
+}
+
+enum class InteractionAvailability {
+    /**User is able to send messages and make calls */
+    ENABLED,
+
+    /**Self user is no longer conversation member */
+    NOT_MEMBER,
+
+    /**Other user is blocked by self user */
+    BLOCKED_USER,
+
+    /**Other team member or public user has been removed */
+    DELETED_USER,
+
+    /**
+     * This indicates that the conversation is using a protocol that self user does not support.
+     */
+    UNSUPPORTED_PROTOCOL,
+
+    /**Conversation type doesn't support messaging */
+    DISABLED,
+
+    /**
+     * One of conversation members is under legal hold and self user is not able to interact with it.
+     * This applies to 1:1 conversations only when other member is a guest.
+     */
+    LEGAL_HOLD
+}
+
 data class MembersInfo(val self: Conversation.Member, val otherMembers: List<Conversation.Member>)
 
 data class MemberDetails(val user: User, val role: Conversation.Member.Role)

diff --git a/...re/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCase.kt b/...re/kalium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCase.kt
@@ -22,9 +22,10 @@ import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.ConversationDetails
 import com.wire.kalium.logic.data.conversation.ConversationRepository
+import com.wire.kalium.logic.data.conversation.InteractionAvailability
+import com.wire.kalium.logic.data.conversation.interactionAvailability
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.message.MessageContent
-import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.SelfUser
 import com.wire.kalium.logic.data.user.SupportedProtocol
 import com.wire.kalium.logic.data.user.UserRepository
@@ -65,24 +66,7 @@ class ObserveConversationInteractionAvailabilityUseCase internal constructor(
                 if (!isProtocolSupported) { // short-circuit to Unsupported Protocol if it's the case
                     return@fold IsInteractionAvailableResult.Success(InteractionAvailability.UNSUPPORTED_PROTOCOL)
                 }
-                val availability = when (conversationDetails) {
-                    is ConversationDetails.Connection -> InteractionAvailability.DISABLED
-                    is ConversationDetails.Group -> {
-                        if (conversationDetails.isSelfUserMember) InteractionAvailability.ENABLED
-                        else InteractionAvailability.NOT_MEMBER
-                    }
-
-                    is ConversationDetails.OneOne -> when {
-                        conversationDetails.otherUser.defederated -> InteractionAvailability.DISABLED
-                        conversationDetails.otherUser.deleted -> InteractionAvailability.DELETED_USER
-                        conversationDetails.otherUser.connectionStatus == ConnectionState.BLOCKED -> InteractionAvailability.BLOCKED_USER
-                        conversationDetails.conversation.legalHoldStatus == Conversation.LegalHoldStatus.DEGRADED ->
-                            InteractionAvailability.LEGAL_HOLD
-                        else -> InteractionAvailability.ENABLED
-                    }
-
-                    is ConversationDetails.Self, is ConversationDetails.Team -> InteractionAvailability.DISABLED
-                }
+                val availability = conversationDetails.interactionAvailability()
                 IsInteractionAvailableResult.Success(availability)
             })
         }
@@ -110,31 +94,3 @@ sealed class IsInteractionAvailableResult {
     data class Success(val interactionAvailability: InteractionAvailability) : IsInteractionAvailableResult()
     data class Failure(val coreFailure: CoreFailure) : IsInteractionAvailableResult()
 }
-
-enum class InteractionAvailability {
-    /**User is able to send messages and make calls */
-    ENABLED,
-
-    /**Self user is no longer conversation member */
-    NOT_MEMBER,
-
-    /**Other user is blocked by self user */
-    BLOCKED_USER,
-
-    /**Other team member or public user has been removed */
-    DELETED_USER,
-
-    /**
-     * This indicates that the conversation is using a protocol that self user does not support.
-     */
-    UNSUPPORTED_PROTOCOL,
-
-    /**Conversation type doesn't support messaging */
-    DISABLED,
-
-    /**
-     * One of conversation members is under legal hold and self user is not able to interact with it.
-     * This applies to 1:1 conversations only when other member is a guest.
-     */
-    LEGAL_HOLD
-}
diff --git a/...alium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCaseTest.kt b/...alium/logic/feature/conversation/ObserveConversationInteractionAvailabilityUseCaseTest.kt
@@ -21,6 +21,7 @@ package com.wire.kalium.logic.feature.conversation
 import app.cash.turbine.test
 import com.wire.kalium.logic.StorageFailure
 import com.wire.kalium.logic.data.conversation.Conversation
+import com.wire.kalium.logic.data.conversation.InteractionAvailability
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.SupportedProtocol
 import com.wire.kalium.logic.framework.TestConversation