Merge pull request #286 from zapcannon87/developer

fix(storage): save file as child not right

Author: zapcannon87

LeanCloudTests/LCFileTestCase.swift

@@ -124,20 +124,40 @@ class LCFileTestCase: BaseTestCase {
         }
     }
 
-    func testObjectAssociateFile() {
+    func testObjectPointFile() {
         do {
             let file = LCFile(
                 payload: .fileURL(
                     fileURL: bundleResourceURL(name: "test", ext: "jpg")))
             XCTAssertTrue(file.save().isSuccess)
+            
             let object = LCObject(className: "AssociateFile")
             try object.set("image", value: file)
             XCTAssertTrue(object.save().isSuccess)
-            let fetchObject = LCObject(className: "AssociateFile", objectId: object.objectId!.value)
+            
+            let fetchObject = LCObject(className: "AssociateFile", objectId: object.objectId!)
             XCTAssertTrue(fetchObject.fetch().isSuccess)
             XCTAssertTrue(fetchObject["image"] is LCFile)
         } catch {
             XCTFail("\(error)")
         }
     }
+    
+    func testObjectPointNewFile() {
+        let object1 = TestObject()
+        object1.fileField = LCFile(url: "https://example.com/image.png")
+        XCTAssertTrue(object1.save().isSuccess)
+        
+        let file = LCFile(objectId: object1.fileField!.objectId!)
+        XCTAssertTrue(file.fetch().isSuccess)
+        XCTAssertNotNil(file.metaData)
+        XCTAssertNotNil(file.mimeType)
+        XCTAssertNotNil(file.name)
+        
+        let object2 = TestObject()
+        object2.fileField = LCFile(
+            payload: .fileURL(
+                fileURL: bundleResourceURL(name: "test", ext: "jpg")))
+        XCTAssertNotNil(object2.save().error)
+    }
 }

Sources/Foundation/BatchRequest.swift

@@ -35,43 +35,24 @@ class BatchRequest {
     }
 
     func getBody(internalId: String) -> [String: Any] {
-        var body: [String: Any] = [:]
-
-        body["__internalId"] = internalId
-
+        var body: [String: Any] = ["__internalId": internalId]
         var children: [(String, LCObject)] = []
-
-        operationTable?.forEach { (key, operation) in
-            switch operation.name {
-            case .set:
-                /* If object is newborn, put it in __children field. */
-                if let child = operation.value as? LCObject {
-                    if !child.hasObjectId {
-                        children.append((key, child))
-                        break
-                    }
-                }
-
-                body[key] = operation.lconValue
-            default:
+        self.operationTable?.forEach { (key, operation) in
+            if case .set = operation.name,
+                let child = operation.value as? LCObject,
+                !child.hasObjectId {
+                children.append((key, child))
+            } else {
                 body[key] = operation.lconValue
             }
         }
-
-        if children.count > 0 {
-            var list: [Any] = []
-
-            children.forEach { (key, child) in
-                list.append([
-                    "className": child.actualClassName,
-                    "cid": child.internalId,
-                    "key": key
-                ])
+        if !children.isEmpty {
+            body["__children"] = children.map { (key, child) -> [String: String] in
+                ["className": child.actualClassName,
+                 "cid": child.internalId,
+                 "key": key]
             }
-
-            body["__children"] = list
         }
-
         return body
     }
 

Sources/Foundation/File.swift

@@ -153,6 +153,22 @@ public class LCFile: LCObject {
         })
     }
 
+    func paddingInfo(from remoteURL: LCString) {
+        if let metaData = self.metaData {
+            metaData["__source"] = "external"
+        } else {
+            self.metaData = LCDictionary(["__source": "external"])
+        }
+        if self.name == nil {
+            self.name = LCString((remoteURL.value as NSString).lastPathComponent)
+        }
+        if self.mimeType == nil {
+            if let mimeType = FileUploader.FileAttributes.getMIMEType(filename: self.name?.value) {
+                self.mimeType = LCString(mimeType)
+            }
+        }
+    }
+    
     /**
      Save current file and call handler in background thread.
 
@@ -184,21 +200,7 @@ public class LCFile: LCObject {
                 self.handleUploadResult(result, completion: completion)
             })
         } else if let remoteURL = url {
-            if let metaData = self.metaData {
-                metaData["__source"] = "external".lcString
-            } else {
-                self.metaData = LCDictionary(["__source": "external".lcString])
-            }
-            
-            if self.name == nil {
-                self.name = (remoteURL.value as NSString).lastPathComponent.lcString
-            }
-            
-            if self.mimeType == nil {
-                if let mimeType = FileUploader.FileAttributes.getMIMEType(filename: self.name?.value) {
-                    self.mimeType = mimeType.lcString
-                }
-            }
+            self.paddingInfo(from: remoteURL)
 
             var parameters = dictionary.jsonValue as? [String: Any]
             parameters?.removeValue(forKey: "__type")

Sources/Foundation/FileUploader.swift

@@ -211,14 +211,18 @@ class FileUploader {
         static private func getMIMEType(filenameExtension: String) -> String? {
             if filenameExtension.isEmpty {
                 return nil
-            } else if
-                let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, filenameExtension as CFString, nil)?.takeRetainedValue(),
-                let mimeType = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue()
-            {
+            }
+            #if canImport(MobileCoreServices)
+            if let uti = UTTypeCreatePreferredIdentifierForTag(
+                kUTTagClassFilenameExtension, filenameExtension as CFString, nil)?
+                .takeRetainedValue(),
+                let mimeType = UTTypeCopyPreferredTagWithClass(
+                    uti, kUTTagClassMIMEType)?
+                    .takeRetainedValue() {
                 return mimeType as String
-            } else {
-                return nil
             }
+            #endif
+            return nil
         }
 
         static func getMIMEType(filename: String?) -> String? {

Sources/Foundation/ObjectUpdater.swift

@@ -52,6 +52,15 @@ class ObjectUpdater {
         let toposort = try ObjectProfiler.shared.toposort(objects)
 
         try toposort.forEach { object in
+            if !object.hasObjectId,
+                let file = object as? LCFile {
+                guard let remoteURL = file.url else {
+                    throw LCError(
+                        code: .notFound,
+                        reason: "External URL not found.")
+                }
+                file.paddingInfo(from: remoteURL)
+            }
             requests.append(contentsOf: try BatchRequestBuilder.buildRequests(object, parameters: parameters))
         }