E2-1736: Message archive handles all kinds of text (#245)

* only take if object is string

* refcator

* refactor into helper methods

* add unit tests

Author: e7mac

Example/Tests/Classes/LeanplumTest.m

@@ -49,6 +49,8 @@ @interface Leanplum (Test)
 + (NSSet<NSString *> *)parseEnabledCountersFromResponse:(NSDictionary *)response;
 + (NSSet<NSString *> *)parseEnabledFeatureFlagsFromResponse:(NSDictionary *)response;
 + (void)triggerMessageDisplayed:(LPActionContext *)context;
++ (LPMessageArchiveData *)messageArchiveDataFromContext:(LPActionContext *)context;
++ (NSString *)messageBodyFromContext:(LPActionContext *)context;
 
 + (void)trackGeofence:(LPGeofenceEventType *)event withValue:(double)value andInfo:(NSString *)info andArgs:(NSDictionary *)args andParameters:(NSDictionary *)params;
 
@@ -1835,4 +1837,60 @@ -(void)test_triggerMessageDisplayedCallsCallback
     XCTAssertTrue(blockCalled);
 }
 
+/**
+ * Test that method messageBodyFromContext gets the correct message body for string.
+ */
+-(void)test_messageBodyFromContextGetsCorrectBodyForString
+{
+    NSString *messageID = @"testMessageID";
+    NSString *messageBody = @"testMessageBody";
+    NSString *recipientUserID = @"recipientUserID";
+
+    LPActionContext *actionContext = [[LPActionContext alloc] init];
+    id actionContextMock = OCMPartialMock(actionContext);
+
+    OCMStub([actionContextMock messageId]).andReturn(messageID);
+    OCMStub([actionContextMock args]).andReturn(@{@"Message":messageBody});
+
+    XCTAssertTrue([[Leanplum messageBodyFromContext:actionContext] isEqualToString:messageBody]);
+}
+
+/**
+ * Test that method messageBodyFromContext gets the correct message body for
+ * dictionary with key "Text".
+ */
+-(void)test_messageBodyFromContextGetsCorrectBodyForDictionaryKeyText
+{
+    NSString *messageID = @"testMessageID";
+    NSString *messageBody = @"testMessageBody";
+    NSString *recipientUserID = @"recipientUserID";
+
+    LPActionContext *actionContext = [[LPActionContext alloc] init];
+    id actionContextMock = OCMPartialMock(actionContext);
+
+    OCMStub([actionContextMock messageId]).andReturn(messageID);
+    OCMStub([actionContextMock args]).andReturn(@{@"Message":@{@"Text":messageBody}});
+
+    XCTAssertTrue([[Leanplum messageBodyFromContext:actionContext] isEqualToString:messageBody]);
+}
+
+/**
+ * Test that method messageBodyFromContext gets the correct message body for
+ * dictionary with key "Text Value".
+ */
+-(void)test_messageBodyFromContextGetsCorrectBodyForDictionaryKeyTextValue
+{
+    NSString *messageID = @"testMessageID";
+    NSString *messageBody = @"testMessageBody";
+    NSString *recipientUserID = @"recipientUserID";
+
+    LPActionContext *actionContext = [[LPActionContext alloc] init];
+    id actionContextMock = OCMPartialMock(actionContext);
+
+    OCMStub([actionContextMock messageId]).andReturn(messageID);
+    OCMStub([actionContextMock args]).andReturn(@{@"Message":@{@"Text Value":messageBody}});
+
+    XCTAssertTrue([[Leanplum messageBodyFromContext:actionContext] isEqualToString:messageBody]);
+}
+
 @end

Leanplum-SDK/Classes/Internal/Leanplum.m

@@ -510,26 +510,45 @@ + (void)triggerVariablesChangedAndNoDownloadsPending
 + (void)triggerMessageDisplayed:(LPActionContext *)context
 {
     LP_BEGIN_USER_CODE
-    NSString *messageID = context.messageId;
-    NSString *messageKey = @"Message";
-    NSString *messageBody = @"";
-    if ([context.args valueForKey:messageKey]) {
-        messageBody = [context.args valueForKey:messageKey];
-    }
-    NSString *recipientUserID = [Leanplum userId];
-    NSDate *deliveryDateTime = [NSDate date];
+    LPMessageArchiveData *messageArchiveData = [self messageArchiveDataFromContext:context];
     for (LeanplumMessageDisplayedCallbackBlock block in [LPInternalState sharedState]
          .messageDisplayedBlocks.copy) {
-        LPMessageArchiveData *messageArchiveData = [[LPMessageArchiveData alloc]
-                                                    initWithMessageID: messageID
-                                                    messageBody:messageBody
-                                                    recipientUserID:recipientUserID
-                                                    deliveryDateTime:deliveryDateTime];
         block(messageArchiveData);
     }
     LP_END_USER_CODE
 }
 
++ (LPMessageArchiveData *)messageArchiveDataFromContext:(LPActionContext *)context {
+    NSString *messageID = context.messageId;
+    NSString *messageBody = [self messageBodyFromContext:context];
+    NSString *recipientUserID = [Leanplum userId];
+    NSDate *deliveryDateTime = [NSDate date];
+
+    return [[LPMessageArchiveData alloc] initWithMessageID: messageID
+                                               messageBody:messageBody
+                                           recipientUserID:recipientUserID
+                                          deliveryDateTime:deliveryDateTime];
+}
+
++ (NSString *)messageBodyFromContext:(LPActionContext *)context {
+    NSString *messageBody = @"";
+    NSString *messageKey = @"Message";
+    id messageObject = [context.args valueForKey:messageKey];
+    if (messageObject) {
+        if ([messageObject isKindOfClass:[NSString class]]) {
+            messageBody = messageObject;
+        } else if ([messageObject isKindOfClass:[NSDictionary class]]) {
+            NSDictionary *messageDict = (NSDictionary *) messageObject;
+            if ([[messageDict objectForKey:@"Text"] isKindOfClass:[NSString class]]) {
+                messageBody = [messageDict objectForKey:@"Text"];
+            } else if ([[messageDict objectForKey:@"Text Value"] isKindOfClass:[NSString class]]) {
+                messageBody = [messageDict objectForKey:@"Text Value"];
+            }
+        }
+    }
+    return messageBody;
+}
+
 + (void)triggerAction:(LPActionContext *)context
 {
     [self triggerAction:context handledBlock:nil];