Revert "fix(migration): select proteus conversationId for mls migrati…

…on in al…" (#3008) (#3013) (#3018) This reverts commit 5cad6c8. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Mojtaba Chenani <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
wireapp · Sep 25, 2024 · d170dab · d170dab
1 parent 6282928
commit d170dab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
@@ -331,8 +331,7 @@ WHERE qualified_id = (SELECT active_one_on_one_conversation_id FROM User WHERE q
 selectOneOnOneConversationIdsByProtocol:
 SELECT Member.conversation FROM Member
 JOIN Conversation ON Conversation.qualified_id = Member.conversation
-WHERE Conversation.type = 'ONE_ON_ONE' AND Conversation.protocol = :protocol AND Member.user = :user
-ORDER BY Member.conversation ASC;
+WHERE Conversation.type = 'ONE_ON_ONE' AND Conversation.protocol = :protocol AND Member.user = :user;
 
 getConversationIdByGroupId:
 SELECT qualified_id FROM Conversation WHERE mls_group_id = ?;

diff --git a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt
@@ -1262,26 +1262,6 @@ class ConversationDAOTest : BaseDatabaseTest() {
         )
     }
 
-    @Test
-    fun givenMultipleOneOnOneProteusConversationExisting_whenGettingOneOnOneConversationId_thenShouldReturnAlphabeticallyOrderedConversation() =
-        runTest {
-            // given
-            val conversationA = conversationEntity1.copy(id = QualifiedIDEntity("a", "wire.com"))
-            val conversationB = conversationEntity1.copy(id = QualifiedIDEntity("b", "wire.com"))
-
-            userDAO.upsertUser(user1)
-            conversationDAO.insertConversation(conversationB)
-            conversationDAO.insertConversation(conversationA)
-            memberDAO.insertMember(member1, conversationB.id)
-            memberDAO.insertMember(member1, conversationA.id)
-
-            // then
-            assertEquals(
-                conversationA.id,
-                conversationDAO.getOneOnOneConversationIdsWithOtherUser(user1.id, protocol = ConversationEntity.Protocol.PROTEUS).first()
-            )
-        }
-
     @Test
     fun givenNoMLSConversationExistsForGivenClients_whenGettingE2EIClientInfoByClientId_thenReturnsNull() = runTest {
         // given