Skip to content
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

fix: Asset message resend transfer status #WPB-11035 #3063

Merged
merged 2 commits into from
Oct 30, 2024
Merged

fix: Asset message resend transfer status #WPB-11035 #3063

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
aa3699e
fix: Asset message resend transfer status #WPB-11035
m-zagorski Oct 15, 2024
673e97a
Code review
m-zagorski Oct 24, 2024
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
1 change: 1 addition & 0 deletions .../src/commonMain/kotlin/com/wire/kalium/logic/feature/message/RetryFailedMessageUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class RetryFailedMessageUseCase internal constructor(
.map { updatedMessage } // we need to persist new asset remoteData and status
}
}
.onSuccess { updateAssetMessageTransferStatus(AssetTransferStatus.UPLOADED, message.conversationId, message.id) }
.onFailure {
kaliumLogger.e("Failed to retry sending asset message. Failure = $it")
updateAssetMessageTransferStatus(AssetTransferStatus.FAILED_UPLOAD, message.conversationId, message.id)
Expand Down
32 changes: 32 additions & 0 deletions .../commonTest/kotlin/com/wire/kalium/logic/feature/message/RetryFailedMessageUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,38 @@ class RetryFailedMessageUseCaseTest {
}.wasInvoked(exactly = once)
}

@Test
fun givenAValidFailedAndNotUploadedAssetMessage_whenSuccessfullyUploadedAsset_thenAssetTransferShouldBeChangedToUploaded() =
runTest(testDispatcher.default) {
// given
val name = "some_asset.txt"
val content = MessageContent.Asset(ASSET_CONTENT.value.copy(name = name))
val path = fakeKaliumFileSystem.providePersistentAssetPath(name)
val message = assetMessage().copy(content = content, status = Message.Status.Failed)
val uploadedAssetId = UploadedAssetId("remote_key", "remote_domain", "remote_token")
val uploadedAssetSha = SHA256Key(byteArrayOf())
val (arrangement, useCase) = Arrangement()
.withGetMessageById(Either.Right(message))
.withUpdateMessageStatus(Either.Right(Unit))
.withUpdateAssetMessageTransferStatus(UpdateTransferStatusResult.Success)
.withFetchPrivateDecodedAsset(Either.Right(path))
.withStoredData(mockedLongAssetData(), path)
.withGetAssetMessageTransferStatus(AssetTransferStatus.FAILED_UPLOAD)
.withUploadAndPersistPrivateAsset(Either.Right(uploadedAssetId to uploadedAssetSha))
.withPersistMessage(Either.Right(Unit))
.withSendMessage(Either.Right(Unit))
.arrange()

// when
useCase.invoke(message.id, message.conversationId)
advanceUntilIdle()

// then
coVerify {
arrangement.updateAssetMessageTransferStatus.invoke(AssetTransferStatus.UPLOADED, message.conversationId, message.id)
}.wasInvoked(exactly = once)
}

@Test
fun givenAValidFailedAndNotUploadedAssetMessage_whenRetryingFailedMessage_thenUploadAssetAndSendAMessageWithProperAssetRemoteData() =
runTest(testDispatcher.default) {
Expand Down
Loading