Merge fix: file pointer not right

Author: zapcannon87

AVOS/AVOS.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 		D32AA482263BF39C0044E74E /* Realtime.h in Headers */ = {isa = PBXBuildFile; fileRef = D32AA481263BF39C0044E74E /* Realtime.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D365E42426C3D29F00148DE8 /* LCLeaderboard.h in Headers */ = {isa = PBXBuildFile; fileRef = D365E42226C3D29F00148DE8 /* LCLeaderboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D365E42526C3D29F00148DE8 /* LCLeaderboard.m in Sources */ = {isa = PBXBuildFile; fileRef = D365E42326C3D29F00148DE8 /* LCLeaderboard.m */; };
+		D33127D326CBAD6D00BBDE09 /* LCFileTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D33127D226CBAD6D00BBDE09 /* LCFileTestCase.swift */; };
 		D36A095A25BEA75000A4F312 /* IMMessageTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D36A095925BEA75000A4F312 /* IMMessageTestCase.swift */; };
 		D39724C424A5CD3C0099A518 /* RTMBaseTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39724C324A5CD3C0099A518 /* RTMBaseTestCase.swift */; };
 		D39724C624A852400099A518 /* IMClientTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39724C524A852400099A518 /* IMClientTestCase.swift */; };
@@ -550,6 +551,7 @@
 		D328B8E720FEE2200039091A /* LCIMClientInternalConversationManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LCIMClientInternalConversationManager.m; sourceTree = "<group>"; };
 		D32AA47F263BF2F30044E74E /* Foundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Foundation.h; sourceTree = "<group>"; };
 		D32AA481263BF39C0044E74E /* Realtime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Realtime.h; sourceTree = "<group>"; };
+		D33127D226CBAD6D00BBDE09 /* LCFileTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCFileTestCase.swift; sourceTree = "<group>"; };
 		D34C417D2483C3FD00CD2459 /* LCRTMConnection_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCRTMConnection_Internal.h; sourceTree = "<group>"; };
 		D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCRouter_Internal.h; sourceTree = "<group>"; };
 		D34FD72B2068CFE900B7C11B /* LCLiveQuery_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCLiveQuery_Internal.h; sourceTree = "<group>"; };
@@ -1236,6 +1238,7 @@
 				D30B6B6124A0A933006ABE09 /* BaseTestCase.swift */,
 				D3AD74AA24BC216200D1BBEE /* LCUserTestCase.swift */,
 				D313717F26BBDAC200123756 /* LCQueryTestCase.swift */,
+				D33127D226CBAD6D00BBDE09 /* LCFileTestCase.swift */,
 				D39724C324A5CD3C0099A518 /* RTMBaseTestCase.swift */,
 				D3A397F024A5A4670087D6F8 /* RTMConnectionTestCase.swift */,
 				D39724C524A852400099A518 /* IMClientTestCase.swift */,
@@ -1794,6 +1797,7 @@
 				D313718026BBDAC200123756 /* LCQueryTestCase.swift in Sources */,
 				D36A095A25BEA75000A4F312 /* IMMessageTestCase.swift in Sources */,
 				D3AD74AB24BC216200D1BBEE /* LCUserTestCase.swift in Sources */,
+				D33127D326CBAD6D00BBDE09 /* LCFileTestCase.swift in Sources */,
 				D3A397F124A5A4670087D6F8 /* RTMConnectionTestCase.swift in Sources */,
 				D39724C624A852400099A518 /* IMClientTestCase.swift in Sources */,
 				D39724C424A5CD3C0099A518 /* RTMBaseTestCase.swift in Sources */,

AVOS/LeanCloudObjcTests/LCFileTestCase.swift

@@ -0,0 +1,39 @@
+//
+//  LCFileTestCase.swift
+//  LeanCloudObjcTests
+//
+//  Created by pzheng on 2021/08/17.
+//  Copyright © 2021 LeanCloud Inc. All rights reserved.
+//
+
+import XCTest
+@testable import LeanCloudObjc
+
+class LCFileTestCase: BaseTestCase {
+    
+    func testObjectAssociation() {
+        let data = uuid.data(using: .utf8)!
+        let file = LCFile(data: data)
+        expecting { exp in
+            file.saveInBackground { succeeded, error in
+                XCTAssertTrue(succeeded)
+                XCTAssertNil(error)
+                exp.fulfill()
+            }
+        }
+        
+        let fileFieldKey = "fileField"
+        let object = LCObject()
+        object[fileFieldKey] = file;
+        XCTAssertTrue(object.save())
+        
+        guard let objectId = object.objectId else {
+            XCTFail()
+            return
+        }
+        
+        let object0 = LCObject(objectId: objectId)
+        XCTAssertTrue(object0.fetch())
+        XCTAssertTrue(object0[fileFieldKey] is LCFile)
+    }
+}

AVOS/Sources/Foundation/Object/LCObjectUtils.h

@@ -45,7 +45,7 @@
 +(NSDictionary *)dictionaryFromObjectPointer:(LCObject *)object;
 +(NSDictionary *)dictionaryFromGeoPoint:(LCGeoPoint *)point;
 +(NSDictionary *)dictionaryFromData:(NSData *)data;
-+(NSDictionary *)dictionaryFromFile:(LCFile *)file;
++ (NSDictionary *)dictionaryFromFile:(LCFile *)file;
 +(NSDictionary *)dictionaryFromACL:(LCACL *)acl;
 + (id)dictionaryFromObject:(id)obj;
 + (id)dictionaryFromObject:(id)obj topObject:(BOOL)topObject;

AVOS/Sources/Foundation/Object/LCObjectUtils.m

@@ -616,11 +616,18 @@ +(NSDictionary *)dictionaryFromData:(NSData *)data
     return @{@"__type": @"Bytes", @"base64":base64};
 }
 
-+(NSDictionary *)dictionaryFromFile:(LCFile *)file
-{
-    NSMutableDictionary *dic = [file rawJSONDataMutableCopy];
-    [dic setObject:@"File" forKey:@"__type"];
-    return dic;
++ (NSDictionary *)dictionaryFromFile:(LCFile *)file {
+    NSDictionary *dictionary;
+    NSString *objectId = file.objectId;
+    if (objectId && objectId.length != 0) {
+        dictionary = @{
+            @"id" : objectId,
+            @"__type" : @"File",
+        };
+    } else {
+        dictionary = [file rawJSONDataMutableCopy];
+    }
+    return dictionary;
 }
 
 +(NSDictionary *)dictionaryFromACL:(LCACL *)acl {