fix: Read receipts not generated when responding from notification (#…

…2994)
wireapp · Oct 18, 2024 · 8d9bcaf · 8d9bcaf
1 parent acd9ecf
commit 8d9bcaf
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 43 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageRepository.kt
@@ -80,7 +80,6 @@ internal interface MessageRepository {
     )
     suspend fun persistMessage(
         message: Message.Standalone,
-        updateConversationReadDate: Boolean = false,
         updateConversationModifiedDate: Boolean = false,
     ): Either<CoreFailure, InsertMessageResult>
 
@@ -321,12 +320,10 @@ internal class MessageDataSource internal constructor(
     )
     override suspend fun persistMessage(
         message: Message.Standalone,
-        updateConversationReadDate: Boolean,
         updateConversationModifiedDate: Boolean,
     ): Either<CoreFailure, InsertMessageResult> = wrapStorageRequest {
         messageDAO.insertOrIgnoreMessage(
             messageMapper.fromMessageToEntity(message),
-            updateConversationReadDate,
             updateConversationModifiedDate
         )
     }

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt
@@ -44,11 +44,9 @@ internal class PersistMessageUseCaseImpl(
     override suspend operator fun invoke(message: Message.Standalone): Either<CoreFailure, Unit> {
         val modifiedMessage = getExpectsReadConfirmationFromMessage(message)
         val isSelfSender = message.isSelfTheSender(selfUserId)
-        val shouldUpdateConversationReadDate = modifiedMessage.content !is MessageContent.MissedCall && isSelfSender
 
         return messageRepository.persistMessage(
             message = modifiedMessage,
-            updateConversationReadDate = shouldUpdateConversationReadDate,
             updateConversationModifiedDate = message.content.shouldUpdateConversationOrder()
         ).onSuccess {
             val isConversationMuted = it == InsertMessageResult.INSERTED_INTO_MUTED_CONVERSATION

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/MessageRepositoryTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/MessageRepositoryTest.kt
@@ -163,7 +163,7 @@ class MessageRepositoryTest {
             }.wasInvoked(exactly = once)
 
             coVerify {
-                messageDAO.insertOrIgnoreMessage(eq(mappedEntity), any(), any())
+                messageDAO.insertOrIgnoreMessage(eq(mappedEntity), any())
             }.wasInvoked(exactly = once)
         }
     }
@@ -764,7 +764,7 @@ class MessageRepositoryTest {
 
         suspend fun withInsertOrIgnoreMessage(result: InsertMessageResult) = apply {
             coEvery {
-                messageDAO.insertOrIgnoreMessage(any(), any(), any())
+                messageDAO.insertOrIgnoreMessage(any(), any())
             }.returns(result)
         }
 

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCaseTest.kt
@@ -52,7 +52,7 @@ class PersistMessageUseCaseTest {
         result.shouldFail()
 
         coVerify {
-            arrangement.messageRepository.persistMessage(any(), any(), any())
+            arrangement.messageRepository.persistMessage(any(), any())
         }.wasInvoked(once)
 
         coVerify {
@@ -76,7 +76,7 @@ class PersistMessageUseCaseTest {
             result.shouldSucceed()
 
             coVerify {
-                arrangement.messageRepository.persistMessage(any(), any(), any())
+                arrangement.messageRepository.persistMessage(any(), any())
             }.wasInvoked(once)
 
             coVerify {
@@ -102,7 +102,7 @@ class PersistMessageUseCaseTest {
             result.shouldSucceed()
 
             coVerify {
-                arrangement.messageRepository.persistMessage(any(), any(), any())
+                arrangement.messageRepository.persistMessage(any(), any())
             }.wasInvoked(once)
 
             coVerify {
@@ -114,22 +114,6 @@ class PersistMessageUseCaseTest {
             }.wasNotInvoked()
         }
 
-    @Test
-    fun givenMissedCallMessage_whenRunningUseCase_thenCallPersistMessageWithUpdateConversationReadDateIsFalse() =
-        runTest {
-            val (arrangement, persistMessage) = Arrangement()
-                .withPersistMessageSuccess()
-                .arrange()
-            val missedCallMessage = TestMessage.MISSED_CALL_MESSAGE
-
-            val result = persistMessage.invoke(missedCallMessage)
-
-            result.shouldSucceed()
-            coVerify {
-                arrangement.messageRepository.persistMessage(any(), eq(false), any())
-            }.wasInvoked(once)
-        }
-
     private class Arrangement {
         @Mock
         val messageRepository = mock(MessageRepository::class)
@@ -145,13 +129,13 @@ class PersistMessageUseCaseTest {
 
         suspend fun withPersistMessageSuccess() = apply {
             coEvery {
-                messageRepository.persistMessage(any(), any(), any())
+                messageRepository.persistMessage(any(), any())
             }.returns(Either.Right(InsertMessageResult.INSERTED_NEED_TO_NOTIFY_USER))
         }
 
         suspend fun withPersistMessageFailure() = apply {
             coEvery {
-                messageRepository.persistMessage(any(), any(), any())
+                messageRepository.persistMessage(any(), any())
             }.returns(Either.Left(CoreFailure.InvalidEventSenderID))
         }
 

diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAO.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAO.kt
@@ -50,7 +50,6 @@ interface MessageDAO {
      */
     suspend fun insertOrIgnoreMessage(
         message: MessageEntity,
-        updateConversationReadDate: Boolean = false,
         updateConversationModifiedDate: Boolean = false
     ): InsertMessageResult
 

diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOImpl.kt
@@ -89,17 +89,11 @@ internal class MessageDAOImpl internal constructor(
 
     override suspend fun insertOrIgnoreMessage(
         message: MessageEntity,
-        updateConversationReadDate: Boolean,
         updateConversationModifiedDate: Boolean
     ) = withContext(coroutineContext) {
         queries.transactionWithResult {
             val messageCreationInstant = message.date
 
-            if (updateConversationReadDate) {
-                conversationsQueries.updateConversationReadDate(messageCreationInstant, message.conversationId)
-                unreadEventsQueries.deleteUnreadEvents(message.date, message.conversationId)
-            }
-
             insertInDB(message)
 
             val needsToBeNotified = nonSuspendNeedsToBeNotified(message.id, message.conversationId)

diff --git a/...ence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageTextEditTest.kt b/...ence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageTextEditTest.kt
@@ -38,7 +38,6 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class MessageTextEditTest : BaseMessageTest() {
 
     @Test
@@ -247,16 +246,15 @@ class MessageTextEditTest : BaseMessageTest() {
     }
 
     @Test
-    fun givenTextWasInsertedAndIsRead_whenUpdatingContentWithSelfMention_thenUnreadEventShouldNotChange() = runTest {
+    fun givenTextWasInsertedAndIsNotRead_whenUpdatingContentWithSelfMention_thenUnreadEventShouldNotChange() = runTest {
         // Given
         val initMentions = listOf(
             MessageEntity.Mention(0, 1, SELF_USER_ID),
             MessageEntity.Mention(2, 3, OTHER_USER.id)
         )
 
         insertInitialDataWithMentions(
-            mentions = initMentions,
-            updateConversationReadDate = true
+            mentions = initMentions
         )
 
         // When
@@ -276,20 +274,19 @@ class MessageTextEditTest : BaseMessageTest() {
         val unreadEvents = messageDAO.observeUnreadEvents()
             .first()[CONVERSATION_ID]
 
-        assertTrue(unreadEvents.isNullOrEmpty())
+        assertNotNull(unreadEvents)
+        assertEquals(1, unreadEvents.size)
     }
 
     private suspend fun insertInitialDataWithMentions(
         mentions: List<MessageEntity.Mention>,
-        updateConversationReadDate: Boolean = false
     ) {
         super.insertInitialData()
 
         messageDAO.insertOrIgnoreMessage(
             ORIGINAL_MESSAGE.copy(
                 content = ORIGINAL_CONTENT.copy(mentions = mentions)
-            ),
-            updateConversationReadDate = updateConversationReadDate
+            )
         )
     }