Add Identity Model ID to Deltas to track which user

* The model on a Delta for property change is the properties model. However, the identity is needed to send the request.
* We have been setting the identity model as the current user's when these Deltas become Requests.
* However, the timing can be buggy when we flush Deltas when users change. The Operation Repo and Property Executor use a dispatch queue so by the time the request is made, the user may have changed.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSDelta.swift

@@ -26,6 +26,7 @@
  */
 
 import Foundation
+import OneSignalCore
 
 // TODO: Known Issue: Since these don't carry the app_id, it may have changed by the time Deltas become Requests, if app_id changes.
 // All requests requiring unique ID's will effectively be dropped.
@@ -34,6 +35,7 @@ open class OSDelta: NSObject, NSCoding {
     public let name: String
     public let deltaId: String
     public let timestamp: Date
+    public let identityModelId: String
     public var model: OSModel
     public let property: String
     public let value: Any
@@ -42,10 +44,11 @@ open class OSDelta: NSObject, NSCoding {
         return "<OSDelta \(name) with property: \(property) value: \(value)>"
     }
 
-    public init(name: String, model: OSModel, property: String, value: Any) {
+    public init(name: String, identityModelId: String, model: OSModel, property: String, value: Any) {
         self.name = name
         self.deltaId = UUID().uuidString
         self.timestamp = Date()
+        self.identityModelId = identityModelId
         self.model = model
         self.property = property
         self.value = value
@@ -55,6 +58,7 @@ open class OSDelta: NSObject, NSCoding {
         coder.encode(name, forKey: "name")
         coder.encode(deltaId, forKey: "deltaId")
         coder.encode(timestamp, forKey: "timestamp")
+        coder.encode(identityModelId, forKey: "identityModelId")
         coder.encode(model, forKey: "model")
         coder.encode(property, forKey: "property")
         coder.encode(value, forKey: "value")
@@ -64,17 +68,19 @@ open class OSDelta: NSObject, NSCoding {
         guard let name = coder.decodeObject(forKey: "name") as? String,
               let deltaId = coder.decodeObject(forKey: "deltaId") as? String,
               let timestamp = coder.decodeObject(forKey: "timestamp") as? Date,
+              let identityModelId = coder.decodeObject(forKey: "identityModelId") as? String,
               let model = coder.decodeObject(forKey: "model") as? OSModel,
               let property = coder.decodeObject(forKey: "property") as? String,
               let value = coder.decodeObject(forKey: "value")
         else {
-            // Log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "Unable to init OSDelta from cache")
             return nil
         }
 
         self.name = name
         self.deltaId = deltaId
         self.timestamp = timestamp
+        self.identityModelId = identityModelId
         self.model = model
         self.property = property
         self.value = value

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModelStoreListener.swift

@@ -60,6 +60,7 @@ class OSIdentityModelStoreListener: OSModelStoreListener {
 
         return OSDelta(
             name: name,
+            identityModelId: args.model.modelId,
             model: args.model,
             property: args.property,
             value: args.newValue

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModelStoreListener.swift

@@ -47,6 +47,7 @@ class OSPropertiesModelStoreListener: OSModelStoreListener {
     func getUpdateModelDelta(_ args: OSModelChangedArgs) -> OSDelta? {
         return OSDelta(
             name: OS_UPDATE_PROPERTIES_DELTA,
+            identityModelId: OneSignalUserManagerImpl.sharedInstance.user.identityModel.modelId,
             model: args.model,
             property: args.property,
             value: args.newValue

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModelStoreListener.swift

@@ -39,6 +39,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
     func getAddModelDelta(_ model: OSSubscriptionModel) -> OSDelta? {
         return OSDelta(
             name: OS_ADD_SUBSCRIPTION_DELTA,
+            identityModelId: OneSignalUserManagerImpl.sharedInstance.user.identityModel.modelId,
             model: model,
             property: model.type.rawValue, // push, email, sms
             value: model.address ?? ""
@@ -51,6 +52,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
     func getRemoveModelDelta(_ model: OSSubscriptionModel) -> OSDelta? {
         return OSDelta(
             name: OS_REMOVE_SUBSCRIPTION_DELTA,
+            identityModelId: OneSignalUserManagerImpl.sharedInstance.user.identityModel.modelId,
             model: model,
             property: model.type.rawValue, // push, email, sms
             value: model.address ?? ""
@@ -60,6 +62,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
     func getUpdateModelDelta(_ args: OSModelChangedArgs) -> OSDelta? {
         return OSDelta(
             name: OS_UPDATE_SUBSCRIPTION_DELTA,
+            identityModelId: OneSignalUserManagerImpl.sharedInstance.user.identityModel.modelId,
             model: args.model,
             property: args.property,
             value: args.newValue