Merge pull request #109 from deville/import-unique-objects-order

Import unique objects in the same order as the array of import sources
This commit is contained in:
John Estropia
2016-10-10 20:29:59 +09:00
committed by GitHub

View File

@@ -183,8 +183,9 @@ public extension BaseDataTransaction {
} }
/** /**
Updates existing `ImportableUniqueObject`s or creates them by importing from the specified array of import sources. Updates existing `ImportableUniqueObject`s or creates them by importing from the specified array of import sources.
- Warning: While the array returned from `importUniqueObjects(...)` correctly maps to the order of `sourceArray`, the order of objects called with `ImportableUniqueObject` methods is arbitrary. Do not make assumptions that any particular object will be imported ahead or after another object. Objects are called with `ImportableUniqueObject` methods in the same order as in import sources array.
The array returned from `importUniqueObjects(...)` correctly maps to the order of `sourceArray`.
- parameter into: an `Into` clause specifying the entity type - parameter into: an `Into` clause specifying the entity type
- parameter sourceArray: the array of objects to import values from - parameter sourceArray: the array of objects to import values from
@@ -206,7 +207,8 @@ public extension BaseDataTransaction {
let entityType = into.entityClass as! T.Type let entityType = into.entityClass as! T.Type
var mapping = Dictionary<T.UniqueIDType, T.ImportSource>() var importSourceByID = Dictionary<T.UniqueIDType, T.ImportSource>()
let sortedIDs = try autoreleasepool { let sortedIDs = try autoreleasepool {
return try sourceArray.flatMap { (source) -> T.UniqueIDType? in return try sourceArray.flatMap { (source) -> T.UniqueIDType? in
@@ -216,49 +218,44 @@ public extension BaseDataTransaction {
return nil return nil
} }
mapping[uniqueIDValue] = source importSourceByID[uniqueIDValue] = source
return uniqueIDValue return uniqueIDValue
} }
} }
mapping = try autoreleasepool { try preProcess(mapping) } importSourceByID = try autoreleasepool { try preProcess(importSourceByID) }
var objects = Dictionary<T.UniqueIDType, T>()
for object in self.fetchAll(From(entityType), Where(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs)) ?? [] { var existingObjectsByID = Dictionary<T.UniqueIDType, T>()
self.fetchAll(From(entityType), Where(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))?
.forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
var insertedObjectsByID = Dictionary<T.UniqueIDType, T>()
for objectID in sortedIDs {
try autoreleasepool { try autoreleasepool {
let uniqueIDValue = object.uniqueIDValue guard let source = importSourceByID[objectID] else { return }
guard let source = mapping.removeValue(forKey: uniqueIDValue),
entityType.shouldUpdate(from: source, in: self) else { if let object = existingObjectsByID[objectID] {
guard entityType.shouldUpdate(from: source, in: self) else { return }
return
try object.update(from: source, in: self)
} }
else if entityType.shouldInsert(from: source, in: self) {
try object.update(from: source, in: self) let object = self.create(into)
objects[uniqueIDValue] = object object.uniqueIDValue = objectID
} try object.didInsert(from: source, in: self)
}
for (uniqueIDValue, source) in mapping {
try autoreleasepool {
guard entityType.shouldInsert(from: source, in: self) else {
return insertedObjectsByID[objectID] = object
} }
let object = self.create(into)
object.uniqueIDValue = uniqueIDValue
try object.didInsert(from: source, in: self)
objects[uniqueIDValue] = object
} }
} }
return sortedIDs.flatMap { objects[$0] }
return sortedIDs.flatMap { existingObjectsByID[$0] ?? insertedObjectsByID[$0] }
} }
} }
} }