Session data and purchases become Deltas first, not Requests

* session_count, session_time, and purchases are not model-driven. We were turning their data into `OSRequestUpdateProperties` instances immediately instead of enqueueing as Deltas first. This means they could not be combined with other User Updates in a single request.
* Now, when they will send their data to the User Manager, it will manually enqueue a Delta onto the Operation Repo.

* Previously, we used a flag to indicate if we should send these requests immediately (meaning the app is backgrounded), but that is no longer needed because the Deltas are enqueued to the Operation Repo, and then the Operation Repo has its own background task to flush.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift

@@ -100,7 +100,14 @@ public class OSOperationRepo: NSObject {
         }
     }
 
-    func enqueueDelta(_ delta: OSDelta) {
+    /**
+     Enqueueing is driven by model changes and called manually by the User Manager to
+     add session time, session count and purchase data.
+     
+     // TODO: We can make this method internal once there is no manual adding of a Delta except through stores.
+     This can happen when session data and purchase data use the model / store / listener infrastructure.
+     */
+    public func enqueueDelta(_ delta: OSDelta) {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: nil) else {
             return
         }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift

@@ -188,33 +188,3 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
         }
     }
 }
-
-extension OSPropertyOperationExecutor {
-    // TODO: We can make this go through the operation repo
-    func updateProperties(propertiesDeltas: OSPropertiesDeltas, refreshDeviceMetadata: Bool, propertiesModel: OSPropertiesModel, identityModel: OSIdentityModel, sendImmediately: Bool = false, onSuccess: (() -> Void)? = nil, onFailure: (() -> Void)? = nil) {
-
-        let request = OSRequestUpdateProperties(
-            properties: [:],
-            deltas: propertiesDeltas.jsonRepresentation(),
-            refreshDeviceMetadata: refreshDeviceMetadata,
-            identityModel: identityModel)
-
-        if sendImmediately {
-            // Bypass the request queues
-            OneSignalCoreImpl.sharedClient().execute(request) { _ in
-                if let onSuccess = onSuccess {
-                    onSuccess()
-                }
-            } onFailure: { _ in
-                if let onFailure = onFailure {
-                    onFailure()
-                }
-            }
-        } else {
-            self.dispatchQueue.async {
-                self.updateRequestQueue.append(request)
-                OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
-            }
-        }
-    }
-}

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -511,26 +511,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "sendPurchases") else {
             return
         }
-        guard let user = _user else {
-            OneSignalLog.onesignalLog(ONE_S_LOG_LEVEL.LL_DEBUG, message: "Failed to send purchases because User is nil")
-            return
-        }
-        // Get the identity and properties model of the current user
-        let identityModel = user.identityModel
-        let propertiesModel = user.propertiesModel
-        let propertiesDeltas = OSPropertiesDeltas(sessionTime: nil, sessionCount: nil, amountSpent: nil, purchases: purchases)
-
-        // propertyExecutor should exist as this should be called after `start()` has been called
-        if let propertyExecutor = self.propertyExecutor {
-            propertyExecutor.updateProperties(
-                propertiesDeltas: propertiesDeltas,
-                refreshDeviceMetadata: false,
-                propertiesModel: propertiesModel,
-                identityModel: identityModel
-            )
-        } else {
-            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignalUserManagerImpl.sendPurchases with purchases: \(purchases) cannot be executed due to missing property executor.")
-        }
+        updatePropertiesDeltas(property: "purchases", value: purchases)
     }
 
     private func fireJwtExpired() {
@@ -559,7 +540,7 @@ extension OneSignalUserManagerImpl {
 
         OSUserExecutor.executePendingRequests()
         OSOperationRepo.sharedInstance.paused = false
-        updateSession(sessionCount: 1, sessionTime: nil, refreshDeviceMetadata: true)
+        updatePropertiesDeltas(property: "session_count", value: 1)
 
         // Fetch the user's data if there is a onesignal_id
         if let onesignalId = onesignalId {
@@ -571,37 +552,36 @@ extension OneSignalUserManagerImpl {
         }
     }
 
-    @objc
-    public func updateSession(sessionCount: NSNumber?, sessionTime: NSNumber?, refreshDeviceMetadata: Bool, sendImmediately: Bool = false, onSuccess: (() -> Void)? = nil, onFailure: (() -> Void)? = nil) {
-        guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: nil) else {
-            if let onFailure = onFailure {
-                onFailure()
-            }
+    /// This method accepts properties updates that not driven by model changes.
+    /// It enqueues an OSDelta to the Operation Repo.
+    /// 
+    /// - Parameter property:Expected inputs are `"session_time"`, `"session_count"`, and `"purchases"`.
+    func updatePropertiesDeltas(property: String, value: Any) {
+        guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "updatePropertiesDeltas") else {
             return
         }
 
         // Get the identity and properties model of the current user
         let identityModel = user.identityModel
         let propertiesModel = user.propertiesModel
-        let propertiesDeltas = OSPropertiesDeltas(sessionTime: sessionTime, sessionCount: sessionCount, amountSpent: nil, purchases: nil)
-
-        // propertyExecutor should exist as this should be called after `start()` has been called
-        if let propertyExecutor = self.propertyExecutor {
-            propertyExecutor.updateProperties(
-                propertiesDeltas: propertiesDeltas,
-                refreshDeviceMetadata: refreshDeviceMetadata,
-                propertiesModel: propertiesModel,
-                identityModel: identityModel,
-                sendImmediately: sendImmediately,
-                onSuccess: onSuccess,
-                onFailure: onFailure
-            )
-        } else {
-            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignalUserManagerImpl.updateSession with sessionCount: \(String(describing: sessionCount)) sessionTime: \(String(describing: sessionTime)) cannot be executed due to missing property executor.")
-            if let onFailure = onFailure {
-                onFailure()
-            }
+
+        let delta = OSDelta(
+            name: OS_UPDATE_PROPERTIES_DELTA,
+            identityModelId: identityModel.modelId,
+            model: propertiesModel,
+            property: property,
+            value: value
+        )
+        OSOperationRepo.sharedInstance.enqueueDelta(delta)
+    }
+
+    /// Time processors forward the session time to this method.
+    @objc
+    public func sendSessionTime(_ sessionTime: NSNumber) {
+        guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "sendSessionTime") else {
+            return
         }
+        updatePropertiesDeltas(property: "session_time", value: sessionTime.intValue)
     }
 
     /**