Skip to content
Snippets Groups Projects
Commit 785e1f65 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Merge branch 'fix/reply-message-migration-fix' into 'main'

Do not check if replied message exists when migrating

See merge request elixxir/client-ios-db!28
parents c0ef6d7d 64edcb0b
No related branches found
No related tags found
1 merge request!28Do not check if replied message exists when migrating
......@@ -25,7 +25,6 @@ public struct MigrateMessage {
}
extension MigrateMessage {
public struct ReplyMessageNotFound: Error, Equatable {}
public struct GroupNotFound: Error, Equatable {}
public static let live = MigrateMessage { message, newDb, myContactId, meMarshaled in
......@@ -55,11 +54,6 @@ extension MigrateMessage {
replyMessageId = nil
}
if let replyMessageId = replyMessageId,
try newDb.fetchMessages(.init(networkId: replyMessageId)).isEmpty {
throw ReplyMessageNotFound()
}
if let groupId = message.groupId,
try newDb.fetchGroups(.init(id: [groupId])).isEmpty {
throw GroupNotFound()
......
......@@ -166,14 +166,28 @@ final class MigrateMessageTests: XCTestCase {
senderId: "unknown-contact-id".data(using: .utf8)!
)
XCTAssertThrowsError(
try migrate(legacyMessage, to: newDb, myContactId: Data(), meMarshaled: Data())
) { error in
XCTAssertEqual(
error as? MigrateMessage.ReplyMessageNotFound,
MigrateMessage.ReplyMessageNotFound()
let newMessages: [XXModels.Message] = try newDb
.fetchMessages(.init())
.map { $0.withNilId() }
XCTAssertNoDifference(newMessages, [
.init(
id: nil,
networkId: legacyMessage.uniqueId,
senderId: legacyMessage.sender,
recipientId: legacyMessage.receiver,
groupId: nil,
date: Date(nsSince1970: legacyMessage.timestamp),
status: MigrateMessage.newStatus(for: legacyMessage.status),
isUnread: legacyMessage.unread,
text: legacyMessage.payload.text,
replyMessageId: legacyMessage.payload.reply!.messageId,
roundURL: legacyMessage.roundURL,
fileTransferId: legacyMessage.payload.attachment?.transferId
)
}
])
}
func testMigratingMessageWithUnknownSenderAndRecipient() throws {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment