-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: use case to send Message Button Action [part-2] (#1896)
* receive composite messages * map composite to proto * detekt * detekt * db migration * db migration * sqm * map to composite entity * detekt * remove is pending state from the DB * Update logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt Co-authored-by: Vitor Hugo Schwaab <[email protected]> * Update logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt Co-authored-by: Vitor Hugo Schwaab <[email protected]> * address PR comments * detekt * remove composite message preview mapping * fix migration * feat: use case to execute composite message action * expose use case to message scope * missing param * rename use case * docs * map to proto * merge issues * address PR comments * address PR comments * detekt * sent the message only to the message original sender * detekt * Update logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/MessageMetaDataRepositoryTest.kt Co-authored-by: Alexandre Ferris <[email protected]> * PR comments --------- Co-authored-by: Vitor Hugo Schwaab <[email protected]> Co-authored-by: Alexandre Ferris <[email protected]>
- Loading branch information
3 people
authored
Jul 24, 2023
1 parent
787e880
commit 709e72e
Showing
29 changed files
with
861 additions
and
32 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
64 changes: 64 additions & 0 deletions
64
logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/CompositeMessageRepository.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,64 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.kalium.logic.data.message | ||
|
|
||
| import com.wire.kalium.logic.StorageFailure | ||
| import com.wire.kalium.logic.data.id.ConversationId | ||
| import com.wire.kalium.logic.data.id.toDao | ||
| import com.wire.kalium.logic.functional.Either | ||
| import com.wire.kalium.logic.wrapStorageRequest | ||
| import com.wire.kalium.persistence.dao.message.CompositeMessageDAO | ||
|
|
||
| interface CompositeMessageRepository { | ||
| suspend fun markSelected( | ||
| messageId: String, | ||
| conversationId: ConversationId, | ||
| buttonId: String | ||
| ): Either<StorageFailure, Unit> | ||
|
|
||
| suspend fun resetSelection( | ||
| messageId: String, | ||
| conversationId: ConversationId | ||
| ): Either<StorageFailure, Unit> | ||
| } | ||
|
|
||
| internal class CompositeMessageDatasource internal constructor( | ||
| private val compositeMessageDAO: CompositeMessageDAO | ||
| ) : CompositeMessageRepository { | ||
| override suspend fun markSelected( | ||
| messageId: String, | ||
| conversationId: ConversationId, | ||
| buttonId: String | ||
| ): Either<StorageFailure, Unit> = wrapStorageRequest { | ||
| compositeMessageDAO.markAsSelected( | ||
| messageId = messageId, | ||
| conversationId = conversationId.toDao(), | ||
| buttonId = buttonId | ||
| ) | ||
| } | ||
|
|
||
| override suspend fun resetSelection( | ||
| messageId: String, | ||
| conversationId: ConversationId | ||
| ): Either<StorageFailure, Unit> = wrapStorageRequest { | ||
| compositeMessageDAO.resetSelection( | ||
| messageId = messageId, | ||
| conversationId = conversationId.toDao() | ||
| ) | ||
| } | ||
| } |
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
46 changes: 46 additions & 0 deletions
46
logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMetaDataRepository.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,46 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.kalium.logic.data.message | ||
|
|
||
| import com.wire.kalium.logic.StorageFailure | ||
| import com.wire.kalium.logic.data.id.ConversationId | ||
| import com.wire.kalium.logic.data.id.MessageId | ||
| import com.wire.kalium.logic.data.id.toDao | ||
| import com.wire.kalium.logic.data.id.toModel | ||
| import com.wire.kalium.logic.data.user.UserId | ||
| import com.wire.kalium.logic.functional.Either | ||
| import com.wire.kalium.logic.functional.map | ||
| import com.wire.kalium.logic.wrapStorageRequest | ||
| import com.wire.kalium.persistence.dao.UserIDEntity | ||
| import com.wire.kalium.persistence.dao.message.MessageMetaDataDAO | ||
|
|
||
| interface MessageMetaDataRepository { | ||
| suspend fun originalSenderId( | ||
| conversationId: ConversationId, | ||
| messageId: MessageId | ||
| ): Either<StorageFailure, UserId> | ||
| } | ||
|
|
||
| internal class MessageMetaDataDataSource internal constructor( | ||
| private val messageMetaDataDAO: MessageMetaDataDAO | ||
| ) : MessageMetaDataRepository { | ||
| override suspend fun originalSenderId(conversationId: ConversationId, messageId: MessageId): Either<StorageFailure, UserId> = | ||
| wrapStorageRequest { | ||
| messageMetaDataDAO.originalSenderId(conversationId.toDao(), messageId) | ||
| }.map(UserIDEntity::toModel) | ||
| } |
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
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
85 changes: 85 additions & 0 deletions
85
.../kotlin/com/wire/kalium/logic/feature/message/composite/SendButtonActionMessageUseCase.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,85 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.kalium.logic.feature.message.composite | ||
|
|
||
| import com.benasher44.uuid.uuid4 | ||
| import com.wire.kalium.logic.CoreFailure | ||
| import com.wire.kalium.logic.data.id.ConversationId | ||
| import com.wire.kalium.logic.data.message.Message | ||
| import com.wire.kalium.logic.data.message.MessageContent | ||
| import com.wire.kalium.logic.data.message.MessageMetaDataRepository | ||
| import com.wire.kalium.logic.data.user.UserId | ||
| import com.wire.kalium.logic.feature.CurrentClientIdProvider | ||
| import com.wire.kalium.logic.feature.message.MessageSender | ||
| import com.wire.kalium.logic.feature.message.MessageTarget | ||
| import com.wire.kalium.logic.functional.flatMap | ||
| import com.wire.kalium.logic.functional.fold | ||
| import com.wire.kalium.logic.sync.SyncManager | ||
| import com.wire.kalium.util.DateTimeUtil | ||
|
|
||
| /** | ||
| * Use case for sending a button action message. | ||
| * @param conversationId The conversation id. | ||
| * @param messageId The id of the message that contains the button. | ||
| * @param buttonId The id of the button. | ||
| * | ||
| * the action message is sent only to the message original sender. | ||
| */ | ||
| class SendButtonActionMessageUseCase internal constructor( | ||
| private val messageSender: MessageSender, | ||
| private val messageMetaDataRepository: MessageMetaDataRepository, | ||
| private val syncManager: SyncManager, | ||
| private val currentClientIdProvider: CurrentClientIdProvider, | ||
| private val selfUserId: UserId | ||
| ) { | ||
| suspend operator fun invoke( | ||
| conversationId: ConversationId, | ||
| messageId: String, | ||
| buttonId: String | ||
| ): Result = syncManager.waitUntilLiveOrFailure().flatMap { | ||
| messageMetaDataRepository.originalSenderId( | ||
| conversationId, | ||
| messageId | ||
| ).flatMap { originalSenderId -> | ||
| currentClientIdProvider().flatMap { currentClientId -> | ||
| val regularMessage = Message.Signaling( | ||
| id = uuid4().toString(), | ||
| content = MessageContent.ButtonAction( | ||
| referencedMessageId = messageId, | ||
| buttonId = buttonId | ||
| ), | ||
| conversationId = conversationId, | ||
| date = DateTimeUtil.currentIsoDateTimeString(), | ||
| senderUserId = selfUserId, | ||
| senderClientId = currentClientId, | ||
| status = Message.Status.PENDING, | ||
| isSelfMessage = true, | ||
| expirationData = null | ||
| ) | ||
| messageSender.sendMessage(regularMessage, messageTarget = MessageTarget.Users(originalSenderId)) | ||
| } | ||
| } | ||
| }.fold(Result::Failure, { Result.Success }) | ||
|
|
||
| sealed interface Result { | ||
| object Success : Result | ||
| data class Failure( | ||
| val error: CoreFailure | ||
| ) : Result | ||
| } | ||
| } |
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
Oops, something went wrong.