UI verbessert, 2. PDF als kompakte Variante
This commit is contained in:
1 parent
1bf3283029
commit
f9e3e94629
23 files changed
+1009
-146
No files matched your search
@@ -28,6 +28,73 @@ final class CoreTests: XCTestCase {
|
||||
XCTAssertTrue(person.roles.contains(.lector))
|
||||
}
|
||||
|
||||
func testDemoResetRecreatesData() throws {
|
||||
let db = try AppDatabase.makeInMemory(seedDemo: true)
|
||||
let serviceCount = try db.serviceCount()
|
||||
XCTAssertEqual(try db.churches().count, 4)
|
||||
XCTAssertGreaterThan(serviceCount, 0)
|
||||
|
||||
try db.deleteAllData()
|
||||
XCTAssertEqual(try db.churches().count, 0)
|
||||
XCTAssertEqual(try db.people().count, 0)
|
||||
XCTAssertEqual(try db.serviceCount(), 0)
|
||||
XCTAssertEqual(try db.assignmentCount(), 0)
|
||||
|
||||
try db.resetDemoData()
|
||||
|
||||
XCTAssertEqual(try db.churches().count, 4)
|
||||
XCTAssertEqual(try db.people().count, 22)
|
||||
XCTAssertEqual(try db.serviceCount(), serviceCount)
|
||||
XCTAssertGreaterThan(try db.assignments(in: DayRange.year(2025)).count, 0)
|
||||
}
|
||||
|
||||
func testDeleteAllDataDoesNotReseedOnReopen() throws {
|
||||
let url = FileManager.default.temporaryDirectory
|
||||
.appendingPathComponent("lp-\(UUID().uuidString).sqlite")
|
||||
defer { try? FileManager.default.removeItem(at: url) }
|
||||
|
||||
do {
|
||||
let db = try AppDatabase(path: url.path, seedDemo: true)
|
||||
XCTAssertEqual(try db.churches().count, 4)
|
||||
try db.deleteAllData()
|
||||
XCTAssertEqual(try db.churches().count, 0)
|
||||
XCTAssertEqual(db.setting("suppressDemoSeed"), "1")
|
||||
}
|
||||
|
||||
// Reopening must not silently restore the demo dataset.
|
||||
let reopened = try AppDatabase(path: url.path, seedDemo: true)
|
||||
XCTAssertEqual(try reopened.churches().count, 0)
|
||||
|
||||
// Explicitly restoring the demo clears the marker.
|
||||
try reopened.resetDemoData()
|
||||
XCTAssertEqual(try reopened.churches().count, 4)
|
||||
XCTAssertNil(reopened.setting("suppressDemoSeed"))
|
||||
}
|
||||
|
||||
func testSpecialServiceLocationRoundTrip() throws {
|
||||
let db = try AppDatabase.makeInMemory(seedDemo: true)
|
||||
let date = DayMath.date(fromKey: "2026-07-12")!
|
||||
let service = ServiceOccurrence(
|
||||
churchID: Church.andreasID,
|
||||
location: "Open-Air auf dem Theaterplatz",
|
||||
date: date,
|
||||
timeMinutes: 18 * 60,
|
||||
title: "Open-Air-Messe",
|
||||
kind: .special
|
||||
)
|
||||
try db.upsert(service)
|
||||
|
||||
let loaded = try XCTUnwrap(try db.service(id: service.id))
|
||||
XCTAssertEqual(loaded.location, "Open-Air auf dem Theaterplatz")
|
||||
let church = try XCTUnwrap(try db.churches().first { $0.id == Church.andreasID })
|
||||
XCTAssertEqual(loaded.placeName(church: church), "Open-Air auf dem Theaterplatz")
|
||||
|
||||
var cleared = loaded
|
||||
cleared.location = " "
|
||||
try db.upsert(cleared)
|
||||
XCTAssertNil(try db.service(id: service.id)?.location)
|
||||
}
|
||||
|
||||
func testPlannerRespectsAbsenceAndFillsSlots() throws {
|
||||
let db = try AppDatabase.makeInMemory(seedDemo: false)
|
||||
let church = Church(id: "c1", name: "Testkirche", shortName: "Test", symbol: .chapel, colorHex: "#000000")
|
||||
@@ -51,6 +118,130 @@ final class CoreTests: XCTestCase {
|
||||
XCTAssertEqual(result.assignments.first?.personID, "b")
|
||||
}
|
||||
|
||||
func testPlannerAssignsSamePersonToBothComplementaryRoles() {
|
||||
let date = DayMath.date(fromKey: "2026-11-08")! // Sunday
|
||||
let dual = Person(id: "dual", firstName: "Dana", lastName: "Doppel", roles: [.lector, .helper], maxPerMonth: 10)
|
||||
let lectorOnly = Person(
|
||||
id: "lector", firstName: "Lea", lastName: "Lektor", roles: [.lector],
|
||||
preferredChurchIDs: ["c1"], maxPerMonth: 10
|
||||
)
|
||||
let helperOnly = Person(
|
||||
id: "helper", firstName: "Hanna", lastName: "Helfer", roles: [.helper],
|
||||
preferredChurchIDs: ["c1"], maxPerMonth: 10
|
||||
)
|
||||
let service = ServiceOccurrence(
|
||||
churchID: "c1",
|
||||
date: date,
|
||||
timeMinutes: 600,
|
||||
title: "Messe",
|
||||
lectorsNeeded: 1,
|
||||
helpersNeeded: 1
|
||||
)
|
||||
let planner = ServicePlanner(
|
||||
people: [dual, lectorOnly, helperOnly],
|
||||
absences: [],
|
||||
services: [service]
|
||||
)
|
||||
|
||||
let result = planner.plan()
|
||||
XCTAssertEqual(result.filledCount, 2)
|
||||
XCTAssertEqual(result.assignments.filter { $0.personID == "dual" }.count, 2)
|
||||
XCTAssertEqual(Set(result.assignments.filter { $0.personID == "dual" }.map(\.role)), Set(Role.allCases))
|
||||
XCTAssertEqual(result.assignments.count, 2)
|
||||
}
|
||||
|
||||
func testPlannerFairnessOverridesDualRolePreference() {
|
||||
let start = DayMath.date(fromKey: "2026-11-01")!
|
||||
let dual = Person(id: "dual", firstName: "Dana", lastName: "Doppel", roles: [.lector, .helper], maxPerMonth: 10)
|
||||
let lectorOnly = Person(id: "lector", firstName: "Lea", lastName: "Lektor", roles: [.lector], maxPerMonth: 10)
|
||||
let helperOnly = Person(id: "helper", firstName: "Hanna", lastName: "Helfer", roles: [.helper], maxPerMonth: 10)
|
||||
|
||||
// The dual-role person already has many assignments; the others have none.
|
||||
var services: [ServiceOccurrence] = []
|
||||
var existing: [Assignment] = []
|
||||
for index in 0..<5 {
|
||||
let service = ServiceOccurrence(
|
||||
id: "history-\(index)",
|
||||
churchID: "c1",
|
||||
date: DayMath.adding(days: index, to: start),
|
||||
timeMinutes: 600,
|
||||
title: "Messe",
|
||||
lectorsNeeded: 0,
|
||||
helpersNeeded: 0
|
||||
)
|
||||
services.append(service)
|
||||
existing.append(Assignment(id: "history-a-\(index)", serviceID: service.id, personID: "dual", role: .lector))
|
||||
}
|
||||
|
||||
let target = ServiceOccurrence(
|
||||
id: "target",
|
||||
churchID: "c1",
|
||||
date: DayMath.adding(days: 10, to: start),
|
||||
timeMinutes: 600,
|
||||
title: "Messe",
|
||||
lectorsNeeded: 1,
|
||||
helpersNeeded: 1
|
||||
)
|
||||
services.append(target)
|
||||
|
||||
let planner = ServicePlanner(
|
||||
people: [dual, lectorOnly, helperOnly],
|
||||
absences: [],
|
||||
services: services,
|
||||
existingAssignments: existing
|
||||
)
|
||||
|
||||
let result = planner.plan()
|
||||
let targetAssignments = result.assignments.filter { $0.serviceID == target.id }
|
||||
XCTAssertEqual(targetAssignments.count, 2)
|
||||
XCTAssertEqual(Set(targetAssignments.map(\.personID)), Set(["lector", "helper"]))
|
||||
XCTAssertFalse(targetAssignments.contains { $0.personID == "dual" })
|
||||
}
|
||||
|
||||
func testPlannerStillRejectsDuplicateRoleForSamePerson() {
|
||||
let date = DayMath.date(fromKey: "2026-11-08")!
|
||||
let dual = Person(id: "dual", firstName: "Dana", lastName: "Doppel", roles: [.lector, .helper], maxPerMonth: 10)
|
||||
let service = ServiceOccurrence(
|
||||
churchID: "c1",
|
||||
date: date,
|
||||
timeMinutes: 600,
|
||||
title: "Messe",
|
||||
lectorsNeeded: 2,
|
||||
helpersNeeded: 0
|
||||
)
|
||||
let planner = ServicePlanner(people: [dual], absences: [], services: [service])
|
||||
|
||||
let result = planner.plan()
|
||||
XCTAssertEqual(result.filledCount, 1)
|
||||
XCTAssertEqual(result.assignments.count, 1)
|
||||
XCTAssertEqual(result.unfilled.count, 1)
|
||||
}
|
||||
|
||||
func testDatabaseAllowsSamePersonInBothRoles() throws {
|
||||
let db = try AppDatabase.makeInMemory(seedDemo: false)
|
||||
let church = Church(id: "c1", name: "Testkirche", shortName: "Test", symbol: .chapel, colorHex: "#000000")
|
||||
try db.upsert(church)
|
||||
let person = Person(id: "dual", firstName: "Dana", lastName: "Doppel", roles: [.lector, .helper], maxPerMonth: 10)
|
||||
try db.upsert(person)
|
||||
let date = DayMath.date(fromKey: "2026-11-08")!
|
||||
let service = ServiceOccurrence(
|
||||
churchID: "c1",
|
||||
date: date,
|
||||
timeMinutes: 600,
|
||||
title: "Messe",
|
||||
lectorsNeeded: 1,
|
||||
helpersNeeded: 1
|
||||
)
|
||||
try db.upsert(service)
|
||||
|
||||
try db.setAssignment(serviceID: service.id, role: .lector, personID: person.id)
|
||||
try db.setAssignment(serviceID: service.id, role: .helper, personID: person.id)
|
||||
|
||||
let assignments = try db.assignments(serviceIDs: [service.id])
|
||||
XCTAssertEqual(assignments.filter { $0.personID == person.id }.count, 2)
|
||||
XCTAssertEqual(Set(assignments.filter { $0.personID == person.id }.map(\.role)), Set(Role.allCases))
|
||||
}
|
||||
|
||||
func testExchangeRoundTrip() throws {
|
||||
let source = try AppDatabase.makeInMemory(seedDemo: true)
|
||||
let range = DayRange.quarter(containing: DayMath.date(fromKey: "2026-11-07")!)
|
||||
@@ -101,6 +292,11 @@ final class CoreTests: XCTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
func testAbbreviatedNameKeepsFullSurname() {
|
||||
let person = Person(firstName: "Anna", lastName: "Berg")
|
||||
XCTAssertEqual(person.abbreviatedName, "A. Berg")
|
||||
}
|
||||
|
||||
func testRangeLabelsAndPreferenceRate() {
|
||||
let range = DayRange(
|
||||
start: DayMath.date(fromKey: "2026-10-01")!,
|
||||
|
||||
Reference in new issue
Block a user