Migrate device endpoints to generated models

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt

@@ -50,7 +50,6 @@ import io.getstream.chat.android.client.api2.mapping.toFilterDomainWithFields
 import io.getstream.chat.android.client.api2.model.dto.PartialUpdateUserDto
 import io.getstream.chat.android.client.api2.model.dto.UpstreamPushPreferenceInputDto
 import io.getstream.chat.android.client.api2.model.requests.AcceptInviteRequest
-import io.getstream.chat.android.client.api2.model.requests.AddDeviceRequest
 import io.getstream.chat.android.client.api2.model.requests.AddMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.AddUserGroupMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
@@ -168,6 +167,7 @@ import io.getstream.chat.android.models.Vote
 import io.getstream.chat.android.models.VotingVisibility
 import io.getstream.chat.android.models.querysort.QuerySorter
 import io.getstream.chat.android.network.models.BlockUsersRequest
+import io.getstream.chat.android.network.models.CreateDeviceRequest
 import io.getstream.chat.android.network.models.UnblockUsersRequest
 import io.getstream.log.taggedLogger
 import io.getstream.result.Error
@@ -468,10 +468,10 @@ constructor(
 
     override fun addDevice(device: Device): Call<Unit> {
         return deviceApi.addDevices(
-            request = AddDeviceRequest(
-                device.token,
-                device.pushProvider.key,
-                device.providerName,
+            request = CreateDeviceRequest(
+                id = device.token,
+                pushProvider = CreateDeviceRequest.PushProvider.fromString(device.pushProvider.key),
+                pushProviderName = device.providerName,
             ),
         ).toUnitCall()
     }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/DeviceApi.kt

@@ -17,9 +17,9 @@
 package io.getstream.chat.android.client.api2.endpoint
 
 import io.getstream.chat.android.client.api.AuthenticatedApi
-import io.getstream.chat.android.client.api2.model.requests.AddDeviceRequest
-import io.getstream.chat.android.client.api2.model.response.DevicesResponse
 import io.getstream.chat.android.client.call.RetrofitCall
+import io.getstream.chat.android.network.models.CreateDeviceRequest
+import io.getstream.chat.android.network.models.ListDevicesResponse
 import io.getstream.chat.android.network.models.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -31,10 +31,10 @@ import retrofit2.http.Query
 internal interface DeviceApi {
 
     @GET("/devices")
-    fun getDevices(): RetrofitCall<DevicesResponse>
+    fun getDevices(): RetrofitCall<ListDevicesResponse>
 
     @POST("/devices")
-    fun addDevices(@Body request: AddDeviceRequest): RetrofitCall<Response>
+    fun addDevices(@Body request: CreateDeviceRequest): RetrofitCall<Response>
 
     @DELETE("/devices")
     fun deleteDevice(@Query("id") id: String): RetrofitCall<Response>

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt

@@ -137,6 +137,7 @@ import io.getstream.chat.android.models.querysort.QuerySortByField
 import io.getstream.chat.android.models.querysort.QuerySorter
 import io.getstream.chat.android.models.querysort.SortDirection
 import io.getstream.chat.android.network.models.BlockUsersResponse
+import io.getstream.chat.android.network.models.DeviceResponse
 import java.util.Date
 
 @Suppress("TooManyFunctions", "LargeClass")
@@ -689,8 +690,14 @@ internal class DomainMapping(
     )
 
     /**
-     * Transforms [DeviceDto] to [Device].
+     * Transforms [DeviceResponse] to [Device].
      */
+    internal fun DeviceResponse.toDomain(): Device = Device(
+        token = id,
+        pushProvider = PushProvider.fromKey(pushProvider),
+        providerName = pushProviderName,
+    )
+
     internal fun DeviceDto.toDomain(): Device = Device(
         token = id,
         pushProvider = PushProvider.fromKey(push_provider),

stream-chat-android-client/src/main/java/io/getstream/chat/android/network/infrastructure/Serializer.kt

@@ -28,6 +28,7 @@ import com.squareup.moshi.Moshi
 internal object Serializer {
     @JvmStatic
     internal val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(io.getstream.chat.android.network.models.CreateDeviceRequest.PushProvider.PushProviderAdapter())
         .add(io.getstream.chat.android.network.infrastructure.IsoDateAdapter())
         .addLast(com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory())
 

stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/CreateDeviceRequest.kt

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+
+/**
+ * Create device request
+ */
+
+@com.squareup.moshi.JsonClass(generateAdapter = true)
+internal data class CreateDeviceRequest(
+    @Json(name = "id")
+    val id: kotlin.String,
+
+    @Json(name = "push_provider")
+    val pushProvider: PushProvider,
+
+    @Json(name = "hardware_id")
+    val hardwareId: kotlin.String? = null,
+
+    @Json(name = "push_provider_name")
+    val pushProviderName: kotlin.String? = null,
+
+    @Json(name = "voip_token")
+    val voipToken: kotlin.Boolean? = null,
+) {
+
+    /**
+     * PushProvider Enum
+     */
+    sealed class PushProvider(val value: kotlin.String) {
+        override fun toString(): String = value
+
+        companion object {
+            fun fromString(s: kotlin.String): PushProvider = when (s) {
+                "apn" -> Apn
+                "firebase" -> Firebase
+                "huawei" -> Huawei
+                "xiaomi" -> Xiaomi
+                else -> Unknown(s)
+            }
+        }
+        object Apn : PushProvider("apn")
+        object Firebase : PushProvider("firebase")
+        object Huawei : PushProvider("huawei")
+        object Xiaomi : PushProvider("xiaomi")
+        data class Unknown(val unknownValue: kotlin.String) : PushProvider(unknownValue)
+
+        class PushProviderAdapter : JsonAdapter<PushProvider>() {
+            @FromJson
+            override fun fromJson(reader: JsonReader): PushProvider? {
+                val s = reader.nextString() ?: return null
+                return PushProvider.fromString(s)
+            }
+
+            @ToJson
+            override fun toJson(writer: JsonWriter, value: PushProvider?) {
+                writer.value(value?.value)
+            }
+        }
+    }
+}

stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/DeviceResponse.kt

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Response for Device
+ */
+
+@com.squareup.moshi.JsonClass(generateAdapter = true)
+internal data class DeviceResponse(
+    @Json(name = "created_at")
+    val createdAt: java.util.Date,
+
+    @Json(name = "id")
+    val id: kotlin.String,
+
+    @Json(name = "push_provider")
+    val pushProvider: kotlin.String,
+
+    @Json(name = "user_id")
+    val userId: kotlin.String,
+
+    @Json(name = "disabled")
+    val disabled: kotlin.Boolean? = null,
+
+    @Json(name = "disabled_reason")
+    val disabledReason: kotlin.String? = null,
+
+    @Json(name = "hardware_id")
+    val hardwareId: kotlin.String? = null,
+
+    @Json(name = "push_provider_name")
+    val pushProviderName: kotlin.String? = null,
+
+    @Json(name = "voip")
+    val voip: kotlin.Boolean? = null,
+)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/DevicesResponse.kt → stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/ListDevicesResponse.kt

@@ -14,12 +14,27 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.client.api2.model.response
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
+
+import com.squareup.moshi.Json
+import kotlin.collections.List
+
+/**
+ * List devices response
+ */
 
-import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DeviceDto
+@com.squareup.moshi.JsonClass(generateAdapter = true)
+internal data class ListDevicesResponse(
+    @Json(name = "duration")
+    val duration: kotlin.String,
 
-@JsonClass(generateAdapter = true)
-internal data class DevicesResponse(
-    val devices: List<DeviceDto>,
+    @Json(name = "devices")
+    val devices: kotlin.collections.List<io.getstream.chat.android.network.models.DeviceResponse> = emptyList(),
 )

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt

@@ -103,6 +103,7 @@ import io.getstream.chat.android.models.VotingVisibility
 import io.getstream.chat.android.models.querysort.QuerySortByField
 import io.getstream.chat.android.models.querysort.QuerySorter
 import io.getstream.chat.android.network.models.BlockUsersResponse
+import io.getstream.chat.android.network.models.DeviceResponse
 import io.getstream.chat.android.network.models.UnblockUsersResponse
 import io.getstream.chat.android.positiveRandomInt
 import io.getstream.chat.android.positiveRandomLong
@@ -834,6 +835,20 @@ internal object Mother {
         set = set,
     )
 
+    fun randomDeviceResponse(
+        id: String = randomString(),
+        pushProvider: String = randomString(),
+        pushProviderName: String = randomString(),
+        createdAt: Date = randomDate(),
+        userId: String = randomString(),
+    ): DeviceResponse = DeviceResponse(
+        createdAt = createdAt,
+        id = id,
+        pushProvider = pushProvider,
+        userId = userId,
+        pushProviderName = pushProviderName,
+    )
+
     fun randomDeviceDto(
         id: String = randomString(),
         pushProvider: String = randomString(),

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt

@@ -47,7 +47,6 @@ import io.getstream.chat.android.client.api2.model.dto.UnreadDto
 import io.getstream.chat.android.client.api2.model.dto.UpstreamChatPreferencesDto
 import io.getstream.chat.android.client.api2.model.dto.UpstreamPushPreferenceInputDto
 import io.getstream.chat.android.client.api2.model.requests.AcceptInviteRequest
-import io.getstream.chat.android.client.api2.model.requests.AddDeviceRequest
 import io.getstream.chat.android.client.api2.model.requests.AddUserGroupMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
 import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
@@ -91,7 +90,6 @@ import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
 import io.getstream.chat.android.client.api2.model.requests.UpstreamVoteDto
 import io.getstream.chat.android.client.api2.model.response.AppSettingsResponse
 import io.getstream.chat.android.client.api2.model.response.ChannelResponse
-import io.getstream.chat.android.client.api2.model.response.DevicesResponse
 import io.getstream.chat.android.client.api2.model.response.DraftMessageResponse
 import io.getstream.chat.android.client.api2.model.response.EventResponse
 import io.getstream.chat.android.client.api2.model.response.FlagResponse
@@ -166,6 +164,8 @@ import io.getstream.chat.android.models.querysort.QuerySortByField.Companion.asc
 import io.getstream.chat.android.models.querysort.QuerySortByField.Companion.descByName
 import io.getstream.chat.android.network.models.BlockUsersRequest
 import io.getstream.chat.android.network.models.BlockUsersResponse
+import io.getstream.chat.android.network.models.CreateDeviceRequest
+import io.getstream.chat.android.network.models.ListDevicesResponse
 import io.getstream.chat.android.network.models.Response
 import io.getstream.chat.android.network.models.UnblockUsersRequest
 import io.getstream.chat.android.network.models.UnblockUsersResponse
@@ -517,10 +517,10 @@ internal class MoshiChatApiTest {
         val device = randomDevice()
         val result = sut.addDevice(device).await()
         // then
-        val expectedRequest = AddDeviceRequest(
+        val expectedRequest = CreateDeviceRequest(
             id = device.token,
-            push_provider = device.pushProvider.key,
-            push_provider_name = device.providerName,
+            pushProvider = CreateDeviceRequest.PushProvider.fromString(device.pushProvider.key),
+            pushProviderName = device.providerName,
         )
         result `should be instance of` expected
         verify(api, times(1)).addDevices(expectedRequest)
@@ -545,7 +545,7 @@ internal class MoshiChatApiTest {
 
     @ParameterizedTest
     @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#getDevicesInput")
-    fun testGetDevices(call: RetrofitCall<DevicesResponse>, expected: KClass<*>) = runTest {
+    fun testGetDevices(call: RetrofitCall<ListDevicesResponse>, expected: KClass<*>) = runTest {
         // given
         val api = mock<DeviceApi>()
         whenever(api.getDevices()).doReturn(call)