Adding properties model hydration

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift

@@ -87,7 +87,6 @@ class OSIdentityModel: OSModel {
 
     public override func hydrateModel(_ response: [String: Any]) {
         print("🔥 OSIdentityModel hydrateModel()")
-        // TODO: Update Model properties with the response
         for property in response {
             switch property.key {
             case "external_id":

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift

@@ -27,6 +27,7 @@
 
 import Foundation
 import OneSignalOSCore
+import OneSignalCore
 
 struct OSPropertiesDeltas {
     let sessionTime: NSNumber?
@@ -110,6 +111,15 @@ class OSPropertiesModel: OSModel {
     }
 
     public override func hydrateModel(_ response: [String: Any]) {
-        // TODO: Update Model properties with the response
+        for property in response {
+            switch property.key {
+            case "language":
+                self.language = property.value as? String
+            case "tags":
+                self.tags = property.value as? [String : String] ?? [:]
+            default:
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "Not hydrating properties model for property: \(property)")
+            }
+        }
     }
 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift

@@ -106,16 +106,12 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
         }
         print("🔥 OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
         OneSignalClient.shared().execute(request) { result in
-            // Mock a response
-            let response = ["language": "en"]
 
             // On success, remove request from cache, and hydrate model
             // For example, if app restarts and we read in operations between sending this off and getting the response
             self.requestQueue.removeAll(where: { $0 == request})
             OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
 
-            request.modelToUpdate.hydrate(response)
-
         } onFailure: { error in
             // On failure, retry logic, but order of operations matters
         }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift

@@ -61,12 +61,12 @@ class OSUserExecutor {
         }
     }
 
-    static func parseCreateUserResponse(response: [AnyHashable:Any], request: OSRequestCreateUser) {
+    static func parseFetchUserResponse(response: [AnyHashable:Any], identityModel: OSIdentityModel) {
         // On success, check if the current user is the same as the one in the request
         // If user has changed, don't hydrate, except for push subscription
         let modelInStore = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(key: OS_IDENTITY_MODEL_KEY)
 
-        guard modelInStore?.modelId == request.identityModel.modelId else {
+        guard modelInStore?.modelId == identityModel.modelId else {
             return
         }
         if let identityObject = parseIdentityObjectResponse(response) {
@@ -111,7 +111,7 @@ class OSUserExecutor {
         }
         OneSignalClient.shared().execute(request) { response in
             if let response = response {
-                parseCreateUserResponse(response: response, request: request)
+                parseFetchUserResponse(response: response, identityModel: request.identityModel)
             }
             executePendingRequests()
         } onFailure: { error in
@@ -198,8 +198,10 @@ class OSUserExecutor {
             return
         }
 
-        OneSignalClient.shared().execute(request) { _ in
-            // Hydrate (replace) models
+        OneSignalClient.shared().execute(request) { response in
+            if let response = response {
+                parseFetchUserResponse(response: response, identityModel: request.identityModel)
+            }
         } onFailure: { _ in
             // What?
         }