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

Jump to bottom

fix: self clients list is not updated when a new client event is received (WPB-5791) #2290

Merged
merged 10 commits into from
Dec 7, 2023
Merged

fix: self clients list is not updated when a new client event is received (WPB-5791) #2290

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8904aa6
fix: End Calls when Self added new device
borichellow Dec 6, 2023
0810fb3
Merge branch 'develop' into fix/end_calls_when_self_added_new_device
mchenani Dec 6, 2023
427c456
Merge branch 'develop' into fix/end_calls_when_self_added_new_device
mchenani Dec 6, 2023
f54075c
Merge branch 'develop' into fix/end_calls_when_self_added_new_device
mchenani Dec 6, 2023
09b3454
Moved the changes into DB layer
borichellow Dec 6, 2023
14ca550
Merge branch 'develop' into fix/end_calls_when_self_added_new_device
borichellow Dec 6, 2023
d376515
Merge branch 'fix/end_calls_when_self_added_new_device' of github.com…
borichellow Dec 6, 2023
3507b48
Moved transaction into DB layer
borichellow Dec 7, 2023
b05a0d3
Fixed tests
borichellow Dec 7, 2023
5354485
Added test
borichellow Dec 7, 2023
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: 1 addition & 0 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ class ClientDataSource(
newClientEvent: Event.User.NewClient
): Either<CoreFailure, Unit> = wrapStorageRequest {
newClientDAO.insertNewClient(clientMapper.toInsertClientParam(selfUserID, newClientEvent))
MohamadJaara marked this conversation as resolved.
Show resolved Hide resolved
clientDAO.insertClient(clientMapper.toInsertClientParam(selfUserID, newClientEvent))
Copy link
Member

@mchenani mchenani Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference between these two lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

different DB-tables where we save clients into.
NewClient table containse only self-user clients that was added and user wasn't informed about it yet. So it's used for informing user about new devices by the dialog (kinda "there is a new device, was it you?").

And the Client table - is a table for all the clients

}
MohamadJaara marked this conversation as resolved.
Show resolved Hide resolved

override suspend fun clearNewClients() {
Expand Down
16 changes: 15 additions & 1 deletion logic/src/commonTest/kotlin/com/wire/kalium/logic/data/client/ClientRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,9 @@ class ClientRepositoryTest {

@Test
fun whenSavingNewClient_thenNewClientSaved() = runTest {
MohamadJaara marked this conversation as resolved.
Show resolved Hide resolved
val (arrangement, repository) = Arrangement().arrange()
val (arrangement, repository) = Arrangement()
.withInsertClient()
.arrange()

val newClientEvent = TestEvent.newClient()
val insertClientParam = MapperProvider.clientMapper().toInsertClientParam(selfUserId, newClientEvent)
Expand All @@ -411,6 +413,11 @@ class ClientRepositoryTest {
.suspendFunction(arrangement.newClientDAO::insertNewClient)
.with(eq(insertClientParam))
.wasInvoked(exactly = once)

verify(arrangement.clientDAO)
.suspendFunction(arrangement.clientDAO::insertClient)
.with(eq(insertClientParam))
.wasInvoked(exactly = once)
}

@Test
Expand Down Expand Up @@ -498,6 +505,13 @@ class ClientRepositoryTest {
.thenReturn(flowOf(result))
}

fun withInsertClient() = apply {
given(clientDAO)
.suspendFunction(clientDAO::insertClient)
.whenInvokedWith(any())
.thenReturn(Unit)
}

fun withSuccessfulResponse(expectedResponse: Map<UserIdDTO, List<SimpleClientResponse>>) = apply {
given(clientApi)
.suspendFunction(clientApi::listClientsOfUsers).whenInvokedWith(any()).then {
Expand Down
Loading