Migrate the channel config to the generated ChannelConfigWithInfo model

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

@@ -22,7 +22,6 @@ import io.getstream.chat.android.ReadReceipts
 import io.getstream.chat.android.TypingIndicators
 import io.getstream.chat.android.client.api2.model.dto.AttachmentDto
 import io.getstream.chat.android.client.api2.model.dto.ChannelInfoDto
-import io.getstream.chat.android.client.api2.model.dto.ConfigDto
 import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto
 import io.getstream.chat.android.client.api2.model.dto.DeviceDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
@@ -219,7 +218,7 @@ internal class DomainMapping(
                     lastReceivedEventDate = last_message_at ?: it.last_read,
                 )
             },
-            config = config.toDomain(),
+            config = config?.toDomain() ?: Config(),
             createdBy = created_by?.toDomain() ?: User(),
             team = team,
             cooldown = cooldown,
@@ -993,39 +992,6 @@ internal class DomainMapping(
         set = set,
     )
 
-    /**
-     * Transforms [ConfigDto] to [Config].
-     */
-    internal fun ConfigDto.toDomain(): Config = Config(
-        createdAt = created_at,
-        updatedAt = updated_at,
-        name = name ?: "",
-        typingEventsEnabled = typing_events,
-        readEventsEnabled = read_events,
-        deliveryEventsEnabled = delivery_events,
-        connectEventsEnabled = connect_events,
-        searchEnabled = search,
-        isReactionsEnabled = reactions,
-        isThreadEnabled = replies,
-        muteEnabled = mutes,
-        uploadsEnabled = uploads,
-        urlEnrichmentEnabled = url_enrichment,
-        customEventsEnabled = custom_events,
-        pushNotificationsEnabled = push_notifications,
-        skipLastMsgUpdateForSystemMsgs = skip_last_msg_update_for_system_msgs ?: false,
-        pollsEnabled = polls,
-        messageRetention = message_retention,
-        maxMessageLength = max_message_length,
-        automod = automod,
-        automodBehavior = automod_behavior,
-        blocklistBehavior = blocklist_behavior ?: "",
-        commands = commands.map { it.toDomain() },
-        messageRemindersEnabled = user_message_reminders ?: false,
-        sharedLocationsEnabled = shared_locations ?: false,
-        markMessagesPending = mark_messages_pending,
-        pushLevel = push_level,
-    )
-
     /**
      * Transforms [ChannelConfigWithInfo] to [Config].
      */

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/ChannelDtos.kt

@@ -17,6 +17,7 @@
 package io.getstream.chat.android.client.api2.model.dto
 
 import com.squareup.moshi.JsonClass
+import io.getstream.chat.android.network.models.ChannelConfigWithInfo
 import java.util.Date
 
 @JsonClass(generateAdapter = true)
@@ -41,7 +42,8 @@ internal data class DownstreamChannelDto(
     val members: List<DownstreamMemberDto> = emptyList(),
     val watchers: List<DownstreamUserDto> = emptyList(),
     val read: List<DownstreamChannelUserRead> = emptyList(),
-    val config: ConfigDto,
+    // Absent for a channel whose type is no longer in the app config.
+    val config: ChannelConfigWithInfo? = null,
     val created_by: DownstreamUserDto?,
     val team: String = "",
     val cooldown: Int = 0,

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

@@ -943,6 +943,11 @@ private fun createConfigJsonString() =
           "updated_at": "2020-06-29T06:14:28.000Z",
           "name": "team",
           "typing_events": true,
+          "count_messages": true,
+          "quotes": true,
+          "reminders": false,
+          "shared_locations": false,
+          "user_message_reminders": false,
           "read_events": true,
           "delivery_events": true,
           "connect_events": true,

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

@@ -25,7 +25,6 @@ import io.getstream.chat.android.client.api.models.SendActionRequest
 import io.getstream.chat.android.client.api.models.UpdatePollRequest
 import io.getstream.chat.android.client.api2.model.dto.AttachmentDto
 import io.getstream.chat.android.client.api2.model.dto.ChannelInfoDto
-import io.getstream.chat.android.client.api2.model.dto.ConfigDto
 import io.getstream.chat.android.client.api2.model.dto.DeviceDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelMuteDto
@@ -90,6 +89,7 @@ import io.getstream.chat.android.network.models.AppResponseFields
 import io.getstream.chat.android.network.models.BanResponse
 import io.getstream.chat.android.network.models.BlockUsersResponse
 import io.getstream.chat.android.network.models.BlockedUserResponse
+import io.getstream.chat.android.network.models.ChannelConfigWithInfo
 import io.getstream.chat.android.network.models.ChannelMemberResponse
 import io.getstream.chat.android.network.models.ChannelResponse
 import io.getstream.chat.android.network.models.CreateGuestResponse
@@ -461,7 +461,7 @@ internal object Mother {
         members: List<DownstreamMemberDto> = emptyList(),
         watchers: List<DownstreamUserDto> = emptyList(),
         read: List<DownstreamChannelUserRead> = emptyList(),
-        config: ConfigDto = randomConfigDto(),
+        config: ChannelConfigWithInfo = randomChannelConfigWithInfo(),
         created_by: DownstreamUserDto? = randomDownstreamUserDto(),
         team: String = randomString(),
         cooldown: Int = randomInt(),
@@ -516,62 +516,37 @@ internal object Mother {
         image = image,
     )
 
-    fun randomConfigDto(
-        created_at: Date? = randomDateOrNull(),
-        updated_at: Date? = randomDateOrNull(),
-        name: String? = randomString(),
-        typing_events: Boolean = randomBoolean(),
-        read_events: Boolean = randomBoolean(),
-        delivery_events: Boolean = randomBoolean(),
-        connect_events: Boolean = randomBoolean(),
-        search: Boolean = randomBoolean(),
-        reactions: Boolean = randomBoolean(),
-        replies: Boolean = randomBoolean(),
-        mutes: Boolean = randomBoolean(),
-        uploads: Boolean = randomBoolean(),
-        url_enrichment: Boolean = randomBoolean(),
-        custom_events: Boolean = randomBoolean(),
-        push_notifications: Boolean = randomBoolean(),
-        skip_last_msg_update_for_system_msgs: Boolean? = randomBoolean(),
-        polls: Boolean = randomBoolean(),
-        message_retention: String = randomString(),
-        max_message_length: Int = randomInt(),
-        automod: String = randomString(),
-        automod_behavior: String = randomString(),
-        blocklist_behavior: String? = randomString(),
+    fun randomChannelConfigWithInfo(
         commands: List<CommandDto> = emptyList(),
-        user_message_reminders: Boolean? = randomBoolean(),
-        shared_locations: Boolean = randomBoolean(),
-        mark_messages_pending: Boolean = randomBoolean(),
-        push_level: String? = randomString(),
-    ): ConfigDto = ConfigDto(
-        created_at = created_at,
-        updated_at = updated_at,
-        name = name,
-        typing_events = typing_events,
-        read_events = read_events,
-        delivery_events = delivery_events,
-        connect_events = connect_events,
-        search = search,
-        reactions = reactions,
-        replies = replies,
-        mutes = mutes,
-        uploads = uploads,
-        url_enrichment = url_enrichment,
-        custom_events = custom_events,
-        push_notifications = push_notifications,
-        skip_last_msg_update_for_system_msgs = skip_last_msg_update_for_system_msgs,
-        polls = polls,
-        message_retention = message_retention,
-        max_message_length = max_message_length,
-        automod = automod,
-        automod_behavior = automod_behavior,
-        blocklist_behavior = blocklist_behavior,
+    ): ChannelConfigWithInfo = ChannelConfigWithInfo(
+        createdAt = randomDate(),
+        updatedAt = randomDate(),
+        name = randomString(),
+        typingEvents = randomBoolean(),
+        readEvents = randomBoolean(),
+        deliveryEvents = randomBoolean(),
+        connectEvents = randomBoolean(),
+        search = randomBoolean(),
+        reactions = randomBoolean(),
+        replies = randomBoolean(),
+        quotes = randomBoolean(),
+        mutes = randomBoolean(),
+        uploads = randomBoolean(),
+        urlEnrichment = randomBoolean(),
+        customEvents = randomBoolean(),
+        pushNotifications = randomBoolean(),
+        reminders = randomBoolean(),
+        countMessages = randomBoolean(),
+        skipLastMsgUpdateForSystemMsgs = randomBoolean(),
+        polls = randomBoolean(),
+        messageRetention = randomString(),
+        maxMessageLength = randomInt(),
+        automod = ChannelConfigWithInfo.Automod.Disabled,
+        automodBehavior = ChannelConfigWithInfo.AutomodBehavior.Flag,
         commands = commands,
-        user_message_reminders = user_message_reminders,
-        shared_locations = shared_locations,
-        mark_messages_pending = mark_messages_pending,
-        push_level = push_level,
+        userMessageReminders = randomBoolean(),
+        sharedLocations = randomBoolean(),
+        markMessagesPending = randomBoolean(),
     )
 
     /**