Skip to content

Accept null file_size in AttachmentDto #6462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpunto merged 2 commits into from
May 22, 2026
Merged

Accept null file_size in AttachmentDto #6462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7515acc
Accept null file size in AttachmentDto
gpunto May 19, 2026
1f5b237
Drop file_size default in AttachmentDto and test null mapping
gpunto May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...droid-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ internal class DomainMapping(
authorName = author_name,
authorLink = author_link,
fallback = fallback,
fileSize = file_size,
fileSize = file_size ?: 0,
image = image,
imageUrl = image_url,
mimeType = mime_type,
Expand Down
2 changes: 1 addition & 1 deletion ...oid-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/AttachmentDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ internal data class AttachmentDto(
val author_name: String?,
val author_link: String?,
val fallback: String?,
val file_size: Int = 0,
val file_size: Int?,
val image: String?,
val image_url: String?,
val mime_type: String?,
Expand Down
2 changes: 1 addition & 1 deletion stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ internal object Mother {
authorName: String? = randomString(),
authorLink: String? = randomString(),
fallback: String? = randomString(),
fileSize: Int = positiveRandomInt(),
fileSize: Int? = positiveRandomInt(),
image: String? = randomString(),
imageUrl: String? = randomString(),
mimeType: String? = randomString(),
Expand Down
12 changes: 11 additions & 1 deletion ...d-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ internal class DomainMappingTest {
authorName = attachmentDto.author_name,
authorLink = attachmentDto.author_link,
fallback = attachmentDto.fallback,
fileSize = attachmentDto.file_size,
fileSize = attachmentDto.file_size ?: 0,
Comment thread
andremion marked this conversation as resolved.
image = attachmentDto.image,
imageUrl = attachmentDto.image_url,
mimeType = attachmentDto.mime_type,
Expand All @@ -576,6 +576,16 @@ internal class DomainMappingTest {
assertEquals(expected, attachment)
}

@Test
fun `AttachmentDto with null file_size falls back to 0`() {
val attachmentDto = randomAttachmentDto(fileSize = null)
val sut = Fixture().get()
val attachment = with(sut) {
attachmentDto.toDomain()
}
assertEquals(0, attachment.fileSize)
}

@Test
fun `BannedUserResponse is correctly mapped to BannedUser`() {
val bannedUserResponse = randomBannedUserResponse()
Expand Down
6 changes: 6 additions & 0 deletions ...client/src/test/java/io/getstream/chat/android/client/parser2/AttachmentDtoAdapterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,10 @@ internal class AttachmentDtoAdapterTest {
val jsonString = parser.toJson(AttachmentDtoTestData.attachmentWithoutExtraData)
jsonString.shouldEqualJson(AttachmentDtoTestData.jsonWithoutExtraData)
}

@Test
fun `Deserialize JSON attachment with null file_size`() {
val attachment = parser.fromJson(AttachmentDtoTestData.jsonWithNullFileSize, AttachmentDto::class.java)
attachment shouldBeEqualTo AttachmentDtoTestData.attachmentWithNullFileSize
}
}
27 changes: 27 additions & 0 deletions .../src/test/java/io/getstream/chat/android/client/parser2/testdata/AttachmentDtoTestData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,33 @@ internal object AttachmentDtoTestData {
extraData = mapOf("draft" to true),
)

@Language("JSON")
val jsonWithNullFileSize =
"""{
"file_size": null
}
""".withoutWhitespace()
val attachmentWithNullFileSize = AttachmentDto(
asset_url = null,
author_name = null,
author_link = null,
fallback = null,
file_size = null,
image = null,
image_url = null,
mime_type = null,
name = null,
og_scrape_url = null,
text = null,
thumb_url = null,
title = null,
title_link = null,
type = null,
original_width = null,
original_height = null,
extraData = emptyMap(),
)

@Language("JSON")
val jsonWithoutExtraData =
"""{
Expand Down
Loading