include deleted objects in issue validation check

baupen · Jun 23, 2024 · 9bceaa2 · 9bceaa2
1 parent 0d35161
commit 9bceaa2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Issue Manager/Back End/Concrete Requests/Sync.swift b/Issue Manager/Back End/Concrete Requests/Sync.swift
@@ -326,8 +326,8 @@ extension SyncContext {
 	}
 
 	private func pullChangedIssues(for site: ConstructionSite) async throws {
-        let knownMaps = repository.ids(for: site.maps)
-        let knownCraftsmen = repository.ids(for: site.craftsmen)
+        let knownMaps = repository.ids(for: site.allMaps)
+        let knownCraftsmen = repository.ids(for: site.allCraftsmen)
         let knownManagers = repository.ids(for: ConstructionManager.all())
 
         func validate(_ issue: Issue) throws {

diff --git a/Issue Manager/Back End/Objects/ConstructionSite.swift b/Issue Manager/Back End/Objects/ConstructionSite.swift
@@ -19,13 +19,17 @@ extension ConstructionSite: Identifiable {
 extension ConstructionSite: DBRecord {
 	static let craftsmen = hasMany(Craftsman.self)
 	var craftsmen: Craftsman.Query {
-		request(for: Self.craftsmen).withoutDeleted
+        allCraftsmen.withoutDeleted
 	}
+    /// includes deleted craftsmen
+    var allCraftsmen: Craftsman.Query { request(for: Self.craftsmen) }
 
 	static let maps = hasMany(Map.self)
 	var maps: Map.Query {
-		request(for: Self.maps).withoutDeleted
+		allMaps.withoutDeleted
 	}
+    /// includes deleted maps
+    var allMaps: Map.Query { request(for: Self.maps) }
 
 	static let issues = hasMany(Issue.self)
 	var issues: Issue.Query {