From 4d86d201df2a6deb42b380ce42396fb02aa4aa73 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 8 May 2019 14:58:55 -0400 Subject: [PATCH 1/4] hardcode json --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m | 2 +- .../MFHardCodedServerResponse.h | 4 +++- .../MFHardCodedServerResponse.m | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m index 5bf2864..09617d4 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m @@ -293,7 +293,7 @@ - (nullable NSURLSessionTask *)sendRequest:(nonnull MVMCoreRequestParameters *)requestParameters locationForError:(nonnull NSString *)locationForError requestFinished:(nullable void (^)(id _Nullable jsonObject, MVMCoreErrorObject *_Nullable error))requestFinished { #if ENABLE_HARD_CODED_RESPONSE - NSDictionary *response = [[MFHardCodedServerResponse sharedInstance] getHardCodedResponseForRequest:requestParameters]; + NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForPageType:requestParameters.pageType]; if (response) { if (requestFinished) { requestFinished(response, nil); diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index a1c3eb9..efa33b6 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG #if ENABLE_HARD_CODED_RESPONSE @@ -19,6 +19,8 @@ - (NSDictionary *) getHardCodedResponseForRequest:(MVMCoreRequestParameters *)request; +- (NSDictionary *) getHardCodedResponseForPageType:(NSString *)pageType; + @end #endif diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m index 4ed21be..0319f4e 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m @@ -56,6 +56,16 @@ return self; } +- (NSDictionary *) getHardCodedResponseForPageType:(NSString *)pageType { + + NSError *error; + NSString *filePath = [[NSBundle mainBundle] pathForResource:pageType ofType:@"json"]; + if (filePath) { + return [NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfFile:filePath] options:NSJSONReadingMutableContainers error:&error]; + } + return nil; +} + - (NSDictionary *) getHardCodedResponseForRequest:(MVMCoreRequestParameters *)request { NSDictionary *cannedResponse = nil; From 8f68a457d1ce35d8fa9d7b7b2ad96392986c7ab4 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 8 May 2019 14:59:18 -0400 Subject: [PATCH 2/4] remove hardcode --- .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index efa33b6..eb9fba9 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG #if ENABLE_HARD_CODED_RESPONSE From 4b873b321ca2f7fc47e679daddd73ad441020c6c Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Fri, 10 May 2019 16:00:55 -0400 Subject: [PATCH 3/4] code review --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m | 2 +- .../HardCodedServerResponse/MFHardCodedServerResponse.m | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m index 09617d4..bc0cbae 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m @@ -293,7 +293,7 @@ - (nullable NSURLSessionTask *)sendRequest:(nonnull MVMCoreRequestParameters *)requestParameters locationForError:(nonnull NSString *)locationForError requestFinished:(nullable void (^)(id _Nullable jsonObject, MVMCoreErrorObject *_Nullable error))requestFinished { #if ENABLE_HARD_CODED_RESPONSE - NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForPageType:requestParameters.pageType]; + NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForRequest:requestParameters]; if (response) { if (requestFinished) { requestFinished(response, nil); diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m index 0319f4e..e32ec74 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m @@ -97,6 +97,11 @@ } } + if (!cannedResponse) { + cannedResponse = [self getHardCodedResponseForPageType:request.pageType]; + } + + return cannedResponse; } From 9b7254e1e513cd91dc6817374294d957f97920be Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Fri, 10 May 2019 16:05:38 -0400 Subject: [PATCH 4/4] sharedInstance --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m index bc0cbae..5bf2864 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m @@ -293,7 +293,7 @@ - (nullable NSURLSessionTask *)sendRequest:(nonnull MVMCoreRequestParameters *)requestParameters locationForError:(nonnull NSString *)locationForError requestFinished:(nullable void (^)(id _Nullable jsonObject, MVMCoreErrorObject *_Nullable error))requestFinished { #if ENABLE_HARD_CODED_RESPONSE - NSDictionary *response = [[MFHardCodedServerResponse new] getHardCodedResponseForRequest:requestParameters]; + NSDictionary *response = [[MFHardCodedServerResponse sharedInstance] getHardCodedResponseForRequest:requestParameters]; if (response) { if (requestFinished) { requestFinished(response, nil);