Fix for tracking events with bool as a parameter (#430)

* added additional check for booleans when event is triggered with parameters
added unit tests

* use lowercase string to be sure

Author: dejan2k

Example/Tests/Classes/LPActionManagerTest.m

@@ -137,6 +137,59 @@ - (void)test_matched_trigger
     XCTAssertFalse(result.matchedTrigger);
 }
 
+- (void)test_matched_trigger_with_boolean_parameter
+{
+    LPActionManager *manager = [LPActionManager sharedManager];
+    
+    NSDictionary *config = @{@"whenLimits":@{@"children":@[],
+                                             @"objects":@[],
+                                             @"subjects":[NSNull null]
+                                             },
+                             @"whenTriggers":@{@"children":@[@{@"noun":@"boolParamValues",
+                                                               @"objects":@[@"boolValue", @"false"],
+                                                               @"subject":@"event",
+                                                               @"verb":@"triggersWithParameter"
+                                                               }],
+                                               @"verb":@"OR"
+                                               }
+                             };
+    
+    // track parameters
+    LPContextualValues *contextualValues = [[LPContextualValues alloc] init];
+    
+    contextualValues.parameters = @{@"boolValue":@NO};
+    LeanplumMessageMatchResult result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"boolParamValues"
+                                                  contextualValues:contextualValues];
+    XCTAssertTrue(result.matchedTrigger);
+    
+    contextualValues.parameters = @{@"boolValue":@"false"};
+    result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"boolParamValues"
+                                                  contextualValues:contextualValues];
+    XCTAssertTrue(result.matchedTrigger);
+    
+    contextualValues.parameters = @{@"boolValue":@"true"};
+    result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"boolParamValues"
+                                                  contextualValues:contextualValues];
+    XCTAssertFalse(result.matchedTrigger);
+    
+    contextualValues.parameters = @{@"boolValue":@YES};
+    result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"boolParamValues"
+                                                  contextualValues:contextualValues];
+    XCTAssertFalse(result.matchedTrigger);
+}
+
 - (void)test_active_period_false
 {
     LPActionManager *manager = [LPActionManager sharedManager];

Example/Tests/Classes/LPUtilsTest.m

@@ -79,4 +79,27 @@ - (void)test_base64EncodedStringFromData {
     XCTAssertEqualObjects(base64String, expectedSring);
 }
 
+- (void)test_isBoolNumber {
+    NSNumber *boolNumber = [NSNumber numberWithBool:YES];
+    XCTAssertTrue([LPUtils isBoolNumber:boolNumber]);
+    
+    NSNumber *boolNumber1 = [NSNumber numberWithBool:NO];
+    XCTAssertTrue([LPUtils isBoolNumber:boolNumber1]);
+    
+    NSNumber *boolNumber2 = [NSNumber numberWithBool:0];
+    XCTAssertTrue([LPUtils isBoolNumber:boolNumber2]);
+    
+    NSNumber *boolNumber3 = [NSNumber numberWithBool:1];
+    XCTAssertTrue([LPUtils isBoolNumber:boolNumber3]);
+    
+    NSNumber *intNumber = [NSNumber numberWithInt:1];
+    XCTAssertFalse([LPUtils isBoolNumber:intNumber]);
+    
+    NSNumber *doubleNumber = [NSNumber numberWithDouble:0.0];
+    XCTAssertFalse([LPUtils isBoolNumber:doubleNumber]);
+    
+    id stringValue = @"false";
+    XCTAssertFalse([LPUtils isBoolNumber:stringValue]);
+}
+
 @end

Leanplum-SDK/Classes/Features/Actions/LPActionManager.m

@@ -237,10 +237,22 @@ + (BOOL)matchedTrigger:(NSDictionary *)trigger
             if ([verb isEqual:@"triggersWithParameter"]) {
                 // We need to check whether the key is in the parameter
                 // or else it will create a null object that will always return YES.
-                return objects.count >= 2 &&
-                    contextualValues.parameters[objects[0]] &&
-                    [[contextualValues.parameters[objects[0]] description]
-                        caseInsensitiveCompare:[objects[1] description]] == NSOrderedSame;
+                if (objects.count >= 2) {
+                    if (contextualValues.parameters[objects[0]]) {
+                        BOOL result = NO;
+                        id trackedValue = contextualValues.parameters[objects[0]];
+                        id triggeredValue = objects[1];
+                        if ([trackedValue isKindOfClass:[NSNumber class]] && [LPUtils isBoolNumber:trackedValue] && [triggeredValue isKindOfClass:[NSString class]])
+                        {
+                            result = [(NSNumber *)trackedValue boolValue] == [(NSString *)triggeredValue lowercaseString].boolValue;
+                        } else {
+                          result = [[trackedValue description]
+                                       caseInsensitiveCompare:[triggeredValue description]] == NSOrderedSame;
+                        }
+                        return result;
+                    }
+                }
+                return NO;
             }
 
             return YES;

Leanplum-SDK/Classes/Utilities/LPUtils.h

@@ -64,4 +64,9 @@
 
 + (NSBundle *)leanplumBundle;
 
+/**
+ * Checks if given value is a NSNumber with bool value
+ */
++ (BOOL)isBoolNumber:(NSNumber *)value;
+
 @end

Leanplum-SDK/Classes/Utilities/LPUtils.m

@@ -111,4 +111,11 @@ + (NSBundle *)leanplumBundle
     return bundle;
 }
 
++ (BOOL)isBoolNumber:(NSNumber *)value
+{
+   CFTypeID boolID = CFBooleanGetTypeID();
+   CFTypeID numID = CFGetTypeID((__bridge CFTypeRef)(value));
+   return numID == boolID;
+}
+
 @end