Pull request #22: Fix - Track goal missing on Same Event Name

Merge in SST/mobile-testing-ios-sdk from VB-11055 to feature/data360

* commit 'd978a8638b98d3d72880ea54a0bb29af28afb367':
  Fix - Track goal missing on Same Event Name

Author: HarshRaghavWingify

VWO/Models/VWOCampaign.h

@@ -36,7 +36,7 @@ typedef NS_ENUM(NSInteger, CampaignStatus) {
 -(nullable instancetype)setGroups:(NSDictionary *) campaignDict;
 - (nullable id)variationForKey:(NSString *)key;
 - (nullable id)testKey:(NSString *)testKey;
-- (nullable VWOGoal *)goalForIdentifier:(NSString *)identifier;
+- (nullable NSMutableArray <VWOGoal *>*)goalForIdentifier:(NSString *)identifier;
 
 @end
 

VWO/Models/VWOCampaign.m

@@ -120,14 +120,15 @@ - (nullable id)variationForKey:(NSString *)key {
     return self.variation.changes[key];
 }
 
-- (nullable VWOGoal *)goalForIdentifier:(NSString *)identifier {
+- (nullable NSMutableArray <VWOGoal *>*)goalForIdentifier:(NSString *)identifier {
     NSParameterAssert(identifier);
+    NSMutableArray <VWOGoal *>*matchedGoalsArray = [NSMutableArray new];
     for (VWOGoal *goal in self.goals) {
         if ([goal.identifier isEqualToString:identifier]) {
-            return goal;
+            [matchedGoalsArray addObject:goal];
         }
     }
-    return nil;
+    return matchedGoalsArray;
 }
 
 -(nullable VWOGroup *)groupForMeg{

VWO/VWOController.m

@@ -204,51 +204,62 @@ - (void)trackConversion:(NSString *)goalIdentifier withValue:(NSNumber *)value {
 
         //Check if the goal is already marked.
     for (VWOCampaign *campaign in _campaignList) {
-        VWOGoal *matchedGoal = [campaign goalForIdentifier:goalIdentifier];
-        if (matchedGoal) {
-
-            if ([VWOUserDefaults isGoalMarked:matchedGoal inCampaign:campaign]) {
-                BOOL isEventArchEnabled = [VWOUserDefaults IsEventArchEnabled];
-                if(!isEventArchEnabled){
-                    VWOLogDebug(@"Goal '%@' already marked and eventArch is not enabled. Will not be marked again", matchedGoal);
-                    return;
-                }
-                if([matchedGoal mca] != -1){
-                    //if mca flag != -1, then goal is not triggered multiple times.
-                    VWOLogDebug(@"Goal '%@' already marked. Will not be marked again", matchedGoal);
-                    return;
+        NSMutableArray <VWOGoal *>*matchedGoals = [campaign goalForIdentifier:goalIdentifier];
+        if([matchedGoals count] == 0){
+            continue;
+        }
+        
+        for(VWOGoal *matchedGoal in matchedGoals){
+            if (matchedGoal) {
+                
+                if ([VWOUserDefaults isGoalMarked:matchedGoal inCampaign:campaign]) {
+                    BOOL isEventArchEnabled = [VWOUserDefaults IsEventArchEnabled];
+                    if(!isEventArchEnabled){
+                        VWOLogDebug(@"Goal '%@' already marked and eventArch is not enabled. Will not be marked again", matchedGoal);
+                        return;
+                    }
+                    if([matchedGoal mca] != -1){
+                        //if mca flag != -1, then goal is not triggered multiple times.
+                        VWOLogDebug(@"Goal '%@' already marked. Will not be marked again", matchedGoal);
+                        return;
+                    }
                 }
             }
         }
     }
 
         // Mark goal(Goal can be present in multiple campaigns
     for (VWOCampaign *campaign in _campaignList) {
-        VWOGoal *matchedGoal = [campaign goalForIdentifier:goalIdentifier];
-        if (matchedGoal) {
-            if ([VWOUserDefaults isTrackingUserForCampaign:campaign]) {
-                [VWOUserDefaults markGoalConversion:matchedGoal inCampaign:campaign];
-                
-                NSURL *url = NULL;
-                if((VWOUserDefaults.IsEventArchEnabled != NULL) &&
-                    ([VWOUserDefaults.IsEventArchEnabled isEqualToString:EventArchEnabled])){
-                    //for Event based API calls
-                    url = [_vwoURL forMarkingGoalEventArch:matchedGoal
-                                        withValue:value
-                                         campaign:campaign
-                                          dateTime:NSDate.date];
-                }else{
-                    //for previous version support
-                    url = [_vwoURL forMarkingGoal:matchedGoal
-                                        withValue:value
-                                         campaign:campaign
-                                          dateTime:NSDate.date];
+        NSMutableArray <VWOGoal *>*matchedGoals = [campaign goalForIdentifier:goalIdentifier];
+        if([matchedGoals count] == 0){
+            continue;
+        }
+        for(VWOGoal *matchedGoal in matchedGoals){
+            if (matchedGoal) {
+                if ([VWOUserDefaults isTrackingUserForCampaign:campaign]) {
+                    [VWOUserDefaults markGoalConversion:matchedGoal inCampaign:campaign];
+                    
+                    NSURL *url = NULL;
+                    if((VWOUserDefaults.IsEventArchEnabled != NULL) &&
+                        ([VWOUserDefaults.IsEventArchEnabled isEqualToString:EventArchEnabled])){
+                        //for Event based API calls
+                        url = [_vwoURL forMarkingGoalEventArch:matchedGoal
+                                            withValue:value
+                                             campaign:campaign
+                                              dateTime:NSDate.date];
+                    }else{
+                        //for previous version support
+                        url = [_vwoURL forMarkingGoal:matchedGoal
+                                            withValue:value
+                                             campaign:campaign
+                                              dateTime:NSDate.date];
+                    }
+                    
+                    NSString *description = [NSString stringWithFormat:@"Goal %@", matchedGoal];
+                    [pendingURLQueue enqueue:url maxRetry:10 description:description];
+                } else {
+                    VWOLogWarning(@"Goal %@ not tracked for %@ as user is not tracked", matchedGoal, campaign);
                 }
-                
-                NSString *description = [NSString stringWithFormat:@"Goal %@", matchedGoal];
-                [pendingURLQueue enqueue:url maxRetry:10 description:description];
-            } else {
-                VWOLogWarning(@"Goal %@ not tracked for %@ as user is not tracked", matchedGoal, campaign);
             }
         }
     }