Skip to content

chore: more generic event for user admin promotion (WPB-25283) #4830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbakhtiarov wants to merge 1 commit into
base: develop
Choose a base branch
from
+32 −5
Open

chore: more generic event for user admin promotion (WPB-25283) #4830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class SystemMessageContentMapper @Inject constructor(
fun mapMessage(
message: Message.System,
members: List<User>
): UIMessageContent = when (val content = message.content) {
): UIMessageContent? = when (val content = message.content) {
is MemberChange -> mapMemberChangeMessage(content, message.senderUserId, members)
is MessageContent.MissedCall -> mapMissedCallMessage(message.senderUserId, members)
is MessageContent.ConversationRenamed -> mapConversationRenamedMessage(message.senderUserId, content, members)
Expand Down Expand Up @@ -231,7 +231,7 @@ class SystemMessageContentMapper @Inject constructor(
content: MemberChange,
senderUserId: UserId,
userList: List<User>
): UIMessageContent.SystemMessage {
): UIMessageContent.SystemMessage? {
val sender = userList.findUser(userId = senderUserId)
val isAuthorSelfAction = content.members.size == 1 && senderUserId == content.members.first()
val isSelfTriggered = sender is SelfUser
Expand Down Expand Up @@ -288,7 +288,12 @@ class SystemMessageContentMapper @Inject constructor(
memberNames = memberNameList
)

is MemberChange.SelfUserPromotedToAdmin -> UIMessageContent.SystemMessage.SelfUserPromotedToAdmin
is MemberChange.UserPromotedToAdmin ->
if (content.members.any { userList.findUser(it) is SelfUser }) {
UIMessageContent.SystemMessage.SelfUserPromotedToAdmin
} else {
null
}
}
}

Expand Down
24 changes: 23 additions & 1 deletion app/src/test/kotlin/com/wire/android/mapper/SystemMessageContentMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class SystemMessageContentMapperTest {
Locale.getDefault()
)

assertIs<SystemMessage.ConversationMessageCreated>(resultConversationCreated)
assertIs<SystemMessage.ConversationMessageCreated>(resultConversationCreated!!)
assertEquals(10584735, (resultConversationCreated.author as UIText.StringResource).resId)
assertEquals(expectedFormattedDate, resultConversationCreated.date)
}
Expand Down Expand Up @@ -203,6 +203,28 @@ class SystemMessageContentMapperTest {
}
}

@Test
fun givenSelfUserPromotedToAdminContent_whenMapping_thenReturnsSelfUserPromotedSystemMessage() {
val (_, mapper) = Arrangement().arrange()
val members = listOf(TestUser.SELF_USER, TestUser.OTHER_USER)
val content = MessageContent.MemberChange.UserPromotedToAdmin(listOf(TestUser.SELF_USER_ID))

val result = mapper.mapMemberChangeMessage(content, TestUser.SELF_USER_ID, members)

assertEquals(SystemMessage.SelfUserPromotedToAdmin, result)
}

@Test
fun givenOtherUserPromotedToAdminContent_whenMapping_thenReturnsNull() {
val (_, mapper) = Arrangement().arrange()
val members = listOf(TestUser.SELF_USER, TestUser.OTHER_USER)
val content = MessageContent.MemberChange.UserPromotedToAdmin(listOf(TestUser.OTHER_USER.id))

val result = mapper.mapMemberChangeMessage(content, TestUser.SELF_USER_ID, members)

assertEquals(null, result)
}

@Test
fun givenFederationStoppedRemoved_whenMappingToSystemMessage_thenCorrectValuesShouldBeReturned() = runTest {
// Given
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 7 files
+4 −3 core/data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
+2 −2 data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
+1 −1 data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MemberChangeEventHandler.kt
+13 −4 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MemberChangeEventHandlerTest.kt
Loading