-
Notifications
You must be signed in to change notification settings - Fork 271
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
98 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...d-client/src/main/java/io/getstream/chat/android/client/attachment/AttachmentsVerifier.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package io.getstream.chat.android.client.attachment | ||
|
||
import io.getstream.chat.android.models.Message | ||
import io.getstream.log.taggedLogger | ||
import io.getstream.result.Error | ||
import io.getstream.result.Result | ||
|
||
internal class AttachmentsVerifier { | ||
|
||
private val logger by taggedLogger("Chat:AttachmentVerifier") | ||
|
||
internal fun verifyAttachments(result: Result<Message>): Result<Message> { | ||
val message = result.getOrNull() ?: return result | ||
logger.d { "[verifyAttachments] #uploader; uploadedAttachments: ${message.attachments}" } | ||
val corruptedAttachment = message.attachments.find { | ||
it.upload != null && it.imageUrl == null && it.assetUrl == null | ||
} | ||
if (corruptedAttachment != null) { | ||
logger.e { | ||
"[verifyAttachments] #uploader; message(${message.id}) has corrupted attachment: $corruptedAttachment" | ||
} | ||
return Result.Failure( | ||
Error.GenericError("Message(${message.id}) contains corrupted attachment: $corruptedAttachment") | ||
) | ||
} | ||
return result | ||
} | ||
|
||
} |
62 changes: 62 additions & 0 deletions
62
...ent/src/test/java/io/getstream/chat/android/client/attachment/AttachmentsVerifierTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package io.getstream.chat.android.client.attachment | ||
|
||
import io.getstream.chat.android.client.test.randomMessage | ||
import io.getstream.chat.android.models.Attachment | ||
import io.getstream.chat.android.test.TestLoggingHelper | ||
import io.getstream.result.Result | ||
import org.amshove.kluent.`should be equal to` | ||
import org.junit.jupiter.api.BeforeEach | ||
import org.junit.jupiter.api.Test | ||
import java.io.File | ||
|
||
internal class AttachmentsVerifierTests { | ||
|
||
private lateinit var verifier: AttachmentsVerifier | ||
|
||
@BeforeEach | ||
fun setUp() { | ||
verifier = AttachmentsVerifier() | ||
|
||
TestLoggingHelper.initialize() | ||
} | ||
|
||
@Test | ||
fun `when verify message with non-File attachment, result must be Successful`() { | ||
/* Given */ | ||
val locationAttachment = Attachment( | ||
type = "location", | ||
extraData = mutableMapOf("latitude" to 1.0, "longitude" to 2.0), | ||
uploadState = Attachment.UploadState.Success, | ||
) | ||
val message = randomMessage(attachments = arrayListOf(locationAttachment)) | ||
val result = Result.Success(message) | ||
|
||
/* When */ | ||
val verified = verifier.verifyAttachments(result) | ||
|
||
/* Then */ | ||
verified.isSuccess `should be equal to` true | ||
} | ||
|
||
@Test | ||
fun `when verify message with File attachment, result must be Failure if no CDN urls`() { | ||
/* Given */ | ||
val fileAttachment = Attachment( | ||
type = "audio", | ||
mimeType = "audio/mp3", | ||
upload = File("./some.mp3"), | ||
assetUrl = null, | ||
imageUrl = null, | ||
uploadState = Attachment.UploadState.Success, | ||
) | ||
val message = randomMessage(attachments = arrayListOf(fileAttachment)) | ||
val result = Result.Success(message) | ||
|
||
/* When */ | ||
val verified = verifier.verifyAttachments(result) | ||
|
||
/* Then */ | ||
verified.isFailure `should be equal to` true | ||
} | ||
|
||
} |