Skip to content
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

chore: Remove self user creator [WPB-11559] #3118

Merged
merged 3 commits into from
Dec 2, 2024
Merged

chore: Remove self user creator [WPB-11559] #3118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
154c6b4
chore: Remove self user creator [WPB-11559]
m-zagorski Nov 21, 2024
8e4780d
Merge branch 'develop' into chore/remove-self-user-creator
m-zagorski Nov 28, 2024
4520416
Cleanup field from db
m-zagorski Nov 28, 2024
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
1 change: 0 additions & 1 deletion data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ sealed class ConversationDetails(open val conversation: Conversation) {
override val conversation: Conversation,
val hasOngoingCall: Boolean = false,
val isSelfUserMember: Boolean,
val isSelfUserCreator: Boolean,
val selfRole: Conversation.Member.Role?
// val isTeamAdmin: Boolean, TODO kubaz
) : ConversationDetails(conversation)
Expand Down
1 change: 0 additions & 1 deletion logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ internal class ConversationMapperImpl(
conversation = fromConversationViewToEntity(daoModel),
hasOngoingCall = callStatus != null, // todo: we can do better!
isSelfUserMember = isMember,
isSelfUserCreator = isCreator == 1L,
selfRole = selfRole?.let { conversationRoleMapper.fromDAO(it) }
)
}
Expand Down
5 changes: 0 additions & 5 deletions logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ class CallRepositoryTest {
Arrangement.groupConversation,
false,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down Expand Up @@ -212,7 +211,6 @@ class CallRepositoryTest {
ConversationDetails.Group(
Arrangement.groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down Expand Up @@ -266,7 +264,6 @@ class CallRepositoryTest {
ConversationDetails.Group(
Arrangement.groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down Expand Up @@ -309,7 +306,6 @@ class CallRepositoryTest {
ConversationDetails.Group(
Arrangement.groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down Expand Up @@ -366,7 +362,6 @@ class CallRepositoryTest {
ConversationDetails.Group(
Arrangement.groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down
1 change: 0 additions & 1 deletion ...tlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ class EndCallOnConversationChangeUseCaseTest {
conversation = conversation,
hasOngoingCall = true,
isSelfUserMember = false,
isSelfUserCreator = false,
selfRole = null
)

Expand Down
2 changes: 0 additions & 2 deletions ...otlin/com/wire/kalium/logic/feature/conversation/ObserveConversationDetailsUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,13 @@ class ObserveConversationDetailsUseCaseTest {
ConversationDetails.Group(
conversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
),
Either.Right(
ConversationDetails.Group(
conversation.copy(name = "New Name"),
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down
8 changes: 0 additions & 8 deletions ...n/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ class ObserveConversationListDetailsUseCaseTest {
ConversationDetails.Group(
groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down Expand Up @@ -100,14 +99,12 @@ class ObserveConversationListDetailsUseCaseTest {
ConversationDetails.Group(
groupConversation1,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
val groupConversationDetails2 =
ConversationDetails.Group(
groupConversation2,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down Expand Up @@ -141,7 +138,6 @@ class ObserveConversationListDetailsUseCaseTest {
val groupConversationDetails = ConversationDetails.Group(
conversation = groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down Expand Up @@ -175,7 +171,6 @@ class ObserveConversationListDetailsUseCaseTest {
ConversationDetails.Group(
groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)
)
Expand Down Expand Up @@ -223,7 +218,6 @@ class ObserveConversationListDetailsUseCaseTest {
val groupConversationDetails = ConversationDetails.Group(
groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down Expand Up @@ -258,7 +252,6 @@ class ObserveConversationListDetailsUseCaseTest {
val groupConversationDetails = ConversationDetails.Group(
groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down Expand Up @@ -287,7 +280,6 @@ class ObserveConversationListDetailsUseCaseTest {
val groupConversationDetails = ConversationDetails.Group(
groupConversation,
isSelfUserMember = true,
isSelfUserCreator = true,
selfRole = Conversation.Member.Role.Member
)

Expand Down
1 change: 0 additions & 1 deletion logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestConversationDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ object TestConversationDetails {

val CONVERSATION_GROUP = ConversationDetails.Group(
conversation = TestConversation.GROUP(),
isSelfUserCreator = true,
isSelfUserMember = true,
selfRole = Conversation.Member.Role.Member
)
Expand Down
Loading