Skip to content

Commit

Permalink
Revert "fix(migration): select proteus conversationId for mls migrati…
Browse files Browse the repository at this point in the history
…on in al…" (#3008)

This reverts commit 5cad6c8.
  • Loading branch information
mchenani authored and github-actions[bot] committed Sep 14, 2024
1 parent a04b87f commit 141122f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,7 @@ WHERE qualifiedId = (SELECT active_one_on_one_conversation_id FROM User WHERE qu
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 = ?;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 141122f

Please sign in to comment.