Add properties to Subscription Model

* Fill out the rest of the properties on a push subscription model like the `app_version` and `net_type`
* I chose to omit `rooted` and `carrier` in this PR as rooted doesn't appear to be sent to the server for iOS devices and Apple methods to retrieve carrier are being deprecated.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift

@@ -191,6 +191,8 @@ class OSSubscriptionModel: OSModel {
     let deviceOs = UIDevice.current.systemVersion
     let sdk = ONESIGNAL_VERSION
     let deviceModel: String? = OSDeviceUtils.getDeviceVariant()
+    let appVersion: String? = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+    let netType: Int? = OSNetworkingUtils.getNetType() as? Int
 
     // When a Subscription is initialized, it may not have a subscriptionId until a request to the backend is made.
     init(type: OSSubscriptionType,
@@ -231,6 +233,7 @@ class OSSubscriptionModel: OSModel {
         coder.encode(_accepted, forKey: "_accepted")
         coder.encode(_isDisabled, forKey: "_isDisabled")
         coder.encode(notificationTypes, forKey: "notificationTypes")
+        coder.encode(testType, forKey: "testType")
     }
 
     required init?(coder: NSCoder) {
@@ -247,6 +250,7 @@ class OSSubscriptionModel: OSModel {
         self._accepted = coder.decodeBool(forKey: "_accepted")
         self._isDisabled = coder.decodeBool(forKey: "_isDisabled")
         self.notificationTypes = coder.decodeInteger(forKey: "notificationTypes")
+        self.testType = coder.decodeObject(forKey: "testType") as? Int
         super.init(coder: coder)
     }
 

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift

@@ -331,12 +331,12 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         pushSubscriptionObject["type"] = pushSubscriptionModel.type.rawValue
         pushSubscriptionObject["token"] = pushSubscriptionModel.address
         pushSubscriptionObject["enabled"] = pushSubscriptionModel.enabled
-
         pushSubscriptionObject["test_type"] = pushSubscriptionModel.testType
         pushSubscriptionObject["device_os"] = pushSubscriptionModel.deviceOs
         pushSubscriptionObject["sdk"] = pushSubscriptionModel.sdk
         pushSubscriptionObject["device_model"] = pushSubscriptionModel.deviceModel
-
+        pushSubscriptionObject["app_version"] = pushSubscriptionModel.appVersion
+        pushSubscriptionObject["net_type"] = pushSubscriptionModel.netType
         // notificationTypes defaults to -1 instead of nil, don't send if it's -1
         if pushSubscriptionModel.notificationTypes != -1 {
             pushSubscriptionObject["notification_types"] = pushSubscriptionModel.notificationTypes