add hydrating check when a model is added to store

* Motivation: hydrating subscriptions can create a model and add to store if it doesn't exist locally. Guard against hydrating here as well so that a request isn't extraneously created.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift

@@ -71,7 +71,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
         return self.models
     }
 
-    public func add(id: String, model: TModel) {
+    public func add(id: String, model: TModel, hydrating: Bool) {
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore add() called with model \(model)")
         // TODO: Check if we are adding the same model? Do we replace?
             // For example, calling addEmail multiple times with the same email
@@ -82,7 +82,11 @@ open class OSModelStore<TModel: OSModel>: NSObject {
 
         // listen for changes to this model
         model.changeNotifier.subscribe(self)
-
+        
+        guard !hydrating else {
+            return
+        }
+        
         self.changeSubscription.fire { modelStoreListener in
             modelStoreListener.onAdded(model)
         }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift

@@ -113,14 +113,13 @@ class OSUserExecutor {
 
                     } else {
                         // This subscription does not exist in the store, add
-                        // TODO: This creates a Delta and sends a request when it should be hydrating
                         OneSignalUserManagerImpl.sharedInstance.subscriptionModelStore.add(id: address, model: OSSubscriptionModel(
                             type: type,
                             address: subModel["token"] as? String,
                             subscriptionId: subModel["id"] as? String,
                             accepted: true,
                             isDisabled: false,
-                            changeNotifier: OSEventProducer())
+                            changeNotifier: OSEventProducer()), hydrating: true
                         )
                     }
                 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -334,18 +334,18 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         }
 
         let identityModel = OSIdentityModel(aliases: aliases, changeNotifier: OSEventProducer())
-        self.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: identityModel)
+        self.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: identityModel, hydrating: false)
 
         let propertiesModel = OSPropertiesModel(changeNotifier: OSEventProducer())
-        self.propertiesModelStore.add(id: OS_PROPERTIES_MODEL_KEY, model: propertiesModel)
+        self.propertiesModelStore.add(id: OS_PROPERTIES_MODEL_KEY, model: propertiesModel, hydrating: false)
 
         // TODO: We will have to save subscription_id and push_token to user defaults when we get them
 
         let pushSubscription = pushSubscriptionModel ?? createDefaultPushSubscription()
 
         // Add pushSubscription to store if not present
         if (!pushSubscriptionModelStore.getModels().keys.contains(OS_PUSH_SUBSCRIPTION_MODEL_KEY)) {
-            pushSubscriptionModelStore.add(id: OS_PUSH_SUBSCRIPTION_MODEL_KEY, model: pushSubscription)
+            pushSubscriptionModelStore.add(id: OS_PUSH_SUBSCRIPTION_MODEL_KEY, model: pushSubscription, hydrating: false)
         }
 
         _user = OSUserInternalImpl(identityModel: identityModel, propertiesModel: propertiesModel, pushSubscriptionModel: pushSubscription)
@@ -558,7 +558,7 @@ extension OneSignalUserManagerImpl: OSUser {
             isDisabled: false,
             changeNotifier: OSEventProducer()
         )
-        self.subscriptionModelStore.add(id: email, model: model)
+        self.subscriptionModelStore.add(id: email, model: model, hydrating: false)
     }
 
     /**
@@ -590,7 +590,7 @@ extension OneSignalUserManagerImpl: OSUser {
             isDisabled: false,
             changeNotifier: OSEventProducer()
         )
-        self.subscriptionModelStore.add(id: number, model: model)
+        self.subscriptionModelStore.add(id: number, model: model, hydrating: false)
     }
 
     /**