Refactor outcomes and add IAM tracking

   * Add OutcomesEventsFactory to decide which repository to use
   * Add new outcome models given the new feature IAM v2 Outcomes
   * Add concepts of channels and influence
   * Add IAM tracking for indirect and direct influence
   * Add ability for future channels
   * Decouple influence tracking module to new package
   * Several changes for decouple code
   * Add testing to new functionality
   * Add testing for IAM tracking
   * Add testing for session ending
   * Add testing for V2 measure

Author: Jeasmine

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -10,23 +10,11 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "NO">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "911E2CB91E398AB3003112A4"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:OneSignal.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
+            value = ""
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
@@ -37,12 +25,23 @@
             isEnabled = "YES">
          </AdditionalOption>
       </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "911E2CB91E398AB3003112A4"
+               BuildableName = "UnitTests.xctest"
+               BlueprintName = "UnitTests"
+               ReferencedContainer = "container:OneSignal.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -56,8 +55,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -113,10 +113,10 @@ - (void)sendBackgroundAttributedFocusPingWithParams:(OSFocusCallParams*)params w
 
         let requests = [NSMutableDictionary new];
 
-        requests[@"push"] = [OSRequestOnFocus withUserId:params.userId appId:params.appId activeTime:totalTimeActive netType:params.netType emailAuthToken:nil deviceType:@(DEVICE_TYPE_PUSH) directSession:params.direct notificationIds:params.notificationIds];
+        requests[@"push"] = [OSRequestOnFocus withUserId:params.userId appId:params.appId activeTime:totalTimeActive netType:params.netType emailAuthToken:nil deviceType:@(DEVICE_TYPE_PUSH) influenceParams:params.influenceParams];
 
         // For email we omit additionalFieldsToAddToOnFocusPayload as we don't want to add
-        //   outcome fields which would double report the session time
+        //   outcome fields which would double report the influence time
         if (params.emailUserId)
             requests[@"email"] = [OSRequestOnFocus withUserId:params.emailUserId appId:params.appId activeTime:totalTimeActive netType:params.netType emailAuthToken:params.emailAuthToken deviceType:@(DEVICE_TYPE_EMAIL)];
 

iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m

@@ -26,7 +26,7 @@
  */
 
 #import "OneSignal.h"
-#import "OSSessionResult.h"
+#import "OSInfluence.h"
 #import "OSBaseFocusTimeProcessor.h"
 #import "OneSignalUserDefaults.h"
 #import "OneSignalCommonDefines.h"

iOS_SDK/OneSignalSDK/Source/OSBaseFocusTimeProcessor.m

@@ -25,12 +25,16 @@
  THE SOFTWARE.
  */
 
-@interface OSUniqueOutcomeNotification : NSObject
+#import "OneSignal.h"
+
+@interface OSCachedUniqueOutcome : NSObject
 
 @property (nonatomic, readonly) NSString *name;
-@property (nonatomic, readonly) NSString *notificationId;
+@property (nonatomic, readonly) NSString *uniqueId;
 @property (nonatomic, readonly) NSNumber *timestamp; // seconds
+@property (nonatomic, readonly) OSInfluenceChannel channel;
 
-- (id)initWithParamsNotificationId:(NSString *)name notificationId:(NSString *)notificationId timestamp:(NSNumber *)timestamp;
+- (id)initWithParamsName:(NSString *)name uniqueId:(NSString *)uniqueId channel:(OSInfluenceChannel)channel;
+- (id)initWithParamsName:(NSString *)name uniqueId:(NSString *)uniqueId timestamp:(NSNumber *)timestamp channel:(OSInfluenceChannel)channel;
 
 @end

iOS_SDK/OneSignalSDK/Source/OSUniqueOutcomeNotification.h renamed to iOS_SDK/OneSignalSDK/Source/OSCachedUniqueOutcome.h

@@ -0,0 +1,98 @@
+/**
+ Modified MIT License
+
+ Copyright 2019 OneSignal
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ 1. The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ 2. All copies of substantial portions of the Software may only be used in connection
+ with services provided by OneSignal.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+#import <Foundation/Foundation.h>
+#import "OSCachedUniqueOutcome.h"
+#import "OneSignalCommonDefines.h"
+
+@implementation OSCachedUniqueOutcome
+
+- (id)initWithParamsName:(NSString *)name uniqueId:(NSString *)uniqueId channel:(OSInfluenceChannel)channel {
+    self = [super init];
+    if (self) {
+        _name = name;
+        _uniqueId = uniqueId;
+        _channel = channel;
+        _timestamp = @0;
+    }
+    return self;
+}
+
+- (id)initWithParamsName:(NSString *)name uniqueId:(NSString *)uniqueId timestamp:(NSNumber *)timestamp channel:(OSInfluenceChannel)channel {
+    self = [super init];
+    if (self) {
+        _name = name;
+        _uniqueId = uniqueId;
+        _channel = channel;
+        _timestamp = timestamp;
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder {
+    [encoder encodeObject:_name forKey:@"name"];
+    [encoder encodeObject:_uniqueId forKey:@"uniqueId"];
+    [encoder encodeInteger:[_timestamp integerValue] forKey:@"timestamp"];
+    [encoder encodeObject:OS_INFLUENCE_CHANNEL_TO_STRING(_channel) forKey:@"channel"];
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+    if (self = [super init]) {
+        _name = [decoder decodeObjectForKey:@"name"];
+        id identifier = [decoder decodeObjectForKey:@"notificationId"];
+        if (identifier)
+            _uniqueId = identifier;
+        else
+            _uniqueId = [decoder decodeObjectForKey:@"uniqueId"];
+        _timestamp = [NSNumber numberWithLong:[decoder decodeIntegerForKey:@"timestamp"]];
+        id channel = [decoder decodeObjectForKey:@"channel"];
+        if (channel)
+            _channel = OS_INFLUENCE_CHANNEL_FROM_STRING(channel);
+        else
+            _channel = NOTIFICATION;
+    }
+    return self;
+}
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@"Name: %@ Unique Id: %@ Timestamp: %@ Channel: %@", _name, _uniqueId, _timestamp, OS_INFLUENCE_CHANNEL_TO_STRING(_channel)];
+}
+
+- (BOOL)isEqual:(OSCachedUniqueOutcome *)other {
+    NSString *key = [NSString stringWithFormat:@"%@_%@_%@", _name, _uniqueId, OS_INFLUENCE_CHANNEL_TO_STRING(_channel)];
+    NSString *otherKey = [NSString stringWithFormat:@"%@_%@_%@", other.name, other.uniqueId, OS_INFLUENCE_CHANNEL_TO_STRING(other.channel)];
+    return [key isEqualToString:otherKey];
+}
+
+- (NSUInteger)hash {
+    NSUInteger result = [_name hash];
+    result = 31 * result + [_uniqueId hash];
+    result = 31 * result + [OS_INFLUENCE_CHANNEL_TO_STRING(_channel) hash];
+    return result;
+}
+
+@end

iOS_SDK/OneSignalSDK/Source/OSCachedUniqueOutcome.m

@@ -0,0 +1,56 @@
+/**
+Modified MIT License
+
+Copyright 2020 OneSignal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+2. All copies of substantial portions of the Software may only be used in connection
+with services provided by OneSignal.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#import "OneSignal.h"
+#import "OSInfluenceDataRepository.h"
+
+#ifndef OSChannelTracker_h
+#define OSChannelTracker_h
+
+@interface OSChannelTracker : NSObject
+
+@property (nonatomic, readwrite) Session influenceType;
+@property (strong, nonatomic, readwrite, nullable) NSString *directId;
+@property (strong, nonatomic, readwrite, nullable) NSArray *indirectIds;
+@property (strong, nonatomic, readonly, nonnull) OSInfluenceDataRepository *dataRepository;
+
+- (id _Nonnull)initWithRepository:(OSInfluenceDataRepository * _Nonnull)dataRepository;
+
+- (NSString * _Nonnull)idTag;
+
+- (void)initInfluencedTypeFromCache;
+- (void)cacheState;
+- (void)resetAndInitInfluence;
+
+- (NSArray * _Nonnull)lastReceivedIds;
+- (void)saveLastId:(NSString *_Nullable)lastId;
+
+- (OSInfluence *_Nonnull)currentSessionInfluence;
+
+@end
+
+#endif /* OSChannelTracker_h */