Report missing localId as soft errors

Author: flovilmart

Parse/Parse/Internal/Commands/PFRESTCommand.m

@@ -174,41 +174,50 @@ - (void)maybeChangeServerOperation {
     }
 }
 
-+ (BOOL)forEachLocalIdIn:(id)object doBlock:(BOOL(^)(PFObject *pointer))block {
++ (BOOL)forEachLocalIdIn:(id)object doBlock:(BOOL(^)(PFObject *pointer, NSError **error))block error:(NSError **)error {
     __block BOOL modified = NO;
 
     // If this is a Pointer with a local id, try to resolve it.
     if ([object isKindOfClass:[PFObject class]] && !((PFObject *)object).objectId) {
-        return block(object);
+        return block(object, error);
     }
 
     if ([object isKindOfClass:[NSDictionary class]]) {
+        __block NSError *localError;
+        __block BOOL hasFailed = NO;
         [object enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) {
-            if ([[self class] forEachLocalIdIn:obj doBlock:block]) {
+            if ([[self class] forEachLocalIdIn:obj doBlock:block error:&localError]) {
                 modified = YES;
             }
+            if (localError) {
+                *stop = YES;
+                hasFailed = YES;
+            }
         }];
+        if (hasFailed && error) {
+            *error = localError;
+        }
     } else if ([object isKindOfClass:[NSArray class]]) {
         for (id value in object) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
+            if ([[self class] forEachLocalIdIn:value doBlock:block error:error]) {
                 modified = YES;
             }
         }
     } else if ([object isKindOfClass:[PFAddOperation class]]) {
         for (id value in ((PFAddOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
+            if ([[self class] forEachLocalIdIn:value doBlock:block error:error]) {
                 modified = YES;
             }
         }
     } else if ([object isKindOfClass:[PFAddUniqueOperation class]]) {
         for (id value in ((PFAddUniqueOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
+            if ([[self class] forEachLocalIdIn:value doBlock:block error:error]) {
                 modified = YES;
             }
         }
     } else if ([object isKindOfClass:[PFRemoveOperation class]]) {
         for (id value in ((PFRemoveOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
+            if ([[self class] forEachLocalIdIn:value doBlock:block error:error]) {
                 modified = YES;
             }
         }
@@ -217,13 +226,16 @@ + (BOOL)forEachLocalIdIn:(id)object doBlock:(BOOL(^)(PFObject *pointer))block {
     return modified;
 }
 
-- (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer))block error:(NSError **)error {
+- (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer, NSError **error))block error:(NSError **)error {
     NSDictionary *data = [[PFDecoder objectDecoder] decodeObject:self.parameters];
     if (!data) {
         return YES;
     }
 
-    if ([[self class] forEachLocalIdIn:data doBlock:block]) {
+    if ([[self class] forEachLocalIdIn:data doBlock:block error:error]) {
+        if (error && *error) {
+            return NO;
+        }
         self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];
         if (!self.parameters && error && *error) {
             return NO;
@@ -235,16 +247,19 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer))block error:(NSError **)error
 - (BOOL)resolveLocalIds:(NSError * __autoreleasing *)error {
     __block NSError *firstError;
     __block BOOL pointerResolutionFailed = NO;
-    BOOL paramEncodingFailed = [self forEachLocalId:^(PFObject *pointer) {
+    BOOL paramEncodingSucceeded = [self forEachLocalId:^(PFObject *pointer, NSError **error) {
         NSError *localError;
         BOOL success = [pointer resolveLocalId:&localError];
-        if (!success && !firstError) {
-            firstError = localError;
+        if (!success && localError) {
+            *error = localError;
             pointerResolutionFailed = YES;
+            if (!firstError) {
+                firstError = localError;
+            }
         }
         return YES;
     } error: error];
-    if (paramEncodingFailed && *error) {
+    if (!paramEncodingSucceeded && *error) {
         return NO;
     }
     if (pointerResolutionFailed && firstError) {

Parse/Parse/PFEncoder.m

@@ -98,10 +98,12 @@ - (id)encodeObject:(id)object error:(NSError * __autoreleasing *) error {
         __block BOOL hasErrored = NO;
         __block NSError *encodingError = nil;
         [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
-            dict[key] = [self encodeObject:obj error:&encodingError];
-            if (!dict[key] && encodingError) {
+            id result = [self encodeObject:obj error:&encodingError];
+            if (!result && encodingError) {
                 hasErrored = YES;
                 *stop = YES;
+            } else {
+                dict[key] = result;
             }
         }];
         if (hasErrored) {

Parse/Parse/PFObject.m

@@ -783,7 +783,9 @@ - (NSString *)getOrCreateLocalId {
 
 - (BOOL)resolveLocalId:(NSError *__autoreleasing*)error {
     @synchronized (lock) {
-        PFConsistencyAssert(self.localId, @"Tried to resolve a localId for an object with no localId.");
+        if (!self.localId) {
+            PFConsistencyError(error, self.localId, NO , @"Tried to resolve a localId for an object with no localId.");
+        }
         NSString *newObjectId = [[Parse _currentManager].coreManager.objectLocalIdStore objectIdForLocalId:self.localId];
 
         // If we are resolving local ids, then this object is about to go over the network.

Parse/Tests/Unit/URLSessionCommandRunnerTests.m

@@ -269,4 +269,14 @@ - (void)testLocalIdResolutionFailure {
     XCTAssertEqualObjects(error.localizedDescription, @"Tried to save an object with a pointer to a new, unsaved object.");
 }
 
+- (void)testLocalIdResolutionFailureWithNoLocalId {
+    PFObject *object = [PFObject objectWithClassName:@"Yolo"];
+    id command = [PFRESTCommand commandWithHTTPPath:@"" httpMethod:@"" parameters:@{@"object": object} sessionToken:nil error:nil];
+    NSError *error;
+    [command resolveLocalIds:&error];
+    XCTAssertNotNil(error);
+    XCTAssertEqualObjects(error.domain, PFParseErrorDomain);
+    XCTAssertEqualObjects(error.localizedDescription, @"Tried to resolve a localId for an object with no localId.");
+}
+
 @end