fix(notification): clean up notification usecase (#1311)

wireapp · Jan 6, 2023 · 6b1453b · 6b1453b
1 parent 91663e5
commit 6b1453b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 35 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/GetNotificationsUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/GetNotificationsUseCase.kt
@@ -2,13 +2,9 @@ package com.wire.kalium.logic.feature.message
 
 import com.wire.kalium.logic.data.connection.ConnectionRepository
 import com.wire.kalium.logic.data.conversation.ConversationDetails
-import com.wire.kalium.logic.data.conversation.ConversationRepository
-import com.wire.kalium.logic.data.message.MessageMapper
 import com.wire.kalium.logic.data.message.MessageRepository
 import com.wire.kalium.logic.data.notification.LocalNotificationConversation
 import com.wire.kalium.logic.data.notification.LocalNotificationMessageMapper
-import com.wire.kalium.logic.data.user.UserId
-import com.wire.kalium.logic.data.user.UserRepository
 import com.wire.kalium.logic.di.MapperProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.buffer
@@ -31,20 +27,13 @@ interface GetNotificationsUseCase {
  *
  * @param connectionRepository connectionRepository for observing connectionRequests that user should be notified about
  * @param messageRepository MessageRepository for getting Messages that user should be notified about
- * @param userRepository UserRepository for getting SelfUser data, Self userId and OtherUser data (authors of messages)
- * @param conversationRepository ConversationRepository for getting conversations that have messages that user should be notified about
- * @param messageMapper MessageMapper for mapping Message object into LocalNotificationMessage
  * @param localNotificationMessageMapper LocalNotificationMessageMapper for mapping PublicUser object into LocalNotificationMessageAuthor
  */
 @Suppress("LongParameterList")
 internal class GetNotificationsUseCaseImpl internal constructor(
     private val connectionRepository: ConnectionRepository,
     private val messageRepository: MessageRepository,
-    private val userRepository: UserRepository,
-    private val conversationRepository: ConversationRepository,
     private val ephemeralNotificationsManager: EphemeralNotificationsMgr,
-    private val selfUserId: UserId,
-    private val messageMapper: MessageMapper = MapperProvider.messageMapper(selfUserId),
     private val localNotificationMessageMapper: LocalNotificationMessageMapper = MapperProvider.localNotificationMessageMapper()
 ) : GetNotificationsUseCase {
 
@@ -67,11 +56,4 @@ internal class GetNotificationsUseCaseImpl internal constructor(
                     .map { localNotificationMessageMapper.fromConnectionToLocalNotificationConversation(it) }
             }
     }
-
-    // TODO: will consider these values in query lever after SQLDelight added window functions
-    companion object {
-        private const val DEFAULT_MESSAGE_LIMIT = 100
-        private const val DEFAULT_MESSAGE_OFFSET = 0
-        private const val NOTIFICATION_DATE_OFFSET = 1000L
-    }
 }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MessageScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MessageScope.kt
@@ -214,9 +214,6 @@ class MessageScope internal constructor(
         get() = GetNotificationsUseCaseImpl(
             connectionRepository = connectionRepository,
             messageRepository = messageRepository,
-            userRepository = userRepository,
-            conversationRepository = conversationRepository,
-            selfUserId = selfUserId,
             ephemeralNotificationsManager = EphemeralNotificationsManager
         )
 

diff --git a/...rc/commonTest/kotlin/com/wire/kalium/logic/feature/message/GetNotificationsUseCaseTest.kt b/...rc/commonTest/kotlin/com/wire/kalium/logic/feature/message/GetNotificationsUseCaseTest.kt
@@ -216,9 +216,6 @@ class GetNotificationsUseCaseTest {
         val getNotificationsUseCase: GetNotificationsUseCase = GetNotificationsUseCaseImpl(
             connectionRepository = connectionRepository,
             messageRepository = messageRepository,
-            userRepository = userRepository,
-            conversationRepository = conversationRepository,
-            selfUserId = SELF_USER_ID,
             ephemeralNotificationsManager = ephemeralNotifications
         )
 

diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAO.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAO.kt
@@ -50,6 +50,5 @@ interface ConnectionDAO {
     suspend fun deleteConnectionDataAndConversation(conversationId: QualifiedIDEntity)
     suspend fun getConnectionRequestsForNotification(): Flow<List<ConnectionEntity>>
     suspend fun updateNotificationFlag(flag: Boolean, userId: QualifiedIDEntity)
-    suspend fun updateAllNotificationFlags(flag: Boolean)
     suspend fun setAllConnectionsAsNotified()
 }
diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAOImpl.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/ConnectionDAOImpl.kt
@@ -105,9 +105,9 @@ class ConnectionDAOImpl(
         )
     }
 
-    override suspend fun insertConnections(conversationList: List<ConnectionEntity>) {
+    override suspend fun insertConnections(users: List<ConnectionEntity>) {
         connectionsQueries.transaction {
-            for (connectionEntity: ConnectionEntity in conversationList) {
+            for (connectionEntity: ConnectionEntity in users) {
                 connectionsQueries.insertConnection(
                     from_id = connectionEntity.from,
                     conversation_id = connectionEntity.conversationId,
@@ -142,14 +142,6 @@ class ConnectionDAOImpl(
         connectionsQueries.updateNotificationFlag(flag, userId)
     }
 
-    override suspend fun updateAllNotificationFlags(flag: Boolean) {
-        connectionsQueries.transaction {
-            connectionsQueries.selectConnectionRequests()
-                .executeAsList()
-                .forEach { connectionsQueries.updateNotificationFlag(flag, it.qualified_to) }
-        }
-    }
-
     override suspend fun setAllConnectionsAsNotified() {
         connectionsQueries.setAllConnectionsAsNotified()
     }