From dd24fd5a70016f85914e8be455673e51090e4f49 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Mon, 2 May 2016 15:51:11 +0200 Subject: [PATCH] - Fix JSONFormObject --- Pod/Classes/PNObject.m | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Pod/Classes/PNObject.m b/Pod/Classes/PNObject.m index ce52a2e..c7baadd 100644 --- a/Pod/Classes/PNObject.m +++ b/Pod/Classes/PNObject.m @@ -353,12 +353,24 @@ NSString * const PNObjectMappingSelector = @"selector"; for (NSString *key in JSONMap) { + NSString *mappedJSONKey; + NSString *mappedJSONType; + + id mappingValue = [JSONMap objectForKey:key]; + + if([mappingValue isKindOfClass:NSDictionary.class]) { + mappedJSONKey = [mappingValue valueForKey:@"key"]; + mappedJSONType = [mappingValue valueForKey:@"type"]; + } else { + mappedJSONKey = mappingValue; + } + if ([self.JSON objectForKey:[JSONMap objectForKey:key]]) { if ([[self.JSON objectForKey:[JSONMap objectForKey:key]] isKindOfClass:[NSDate class]]) { - [JSONFormObject setObject:[[[self.JSON objectForKey:[JSONMap objectForKey:key]] toGlobalTime] stringWithFormat:kNSDateHelperFormatSQLDateWithTime] forKey:[JSONMap objectForKey:key]]; + [JSONFormObject setObject:[[[self.JSON objectForKey:[JSONMap objectForKey:key]] toGlobalTime] stringWithFormat:kNSDateHelperFormatSQLDateWithTime] forKey:mappedJSONKey]; } else { - [JSONFormObject setObject:[self.JSON objectForKey:[JSONMap objectForKey:key]] forKey:[JSONMap objectForKey:key]]; + [JSONFormObject setObject:[self.JSON objectForKey:[JSONMap objectForKey:key]] forKey:mappedJSONKey]; } } }