Fix for mapKeysToProperties not working for linked objects with links

Author: Josh Holtz

Classes/JSONAPIResource.m

@@ -64,26 +64,6 @@ - (id)initWithDictionary:(NSDictionary*)dict withLinked:(NSDictionary*)linked {
         [self setWithDictionary:dict];
         [self linkLinks:linked];
 
-        
-        for (NSString *key in [self mapKeysToProperties]) {
-            if ([key hasPrefix:@"links."] == YES) {
-                
-                NSString *propertyName = [[self mapKeysToProperties] objectForKey:key];
-                NSString *linkedResource = [key stringByReplacingOccurrencesOfString:@"links." withString:@""];
-                
-                id resource = [self linkedResourceForKey:linkedResource];
-                if (resource != nil) {
-                    @try {
-                        [self setValue:resource forKey:propertyName];
-                    }
-                    @catch (NSException *exception) {
-                        NSLog(@"JSONAPIResource Warning - %@", [exception description]);
-                    }
-                }
-                
-            }
-        }
-        
     }
     return self;
 }
@@ -174,6 +154,26 @@ - (void)linkLinks:(NSDictionary*)linked {
 
         }
     }
+    
+    // Link links for mapped key to properties
+    for (NSString *key in [self mapKeysToProperties]) {
+        if ([key hasPrefix:@"links."] == YES) {
+            
+            NSString *propertyName = [[self mapKeysToProperties] objectForKey:key];
+            NSString *linkedResource = [key stringByReplacingOccurrencesOfString:@"links." withString:@""];
+            
+            id resource = [self linkedResourceForKey:linkedResource];
+            if (resource != nil) {
+                @try {
+                    [self setValue:resource forKey:propertyName];
+                }
+                @catch (NSException *exception) {
+                    NSLog(@"JSONAPIResource Warning - %@", [exception description]);
+                }
+            }
+            
+        }
+    }
 }
 
 @end