Migrate the reaction events and response to the generated ReactionResponse

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

@@ -67,7 +67,6 @@ import io.getstream.chat.android.client.api.models.identifier.getRepliesAroundId
 import io.getstream.chat.android.client.api2.mapping.DtoMapping
 import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
-import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamUserDto
 import io.getstream.chat.android.client.attachment.AttachmentsSender
 import io.getstream.chat.android.client.attachment.MessagePreparer
@@ -5532,7 +5531,6 @@ internal constructor(
             DownstreamUserDto::class.members
             DownstreamChannelDto::class.members
             DownstreamMessageDto::class.members
-            DownstreamReactionDto::class.members
             io.getstream.chat.android.network.models.Attachment::class.members
             io.getstream.chat.android.network.models.ReactionResponse::class.members
         }

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

@@ -31,7 +31,6 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
-import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderInfoDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadDto
@@ -495,22 +494,6 @@ internal class DomainMapping(
             .toMap(),
     )
 
-    /**
-     * Transforms [DownstreamReactionDto] to [Reaction].
-     */
-    internal fun DownstreamReactionDto.toDomain(): Reaction =
-        Reaction(
-            createdAt = created_at,
-            messageId = message_id,
-            score = score,
-            type = type,
-            updatedAt = updated_at,
-            user = user?.toDomain(),
-            userId = user_id,
-            emojiCode = emoji_code,
-            extraData = extraData.toMutableMap(),
-        )
-
     /**
      * Transforms [ReactionGroupResponse] to [ReactionGroup].
      */

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

@@ -21,6 +21,7 @@ import io.getstream.chat.android.client.api2.model.dto.utils.internal.ExactDate
 import io.getstream.chat.android.network.models.ChannelMemberResponse
 import io.getstream.chat.android.network.models.PollResponseData
 import io.getstream.chat.android.network.models.PollVoteResponseData
+import io.getstream.chat.android.network.models.ReactionResponse
 import io.getstream.result.Error
 import java.util.Date
 
@@ -410,7 +411,7 @@ internal data class ReactionDeletedEventDto(
     val channel_type: String,
     val channel_id: String,
     val message: DownstreamMessageDto,
-    val reaction: DownstreamReactionDto,
+    val reaction: ReactionResponse,
 ) : ChatEventDto()
 
 @JsonClass(generateAdapter = true)
@@ -422,7 +423,7 @@ internal data class ReactionNewEventDto(
     val channel_type: String,
     val channel_id: String,
     val message: DownstreamMessageDto,
-    val reaction: DownstreamReactionDto,
+    val reaction: ReactionResponse,
 ) : ChatEventDto()
 
 @JsonClass(generateAdapter = true)
@@ -434,7 +435,7 @@ internal data class ReactionUpdateEventDto(
     val channel_type: String,
     val channel_id: String,
     val message: DownstreamMessageDto,
-    val reaction: DownstreamReactionDto,
+    val reaction: ReactionResponse,
 ) : ChatEventDto()
 
 @JsonClass(generateAdapter = true)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/ReactionResponse.kt

@@ -17,9 +17,8 @@
 package io.getstream.chat.android.client.api2.model.response
 
 import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 
 @JsonClass(generateAdapter = true)
 internal data class ReactionResponse(
-    val reaction: DownstreamReactionDto,
+    val reaction: io.getstream.chat.android.network.models.ReactionResponse,
 )

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt

@@ -40,7 +40,6 @@ import io.getstream.chat.android.client.parser2.adapters.DownstreamChannelDtoAda
 import io.getstream.chat.android.client.parser2.adapters.DownstreamMemberInfoDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamMessageDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamModerationDetailsDtoAdapter
-import io.getstream.chat.android.client.parser2.adapters.DownstreamReactionDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadInfoDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamUserDtoAdapter
@@ -94,7 +93,6 @@ internal class MoshiChatParser(
             .add(DownstreamMessageDtoAdapter)
             .add(DownstreamModerationDetailsDtoAdapter)
             .add(DownstreamChannelDtoAdapter)
-            .add(DownstreamReactionDtoAdapter)
             .add(UpstreamReactionDtoAdapter)
             .add(DownstreamUserDtoAdapter)
             .add(UpstreamUserDtoAdapter)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/ReactionDtoAdapters.kt → stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/UpstreamReactionDtoAdapter.kt

@@ -21,24 +21,8 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
-import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.network.models.ReactionRequest
 
-internal object DownstreamReactionDtoAdapter :
-    CustomObjectDtoAdapter<DownstreamReactionDto>(DownstreamReactionDto::class) {
-
-    @FromJson
-    fun fromJson(
-        jsonReader: JsonReader,
-        mapAdapter: JsonAdapter<MutableMap<String, Any>>,
-        messageAdapter: JsonAdapter<DownstreamReactionDto>,
-    ): DownstreamReactionDto? = parseWithExtraData(jsonReader, mapAdapter, messageAdapter)
-
-    @ToJson
-    @Suppress("UNUSED_PARAMETER")
-    fun toJson(jsonWriter: JsonWriter, value: DownstreamReactionDto): Unit = error("Can't convert this to Json")
-}
-
 // extraDataPropertyName must match the @Json(name = ...) of ReactionRequest's overflow field.
 internal object UpstreamReactionDtoAdapter :
     CustomObjectDtoAdapter<ReactionRequest>(ReactionRequest::class, extraDataPropertyName = "custom") {

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/direct/ReactionAdapter.kt

@@ -64,6 +64,9 @@ internal class ReactionAdapter(
         JsonParsingUtils.requireField(type, "type", reader)
         JsonParsingUtils.requireField(score, "score", reader)
         JsonParsingUtils.requireField(userId, "user_id", reader)
+        JsonParsingUtils.requireField(createdAt, "created_at", reader)
+        JsonParsingUtils.requireField(updatedAt, "updated_at", reader)
+        JsonParsingUtils.requireField(user, "user", reader)
 
         return Reaction(
             messageId = messageId,

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

@@ -1006,9 +1006,10 @@ private fun createReactionJsonString() =
             "message_id": "09afcd85-9dbb-4da8-8d85-5a6b4268d755",
             "type": "type",
             "score": 3,
-            "user": ${createUserJsonString()},
+            "user": ${createNestedUserJsonString()},
             "user_id": "bender",
-            "created_at": "2020-06-29T06:14:28.000Z"
+            "created_at": "2020-06-29T06:14:28.000Z",
+            "updated_at": "2020-06-29T06:14:28.000Z"
         }
     """.trimIndent()
 

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

@@ -34,7 +34,6 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
-import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadInfoDto
@@ -639,28 +638,6 @@ internal object Mother {
         blockedMimeTypes = blockedMimeTypes,
     )
 
-    fun randomDownstreamReactionDto(
-        createdAt: Date = randomDate(),
-        messageId: String = randomString(),
-        score: Int = randomInt(),
-        type: String = randomString(),
-        updatedAt: Date = randomDate(),
-        userId: String = randomString(),
-        emojiCode: String? = randomString(),
-        user: DownstreamUserDto = randomDownstreamUserDto(id = userId),
-        extraData: Map<String, Any> = emptyMap(),
-    ): DownstreamReactionDto = DownstreamReactionDto(
-        created_at = createdAt,
-        message_id = messageId,
-        score = score,
-        type = type,
-        updated_at = updatedAt,
-        user = user,
-        user_id = userId,
-        emoji_code = emojiCode,
-        extraData = extraData,
-    )
-
     fun randomReactionGroupResponse(
         count: Int = randomInt(),
         sumScores: Int = randomInt(),

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

@@ -218,7 +218,7 @@ internal object MoshiChatApiTestArguments {
     @JvmStatic
     fun sendReactionInput() = listOf(
         Arguments.of(
-            RetroSuccess(ReactionResponse(Mother.randomDownstreamReactionDto())).toRetrofitCall(),
+            RetroSuccess(ReactionResponse(Mother.randomReactionResponse())).toRetrofitCall(),
             Result.Success::class,
         ),
         Arguments.of(RetroError<ReactionResponse>(statusCode = 500).toRetrofitCall(), Result.Failure::class),

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

@@ -36,7 +36,6 @@ import io.getstream.chat.android.client.Mother.randomDownstreamFlagDto
 import io.getstream.chat.android.client.Mother.randomDownstreamMessageDto
 import io.getstream.chat.android.client.Mother.randomDownstreamModerationDetailsDto
 import io.getstream.chat.android.client.Mother.randomDownstreamPendingMessageDto
-import io.getstream.chat.android.client.Mother.randomDownstreamReactionDto
 import io.getstream.chat.android.client.Mother.randomDownstreamReminderDto
 import io.getstream.chat.android.client.Mother.randomDownstreamThreadDto
 import io.getstream.chat.android.client.Mother.randomDownstreamThreadInfoDto
@@ -585,28 +584,6 @@ internal class DomainMappingTest {
         )
     }
 
-    @Test
-    fun `DownstreamReactionDto is correctly mapped to Reaction`() {
-        val downstreamReactionDto = randomDownstreamReactionDto()
-        val sut = Fixture().get()
-        val reaction = with(sut) {
-            downstreamReactionDto.toDomain()
-        }
-        val expected = Reaction(
-            messageId = downstreamReactionDto.message_id,
-            type = downstreamReactionDto.type,
-            score = downstreamReactionDto.score,
-            user = with(sut) { downstreamReactionDto.user?.toDomain() },
-            userId = downstreamReactionDto.user?.id.orEmpty(),
-            createdAt = downstreamReactionDto.created_at,
-            updatedAt = downstreamReactionDto.updated_at,
-            extraData = downstreamReactionDto.extraData,
-            deletedAt = null,
-            emojiCode = downstreamReactionDto.emoji_code,
-        )
-        assertEquals(expected, reaction)
-    }
-
     @Test
     fun `ReactionGroupResponse is correctly mapped to ReactionGroup`() {
         val reactionGroupResponse = randomReactionGroupResponse()

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

@@ -209,7 +209,7 @@ internal object EventMappingTestArguments {
     private val GROUPED_UNREAD_CHANNELS = mapOf("direct" to positiveRandomInt(), "support" to positiveRandomInt())
     private val UNREAD_THREADS = positiveRandomInt()
     private val UNREAD_THREAD_MESSAGES = positiveRandomInt()
-    private val REACTION = Mother.randomDownstreamReactionDto()
+    private val REACTION = Mother.randomReactionResponse()
     private val WATCHER_COUNT = positiveRandomInt()
     private val POLL = Mother.randomPollResponseData()
     private val POLL_VOTE = Mother.randomPollVoteResponseData()

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

@@ -322,9 +322,10 @@ internal object EventArguments {
         messageId = "09afcd85-9dbb-4da8-8d85-5a6b4268d755",
         type = "type",
         score = 3,
-        user = user,
+        user = nestedUser,
         userId = "bender",
         createdAt = date,
+        updatedAt = date,
     )
 
     private val poll = Poll(