-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…2978) * fix: add @JsonNames to get both values (current and deprecated) from api * test: adjust and add a new test to harden this fix * fix: add missing fallback field to default ConversationResponse * fix: add both accessRole and accessRoleV2 to api response models * fix: add proper mapping for v3 access role and v2- access_role_v2 * fix: add v3 implementation for fetchConversationsListDetails * fix: remove unused access_role from api v2- * fix: add ConversationResponseDTO for V3 * fix: add tests for conversation response with different access roles for V2 and V3 --------- Signed-off-by: alexandreferris <ferris.alexandre@gmail.com> Co-authored-by: Alexandre Ferris <ferris.alexandre@gmail.com> Co-authored-by: Yamil Medina <yamilmedina@users.noreply.github.com>
- Loading branch information
3 people
authored
Aug 29, 2024
1 parent
9f4a150
commit 3618918
Showing
13 changed files
with
596 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
209 changes: 209 additions & 0 deletions
209
network/src/commonTest/kotlin/com/wire/kalium/api/v2/ConversationResponseTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.kalium.api.v2 | ||
|
|
||
| import com.wire.kalium.api.ApiTest | ||
| import com.wire.kalium.mocks.responses.AnyResponseProvider | ||
| import com.wire.kalium.mocks.responses.conversation.ConversationDetailsResponse | ||
| import com.wire.kalium.network.api.model.ConversationAccessRoleDTO | ||
| import com.wire.kalium.network.api.v2.authenticated.ConversationApiV2 | ||
| import com.wire.kalium.network.utils.mapSuccess | ||
| import io.ktor.http.HttpStatusCode | ||
| import kotlinx.coroutines.test.runTest | ||
| import kotlin.test.Test | ||
| import kotlin.test.assertEquals | ||
|
|
||
| internal class ConversationResponseTest : ApiTest() { | ||
|
|
||
| @Test | ||
| fun givenConversationResponseWithOnlyAccessRoleV2_whenMappingToConversation_thenItMapsCorrectly() = runTest { | ||
| val networkClient = mockAuthenticatedNetworkClient( | ||
| conversationResponseWithAccessRoleV2.rawJson, | ||
| statusCode = HttpStatusCode.OK | ||
| ) | ||
|
|
||
| val conversationApi = ConversationApiV2(networkClient) | ||
|
|
||
| val response = conversationApi.fetchConversationsListDetails(listOf()) | ||
|
|
||
| response.mapSuccess { | ||
| assertEquals( | ||
| setOf( | ||
| ConversationAccessRoleDTO.TEAM_MEMBER, | ||
| ConversationAccessRoleDTO.SERVICE | ||
| ), | ||
| it.conversationsFound.first().accessRole | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun givenConversationResponseWithBothAccessRole_whenMappingToConversation_thenItMapsCorrectly() = runTest { | ||
| val networkClient = mockAuthenticatedNetworkClient( | ||
| conversationResponseWithBothAccessRole.rawJson, | ||
| statusCode = HttpStatusCode.OK | ||
| ) | ||
|
|
||
| val conversationApi = ConversationApiV2(networkClient) | ||
|
|
||
| val response = conversationApi.fetchConversationsListDetails(listOf()) | ||
|
|
||
| response.mapSuccess { | ||
| assertEquals( | ||
| setOf( | ||
| ConversationAccessRoleDTO.TEAM_MEMBER, | ||
| ConversationAccessRoleDTO.SERVICE | ||
| ), | ||
| it.conversationsFound.first().accessRole | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private companion object { | ||
| val conversationResponseWithAccessRoleV2 = AnyResponseProvider(data = "") { | ||
| """ | ||
| |{ | ||
| | "failed": [], | ||
| | "found": [ | ||
| | { | ||
| | "access": [ | ||
| | "invite" | ||
| | ], | ||
| | "access_role_v2": [ | ||
| | "team_member", | ||
| | "service" | ||
| | ], | ||
| | "creator": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b", | ||
| | "id": "ebafd3d4-1548-49f2-ac4e-b2757e6ca44b", | ||
| | "last_event": "0.0", | ||
| | "last_event_time": "1970-01-01T00:00:00.000Z", | ||
| | "members": { | ||
| | "others": [ | ||
| | { | ||
| | "conversation_role": "wire_member", | ||
| | "id": "22dfd5cc-11ae-4a9d-9046-ba27585f4613", | ||
| | "qualified_id": { | ||
| | "domain": "bella.wire.link", | ||
| | "id": "22dfd5cc-11ae-4a9d-9046-ba27585f4613" | ||
| | }, | ||
| | "status": 0 | ||
| | } | ||
| | ], | ||
| | "self": { | ||
| | "conversation_role": "wire_admin", | ||
| | "hidden": false, | ||
| | "hidden_ref": null, | ||
| | "id": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b", | ||
| | "otr_archived": false, | ||
| | "otr_archived_ref": null, | ||
| | "otr_muted_ref": null, | ||
| | "otr_muted_status": null, | ||
| | "qualified_id": { | ||
| | "domain": "anta.wire.link", | ||
| | "id": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b" | ||
| | }, | ||
| | "service": null, | ||
| | "status": 0, | ||
| | "status_ref": "0.0", | ||
| | "status_time": "1970-01-01T00:00:00.000Z" | ||
| | } | ||
| | }, | ||
| | "message_timer": null, | ||
| | "name": "test-anta-grp", | ||
| | "protocol": "proteus", | ||
| | "qualified_id": { | ||
| | "domain": "anta.wire.link", | ||
| | "id": "ebafd3d4-1548-49f2-ac4e-b2757e6ca44b" | ||
| | }, | ||
| | "receipt_mode": null, | ||
| | "team": null, | ||
| | "type": 0 | ||
| | } | ||
| | ], | ||
| | "not_found": [] | ||
| |} | ||
| """.trimMargin() | ||
| } | ||
|
|
||
| val conversationResponseWithBothAccessRole = AnyResponseProvider(data = "") { | ||
| """ | ||
| |{ | ||
| | "failed": [], | ||
| | "found": [ | ||
| | { | ||
| | "access": [ | ||
| | "invite" | ||
| | ], | ||
| | "access_role": "activated", | ||
| | "access_role_v2": [ | ||
| | "team_member", | ||
| | "service" | ||
| | ], | ||
| | "creator": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b", | ||
| | "id": "ebafd3d4-1548-49f2-ac4e-b2757e6ca44b", | ||
| | "last_event": "0.0", | ||
| | "last_event_time": "1970-01-01T00:00:00.000Z", | ||
| | "members": { | ||
| | "others": [ | ||
| | { | ||
| | "conversation_role": "wire_member", | ||
| | "id": "22dfd5cc-11ae-4a9d-9046-ba27585f4613", | ||
| | "qualified_id": { | ||
| | "domain": "bella.wire.link", | ||
| | "id": "22dfd5cc-11ae-4a9d-9046-ba27585f4613" | ||
| | }, | ||
| | "status": 0 | ||
| | } | ||
| | ], | ||
| | "self": { | ||
| | "conversation_role": "wire_admin", | ||
| | "hidden": false, | ||
| | "hidden_ref": null, | ||
| | "id": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b", | ||
| | "otr_archived": false, | ||
| | "otr_archived_ref": null, | ||
| | "otr_muted_ref": null, | ||
| | "otr_muted_status": null, | ||
| | "qualified_id": { | ||
| | "domain": "anta.wire.link", | ||
| | "id": "f4680835-2cfe-4d4d-8491-cbb201bd5c2b" | ||
| | }, | ||
| | "service": null, | ||
| | "status": 0, | ||
| | "status_ref": "0.0", | ||
| | "status_time": "1970-01-01T00:00:00.000Z" | ||
| | } | ||
| | }, | ||
| | "message_timer": null, | ||
| | "name": "test-anta-grp", | ||
| | "protocol": "proteus", | ||
| | "qualified_id": { | ||
| | "domain": "anta.wire.link", | ||
| | "id": "ebafd3d4-1548-49f2-ac4e-b2757e6ca44b" | ||
| | }, | ||
| | "receipt_mode": null, | ||
| | "team": null, | ||
| | "type": 0 | ||
| | } | ||
| | ], | ||
| | "not_found": [] | ||
| |} | ||
| """.trimMargin() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.