Adding model hydration

Models should take a [string : any] not [string : string]

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift

@@ -63,14 +63,14 @@ open class OSModel: NSObject, NSCoding {
     /**
      This function receives a server response and updates the model's properties.
      */
-    public func hydrate(_ response: [String: String]) {
+    public func hydrate(_ response: [String: Any]) {
         // TODO: Thread safety when processing server responses to hydrate models.
         self.hydrating = true
         hydrateModel(response) // Calls model-specific hydration logic
         self.hydrating = false
     }
 
-    open func hydrateModel(_ response: [String: String]) {
+    open func hydrateModel(_ response: [String: Any]) {
         // Log as an error.
         print("Error: Function must be overridden.")
         fatalError("hydrateModel(response:) has not been implemented")

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift

@@ -85,12 +85,17 @@ class OSIdentityModel: OSModel {
         self.set(property: "aliases", newValue: aliasesToSend)
     }
 
-    public override func hydrateModel(_ response: [String: String]) {
+    public override func hydrateModel(_ response: [String: Any]) {
         print("🔥 OSIdentityModel hydrateModel()")
         // TODO: Update Model properties with the response
         for property in response {
-            if property.key != "external_id" && property.key != "onesignal_id" {
-                aliases[property.key] = property.value
+            switch property.key {
+            case "external_id":
+                aliases[OS_EXTERNAL_ID] = property.value as? String
+            case "onesignal_id":
+                aliases[OS_ONESIGNAL_ID] = property.value as? String
+            default:
+                aliases[property.key] = property.value as? String
             }
         }
     }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift

@@ -109,7 +109,7 @@ class OSPropertiesModel: OSModel {
         self.set(property: "aliases", newValue: tagsToSend)
     }
 
-    public override func hydrateModel(_ response: [String: String]) {
+    public override func hydrateModel(_ response: [String: Any]) {
         // TODO: Update Model properties with the response
     }
 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift

@@ -213,9 +213,32 @@ class OSSubscriptionModel: OSModel {
         super.init(coder: coder)
     }
 
-    public override func hydrateModel(_ response: [String: String]) {
+    public override func hydrateModel(_ response: [String: Any]) {
         print("🔥 OSSubscriptionModel hydrateModel()")
-        // TODO: Update Model properties with the response
+        for property in response {
+            switch property.key {
+            case "id":
+                self.subscriptionId = property.value as? String
+            case "type":
+                if let type = OSSubscriptionType(rawValue: property.value as? String ?? "") {
+                    self.type = type
+                }
+            case "token":
+                self.address = property.value as? String
+            case "enabled":
+                if let enabled = property.value as? Bool {
+                    if self.enabled != enabled {
+                        _isDisabled = enabled
+                    }
+                }
+            case "notification_types":
+                if let notificationTypes = property.value as? Int {
+                    self.notificationTypes = notificationTypes
+                }
+            default:
+                OneSignalLog.onesignalLog(.LL_ERROR, message: "Unknown property on subscription model")
+            }
+        }
     }
 }