one more thing

brightdigit · Oct 16, 2024 · 5a104c5 · 5a104c5
1 parent e67db79
commit 5a104c5
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/Sources/DataThespian/SwiftData/ModelContext.swift b/Sources/DataThespian/SwiftData/ModelContext.swift
@@ -34,8 +34,27 @@
   extension ModelContext {
     public func get<T>(_ model: Model<T>) throws -> T?
     where T: PersistentModel {
-      try self.existingModel(for: model.persistentIdentifier)
+      try self.persistentModel(withID: model.persistentIdentifier)
     }
+
+    private func persistentModel<T>(withID objectID: PersistentIdentifier) throws -> T?
+    where T: PersistentModel {
+      if let registered: T = registeredModel(for: objectID) {
+        return registered
+      }
+      if let notRegistered: T = model(for: objectID) as? T {
+        return notRegistered
+      }
+
+      let fetchDescriptor = FetchDescriptor<T>(
+        predicate: #Predicate { $0.persistentModelID == objectID },
+        fetchLimit: 1
+      )
+
+      return try fetch(fetchDescriptor).first
+    }
+
+    @available(*, deprecated)
     internal func existingModel<T>(for objectID: PersistentIdentifier) throws -> T?
     where T: PersistentModel {
       if let registered: T = registeredModel(for: objectID) {