fix: missing json value pagingState when getting team member by ID (#2578)

* Commit with unresolved merge conflicts outside of

* resolve conflicts

* test

---------

Co-authored-by: Mohamad Jaara <[email protected]>

Author: github-actions[bot]

logic/src/commonTest/kotlin/com/wire/kalium/logic/data/team/TeamRepositoryTest.kt

@@ -111,7 +111,7 @@ class TeamRepositoryTest {
             nonQualifiedUserId = "teamMember1"
         )
 
-        val teamMembersList = TeamsApi.TeamMemberList(
+        val teamMembersList = TeamsApi.TeamMemberListPaginated(
             hasMore = false,
             members = listOf(
                 teamMember
@@ -173,7 +173,7 @@ class TeamRepositoryTest {
             nonQualifiedUserId = "teamMember1"
         )
 
-        val teamMembersList = TeamsApi.TeamMemberList(
+        val teamMembersList = TeamsApi.TeamMemberListPaginated(
             hasMore = true,
             members = listOf(
                 teamMember
@@ -523,7 +523,7 @@ class TeamRepositoryTest {
                 .thenReturn(Either.Right(Unit))
         }
 
-        fun withGetTeamMembers(result: NetworkResponse<TeamsApi.TeamMemberList>) = apply {
+        fun withGetTeamMembers(result: NetworkResponse<TeamsApi.TeamMemberListPaginated>) = apply {
             given(teamsApi)
                 .suspendFunction(teamsApi::getTeamMembers)
                 .whenInvokedWith(any(), any())

logic/src/commonTest/kotlin/com/wire/kalium/logic/data/user/UserRepositoryTest.kt

@@ -886,7 +886,7 @@ class UserRepositoryTest {
             given(teamsApi)
                 .suspendFunction(teamsApi::getTeamMembersByIds)
                 .whenInvokedWith(any(), any())
-                .thenReturn(NetworkResponse.Success(TeamsApi.TeamMemberList(false, result, "A=="), mapOf(), 200))
+                .thenReturn(NetworkResponse.Success(TeamsApi.TeamMemberListNonPaginated(false, result), mapOf(), 200))
         }
 
         fun withSuccessfulGetUsersByQualifiedIdList(knownUserEntities: List<UserDetailsEntity>) = apply {

network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/TeamsApi.kt

@@ -32,12 +32,20 @@ import kotlinx.serialization.Serializable
 interface TeamsApi {
 
     @Serializable
-    data class TeamMemberList(
+    data class TeamMemberListPaginated(
         // Please note that this is intentionally cased differently form the has_more in TeamsResponse
         // because the backend response contains a different casing
         @SerialName("hasMore") val hasMore: Boolean,
         val members: List<TeamMemberDTO>,
-        @SerialName("pagingState") val pagingState: String
+        @SerialName("pagingState") val pagingState: String? = null
+    )
+
+    @Serializable
+    data class TeamMemberListNonPaginated(
+        // Please note that this is intentionally cased differently form the has_more in TeamsResponse
+        // because the backend response contains a different casing
+        @SerialName("hasMore") val hasMore: Boolean,
+        val members: List<TeamMemberDTO>
     )
 
     @Serializable
@@ -89,9 +97,8 @@ interface TeamsApi {
     }
 
     suspend fun deleteConversation(conversationId: NonQualifiedConversationId, teamId: TeamId): NetworkResponse<Unit>
-
-    suspend fun getTeamMembers(teamId: TeamId, limitTo: Int?, pagingState: String? = null): NetworkResponse<TeamMemberList>
-    suspend fun getTeamMembersByIds(teamId: TeamId, teamMemberIdList: TeamMemberIdList): NetworkResponse<TeamMemberList>
+    suspend fun getTeamMembers(teamId: TeamId, limitTo: Int?, pagingState: String? = null): NetworkResponse<TeamMemberListPaginated>
+    suspend fun getTeamMembersByIds(teamId: TeamId, teamMemberIdList: TeamMemberIdList): NetworkResponse<TeamMemberListNonPaginated>
     suspend fun getTeamMember(teamId: TeamId, userId: NonQualifiedUserId): NetworkResponse<TeamMemberDTO>
     suspend fun getTeamInfo(teamId: TeamId): NetworkResponse<TeamDTO>
     suspend fun whiteListedServices(teamId: TeamId, size: Int = DEFAULT_SERVICES_SIZE): NetworkResponse<ServiceDetailResponse>

network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/TeamsApiV0.kt

@@ -58,8 +58,12 @@ internal open class TeamsApiV0 internal constructor(
         }
     }
 
-    override suspend fun getTeamMembers(teamId: TeamId, limitTo: Int?, pagingState: String?): NetworkResponse<TeamsApi.TeamMemberList> =
-        wrapKaliumResponse {
+    override suspend fun getTeamMembers(
+        teamId: TeamId,
+        limitTo: Int?,
+        pagingState: String?
+    ): NetworkResponse<TeamsApi.TeamMemberListPaginated> =
+        wrapKaliumResponse<TeamsApi.TeamMemberListPaginated> {
             httpClient.get("$PATH_TEAMS/$teamId/$PATH_MEMBERS") {
                 limitTo?.let { parameter("maxResults", it) }
                 pagingState?.let { parameter("pagingState", it) }
@@ -69,7 +73,7 @@ internal open class TeamsApiV0 internal constructor(
     override suspend fun getTeamMembersByIds(
         teamId: TeamId,
         teamMemberIdList: TeamsApi.TeamMemberIdList
-    ): NetworkResponse<TeamsApi.TeamMemberList> = wrapKaliumResponse {
+    ): NetworkResponse<TeamsApi.TeamMemberListNonPaginated> = wrapKaliumResponse {
         httpClient.post("$PATH_TEAMS/$teamId/$PATH_MEMBERS_BY_IDS") {
             setBody(teamMemberIdList)
         }