Add device type to the outcome event request

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsBackendService.kt

@@ -15,8 +15,9 @@ internal interface IOutcomeEventsBackendService {
      * @param appId The ID of the application this outcome event occurred under.
      * @param userId The OneSignal user ID that is active during the outcome event.
      * @param subscriptionId The subscription ID that is active during the outcome event.
+     * @param deviceType The type of device that the outcome event occurred on.
      * @param direct Whether this outcome event is direct. `true` if it is, `false` if it isn't, `null` if should not be specified.
      * @param event The outcome event to send up.
      */
-    suspend fun sendOutcomeEvent(appId: String, userId: String, subscriptionId: String, direct: Boolean?, event: OutcomeEvent)
+    suspend fun sendOutcomeEvent(appId: String, userId: String, subscriptionId: String, deviceType: String, direct: Boolean?, event: OutcomeEvent)
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsBackendService.kt

@@ -7,14 +7,15 @@ import org.json.JSONObject
 internal class OutcomeEventsBackendService(private val _http: IHttpClient) :
     IOutcomeEventsBackendService {
 
-    override suspend fun sendOutcomeEvent(appId: String, userId: String, subscriptionId: String, direct: Boolean?, event: OutcomeEvent) {
+    override suspend fun sendOutcomeEvent(appId: String, userId: String, subscriptionId: String, deviceType: String, direct: Boolean?, event: OutcomeEvent) {
         val jsonObject = JSONObject()
             .put("app_id", appId)
             .put("onesignal_id", userId)
             .put(
                 "subscription",
                 JSONObject()
-                    .put("id", subscriptionId),
+                    .put("id", subscriptionId)
+                    .put("type", deviceType)
             )
 
         if (direct != null) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt

@@ -4,6 +4,7 @@ import android.os.Process
 import com.onesignal.common.exceptions.BackendException
 import com.onesignal.common.threading.suspendifyOnThread
 import com.onesignal.core.internal.config.ConfigModelStore
+import com.onesignal.core.internal.device.IDeviceService
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.core.internal.time.ITime
 import com.onesignal.debug.internal.logging.Logging
@@ -14,6 +15,7 @@ import com.onesignal.session.internal.influence.InfluenceType
 import com.onesignal.session.internal.outcomes.IOutcomeEventsController
 import com.onesignal.session.internal.session.ISessionLifecycleHandler
 import com.onesignal.session.internal.session.ISessionService
+import com.onesignal.user.internal.backend.SubscriptionObjectType
 import com.onesignal.user.internal.identity.IdentityModelStore
 import com.onesignal.user.internal.subscriptions.ISubscriptionManager
 
@@ -26,6 +28,7 @@ internal class OutcomeEventsController(
     private val _configModelStore: ConfigModelStore,
     private val _identityModelStore: IdentityModelStore,
     private val _subscriptionManager: ISubscriptionManager,
+    private val _deviceService: IDeviceService,
     private val _time: ITime,
 ) : IOutcomeEventsController, IStartableService, ISessionLifecycleHandler {
     // Keeps track of unique outcome events sent for UNATTRIBUTED sessions on a per session level
@@ -267,10 +270,11 @@ Outcome event was cached and will be reattempted on app cold start""",
     private suspend fun requestMeasureOutcomeEvent(eventParams: OutcomeEventParams) {
         val appId: String = _configModelStore.model.appId
         val subscriptionId = _subscriptionManager.subscriptions.push.id
+        val deviceType = SubscriptionObjectType.fromDeviceType(_deviceService.deviceType).value
 
         // if we don't have a subscription ID yet, throw an exception. The outcome will be saved and processed
         // later, when we do have a subscription ID.
-        if (subscriptionId.isEmpty()) {
+        if (subscriptionId.isEmpty() || deviceType.isEmpty()) {
             throw BackendException(0)
         }
 
@@ -282,6 +286,6 @@ Outcome event was cached and will be reattempted on app cold start""",
             else -> null
         }
 
-        _outcomeEventsBackend.sendOutcomeEvent(appId, _identityModelStore.model.onesignalId, subscriptionId, direct, event)
+        _outcomeEventsBackend.sendOutcomeEvent(appId, _identityModelStore.model.onesignalId, subscriptionId, deviceType, direct, event)
     }
 }