Skip to content

fix: prevent HistoryItemContent orphaning during duplicate resolution #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Project-A-E-G-I-S wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent HistoryItemContent orphaning during duplicate resolution #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Maccy/Observables/History.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ class History: ItemsContainer { // swiftlint:disable:this type_body_length
var removedItemIndex: Int?
if let existingHistoryItem = findSimilarItem(item) {
if isModified(item) == nil {
for content in item.contents {
Storage.shared.context.delete(content)
}
item.contents = existingHistoryItem.contents
existingHistoryItem.contents = []
}
item.firstCopiedAt = existingHistoryItem.firstCopiedAt
item.numberOfCopies += existingHistoryItem.numberOfCopies
Expand Down
18 changes: 18 additions & 0 deletions MaccyTests/HistoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import XCTest
import Defaults
import SwiftData
@testable import Maccy

@MainActor
Expand Down Expand Up @@ -123,6 +124,23 @@ class HistoryTests: XCTestCase {
XCTAssertEqual(Set(history.items[0].item.contents), Set(firstContents))
}

func testDuplicateDoesNotOrphanContents() {
let item = historyItem("foo")
history.add(item)

let descriptor1 = FetchDescriptor<HistoryItemContent>()
let contents1 = try? Storage.shared.context.fetch(descriptor1)
XCTAssertEqual(contents1?.count, 1)

let duplicate = historyItem("foo")
history.add(duplicate)

let descriptor2 = FetchDescriptor<HistoryItemContent>()
let contents2 = try? Storage.shared.context.fetch(descriptor2)
XCTAssertEqual(contents2?.count, 1)
XCTAssertNotNil(contents2?.first?.item)
}

func testAddingItemFromMaccy() {
let firstContents = [
HistoryItemContent(
Expand Down