-
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: conversation folders [WPB-14309] (#3106)
* feat: conversation folders * feat: conversation folders * fix: labels converersion * detekt fix * fix: handle favorite conversations * remove unnecessary prints * detekt fix * review fixes * detekt fix * tests fix * test fix * renamed tests
- Loading branch information
Showing
46 changed files
with
1,166 additions
and
90 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationFolder.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,38 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 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.conversation | ||
|
|
||
| import com.wire.kalium.logic.data.id.QualifiedID | ||
|
|
||
| data class ConversationFolder( | ||
| val id: String, | ||
| val name: String, | ||
| val type: FolderType | ||
| ) | ||
|
|
||
| data class FolderWithConversations( | ||
| val id: String, | ||
| val name: String, | ||
| val type: FolderType, | ||
| val conversationIdList: List<QualifiedID> | ||
| ) | ||
|
|
||
| enum class FolderType { | ||
| USER, | ||
| FAVORITE, | ||
| } |
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
65 changes: 65 additions & 0 deletions
65
...nMain/kotlin/com/wire/kalium/logic/data/conversation/folders/ConversationFolderMappers.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,65 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 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.conversation.folders | ||
|
|
||
| import com.wire.kalium.logic.data.conversation.ConversationFolder | ||
| import com.wire.kalium.logic.data.conversation.FolderType | ||
| import com.wire.kalium.logic.data.conversation.FolderWithConversations | ||
| import com.wire.kalium.logic.data.id.QualifiedID | ||
| import com.wire.kalium.logic.data.id.toDao | ||
| import com.wire.kalium.logic.data.id.toModel | ||
| import com.wire.kalium.network.api.authenticated.properties.LabelDTO | ||
| import com.wire.kalium.network.api.authenticated.properties.LabelTypeDTO | ||
| import com.wire.kalium.persistence.dao.conversation.folder.ConversationFolderEntity | ||
| import com.wire.kalium.persistence.dao.conversation.folder.ConversationFolderTypeEntity | ||
| import com.wire.kalium.persistence.dao.conversation.folder.FolderWithConversationsEntity | ||
|
|
||
| fun LabelDTO.toFolder(selfDomain: String) = FolderWithConversations( | ||
| conversationIdList = qualifiedConversations?.map { it.toModel() } ?: conversations.map { QualifiedID(it, selfDomain) }, | ||
| id = id, | ||
| name = name, | ||
| type = type.toFolderType() | ||
| ) | ||
|
|
||
| fun LabelTypeDTO.toFolderType() = when (this) { | ||
| LabelTypeDTO.USER -> FolderType.USER | ||
| LabelTypeDTO.FAVORITE -> FolderType.FAVORITE | ||
| } | ||
|
|
||
| fun ConversationFolderEntity.toModel() = ConversationFolder( | ||
| id = id, | ||
| name = name, | ||
| type = type.toModel() | ||
| ) | ||
|
|
||
| fun FolderWithConversations.toDao() = FolderWithConversationsEntity( | ||
| id = id, | ||
| name = name, | ||
| type = type.toDao(), | ||
| conversationIdList = conversationIdList.map { it.toDao() } | ||
| ) | ||
|
|
||
| fun FolderType.toDao() = when (this) { | ||
| FolderType.USER -> ConversationFolderTypeEntity.USER | ||
| FolderType.FAVORITE -> ConversationFolderTypeEntity.FAVORITE | ||
| } | ||
|
|
||
| fun ConversationFolderTypeEntity.toModel(): FolderType = when (this) { | ||
| ConversationFolderTypeEntity.USER -> FolderType.USER | ||
| ConversationFolderTypeEntity.FAVORITE -> FolderType.FAVORITE | ||
| } |
100 changes: 100 additions & 0 deletions
100
...in/kotlin/com/wire/kalium/logic/data/conversation/folders/ConversationFolderRepository.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,100 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 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.conversation.folders | ||
|
|
||
| import com.benasher44.uuid.uuid4 | ||
| import com.wire.kalium.logger.KaliumLogger.Companion.ApplicationFlow.CONVERSATIONS_FOLDERS | ||
| import com.wire.kalium.logic.CoreFailure | ||
| import com.wire.kalium.logic.data.conversation.ConversationDetailsWithEvents | ||
| import com.wire.kalium.logic.data.conversation.ConversationFolder | ||
| import com.wire.kalium.logic.data.conversation.ConversationMapper | ||
| import com.wire.kalium.logic.data.conversation.FolderType | ||
| import com.wire.kalium.logic.data.conversation.FolderWithConversations | ||
| import com.wire.kalium.logic.data.id.QualifiedID | ||
| import com.wire.kalium.logic.di.MapperProvider | ||
| import com.wire.kalium.logic.functional.Either | ||
| import com.wire.kalium.logic.functional.map | ||
| import com.wire.kalium.logic.functional.onFailure | ||
| import com.wire.kalium.logic.functional.onSuccess | ||
| import com.wire.kalium.logic.kaliumLogger | ||
| import com.wire.kalium.logic.wrapApiRequest | ||
| import com.wire.kalium.logic.wrapStorageRequest | ||
| import com.wire.kalium.network.api.base.authenticated.properties.PropertiesApi | ||
| import com.wire.kalium.persistence.dao.conversation.folder.ConversationFolderDAO | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.map | ||
|
|
||
| internal interface ConversationFolderRepository { | ||
|
|
||
| suspend fun getFavoriteConversationFolder(): Either<CoreFailure, ConversationFolder> | ||
| suspend fun observeConversationsFromFolder(folderId: String): Flow<List<ConversationDetailsWithEvents>> | ||
| suspend fun updateConversationFolders(folderWithConversations: List<FolderWithConversations>): Either<CoreFailure, Unit> | ||
| suspend fun fetchConversationFolders(): Either<CoreFailure, Unit> | ||
| } | ||
|
|
||
| internal class ConversationFolderDataSource internal constructor( | ||
| private val conversationFolderDAO: ConversationFolderDAO, | ||
| private val userPropertiesApi: PropertiesApi, | ||
| private val selfUserId: QualifiedID, | ||
| private val conversationMapper: ConversationMapper = MapperProvider.conversationMapper(selfUserId) | ||
| ) : ConversationFolderRepository { | ||
|
|
||
| override suspend fun updateConversationFolders(folderWithConversations: List<FolderWithConversations>): Either<CoreFailure, Unit> = | ||
| wrapStorageRequest { | ||
| conversationFolderDAO.updateConversationFolders(folderWithConversations.map { it.toDao() }) | ||
| } | ||
|
|
||
| override suspend fun getFavoriteConversationFolder(): Either<CoreFailure, ConversationFolder> = wrapStorageRequest { | ||
| conversationFolderDAO.getFavoriteConversationFolder().toModel() | ||
| } | ||
|
|
||
| override suspend fun observeConversationsFromFolder(folderId: String): Flow<List<ConversationDetailsWithEvents>> = | ||
| conversationFolderDAO.observeConversationListFromFolder(folderId).map { conversationDetailsWithEventsEntityList -> | ||
| conversationDetailsWithEventsEntityList.map { | ||
| conversationMapper.fromDaoModelToDetailsWithEvents(it) | ||
| } | ||
| } | ||
|
|
||
| override suspend fun fetchConversationFolders(): Either<CoreFailure, Unit> = wrapApiRequest { | ||
| kaliumLogger.withFeatureId(CONVERSATIONS_FOLDERS).v("Fetching conversation folders") | ||
| userPropertiesApi.getLabels() | ||
| } | ||
| .onSuccess { labelsResponse -> | ||
| val folders = labelsResponse.labels.map { it.toFolder(selfUserId.domain) }.toMutableList() | ||
| val favoriteLabel = folders.firstOrNull { it.type == FolderType.FAVORITE } | ||
|
|
||
| if (favoriteLabel == null) { | ||
| kaliumLogger.withFeatureId(CONVERSATIONS_FOLDERS).v("Favorite label not found, creating a new one") | ||
| folders.add( | ||
| FolderWithConversations( | ||
| id = uuid4().toString(), | ||
| name = "", // name will be handled by localization | ||
| type = FolderType.FAVORITE, | ||
| conversationIdList = emptyList() | ||
| ) | ||
| ) | ||
| } | ||
| conversationFolderDAO.updateConversationFolders(folders.map { it.toDao() }) | ||
| } | ||
| .onFailure { | ||
| kaliumLogger.withFeatureId(CONVERSATIONS_FOLDERS).e("Error fetching conversation folders $it") | ||
| Either.Left(it) | ||
| } | ||
| .map { } | ||
|
|
||
| } |
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.