Merge pull request #148 from optimizely/removeFeatureToggleNote

(chore):remove feature toggle notification

Author: jaeopt

DemoSwiftApp/AppDelegate.swift

@@ -77,27 +77,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 print("Datafile changed")
             #endif
             }
-        })
-        
-        _ = optimizely?.notificationCenter.addFeatureFlagRolloutChangeListener(featureListener: { (featurekey, toggle) in
-            DispatchQueue.main.async {
-            #if os(iOS)
-                let alert = UIAlertView(title: "Feature flag \(featurekey) changed", message: "toggled to \(toggle)", delegate: nil, cancelButtonTitle: "cancel")
-                alert.show()
-            #else
-                print("Feature flag \(featurekey) changed toggled to \(toggle)")
-            #endif
-                if let controller = self.window?.rootViewController as? VariationViewController {
-                    //controller.showCoupon = toggle == FeatureFlagToggle.on ? true : false;
-                    if let showCoupon = try? self.optimizely?.isFeatureEnabled(featureKey: "show_coupon", userId: self.userId) {
-                        controller.showCoupon = showCoupon
-                    }
-
+            if let controller = self.window?.rootViewController as? VariationViewController {
+                //controller.showCoupon = toggle == FeatureFlagToggle.on ? true : false;
+                if let showCoupon = try? self.optimizely?.isFeatureEnabled(featureKey: "show_coupon", userId: self.userId) {
+                    controller.showCoupon = showCoupon
                 }
+                
             }
-
         })
-        
+
         _ = optimizely?.notificationCenter.addActivateNotificationListener(activateListener: { (experiment, userId, attributes, variation, event) in
             print("got activate notification")
         })

DemoSwiftApp/Customization/CustomNotificationCenter.swift

@@ -11,10 +11,6 @@ import Optimizely
 
 class CustomNotificationCenter: OPTNotificationCenter {
 
-    func addFeatureFlagRolloutChangeListener(featureListener: @escaping FeatureFlagRolloutChangeListener) -> Int? {
-        return nil
-    }
-    
     var notificationId: Int
 
     required init() {

OptimizelySDK/Implementation/DefaultNotificationCenter.swift

@@ -120,23 +120,6 @@ public class DefaultNotificationCenter : OPTNotificationCenter {
         return incrementNotificationId()
     }
 
-    public func addFeatureFlagRolloutChangeListener(featureListener: @escaping FeatureFlagRolloutChangeListener) -> Int? {
-        notificationListeners[notificationId] = (NotificationType.FeatureFlagRolloutToggle.rawValue,  { (args:Any...) in
-            guard let myArgs = args[0] as? [Any?] else {
-                return
-            }
-            if myArgs.count < 2 {
-                return
-            }
-            if let featureKey = myArgs[0] as? String, let toogle = myArgs[1] as? FeatureFlagToggle {
-                featureListener(featureKey, toogle)
-            }
-        })
-        
-        return incrementNotificationId()
-    }
-
-    
     public func removeNotificationListener(notificationId: Int) {
         self.notificationListeners.removeValue(forKey: notificationId)
     }

OptimizelySDK/Optimizely/OptimizelyManager.swift

@@ -153,7 +153,6 @@ open class OptimizelyManager: NSObject {
                     // new datafile came in...
                     self.reInitLock.wait(); defer { self.reInitLock.signal() }
                     if let config = try? ProjectConfig(datafile: data) {
-                        var featureToggleNotifications:[String:FeatureFlagToggle] = self.getFeatureFlagChanges(newConfig:config)
 
                         do {
                             self.config = config
@@ -170,9 +169,6 @@ open class OptimizelyManager: NSObject {
                         self.notificationCenter.sendNotifications(type:
                             NotificationType.DatafileChange.rawValue, args: [data])
 
-                        for notify in featureToggleNotifications.keys {
-                            self.notificationCenter.sendNotifications(type: NotificationType.FeatureFlagRolloutToggle.rawValue, args: [notify, featureToggleNotifications[notify]])
-                        }
                     }
                 }
 
@@ -187,26 +183,6 @@ open class OptimizelyManager: NSObject {
         }
      }
 
-    func getFeatureFlagChanges(newConfig:ProjectConfig) -> [String:FeatureFlagToggle] {
-        var featureToggleNotifications:[String:FeatureFlagToggle] =
-        [String:FeatureFlagToggle]()
-        
-        if let config = self.config, let featureFlags = config.project?.featureFlags {
-            for feature in featureFlags {
-                if let experiment = config.getRollout(id: feature.rolloutId)?.experiments.filter(
-                        {$0.layerId == feature.rolloutId}).first,
-                    let newExperiment = newConfig.getRollout(id: feature.rolloutId)?.experiments.filter(
-                        {$0.layerId == feature.rolloutId}).first,
-                    experiment.status != newExperiment.status {
-                    // call rollout change with status changed.
-                    featureToggleNotifications[feature.key] = newExperiment.status == .running ? FeatureFlagToggle.on : FeatureFlagToggle.off
-                }
-            }
-        }
-        
-        return featureToggleNotifications
-    }
-    
     func fetchDatafileBackground(completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
 
         // TODO: fix downloadDatafile to throw OptimizelyError

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/NotificationCenterTests.swift

@@ -65,11 +65,6 @@ class NotificationCenterTests: XCTestCase {
 
     }
 
-    func sendFeatureFlagToggle() {
-        notificationCenter.sendNotifications(type: NotificationType.FeatureFlagRolloutToggle.rawValue, args: ["featureFlagKey", FeatureFlagToggle.on])
-        
-    }
-
     func testNotificationCenterAddRemoveActivate() {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
@@ -206,40 +201,6 @@ class NotificationCenterTests: XCTestCase {
         XCTAssertTrue(called)
     }
 
-    func testNotificationCenterAddRemoveFeatureFlagChange() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-        var called = false
-        
-        let _ = notificationCenter.addFeatureFlagRolloutChangeListener { (featureKey, toggle) in
-            called = true
-        }
-        
-        notificationCenter.clearNotificationListeners(type: .FeatureFlagRolloutToggle)
-        
-        sendFeatureFlagToggle()
-        
-        XCTAssertFalse(called)
-        
-        let id = notificationCenter.addFeatureFlagRolloutChangeListener { (featureKey, toggle) in
-            called = true
-        }
-
-        notificationCenter.removeNotificationListener(notificationId: id!)
-        
-        sendFeatureFlagToggle()
-        
-        XCTAssertFalse(called)
-        
-        let _ = notificationCenter.addFeatureFlagRolloutChangeListener { (featureKey, toggle) in
-            called = true
-        }
-
-        sendFeatureFlagToggle()
-        
-        XCTAssertTrue(called)
-    }
-
     func testPerformanceExample() {
         // This is an example of a performance test case.
         self.measure {

OptimizelySDK/Protocols/OPTNotificationCenter.swift

@@ -21,15 +21,9 @@ public enum NotificationType : Int {
     case Activate = 1
     case Track
     case DatafileChange
-    case FeatureFlagRolloutToggle
     case Decision
 }
 
-public enum FeatureFlagToggle {
-    case on
-    case off
-}
-
 // TODO: fix this
 // - temporary public data types to avoid {OPTExperiment, OPTVariation}
 public typealias OptimizelyExperimentData = [String: Any]
@@ -46,8 +40,6 @@ public typealias DecisionListener = (_ type:String, _ userId:String, _ attribute
 
 public typealias DatafileChangeListener = (_ datafile:Data) -> Void
 
-public typealias FeatureFlagRolloutChangeListener = (_ featureFlagKey:String, _ toggle:FeatureFlagToggle ) -> Void
-
 public protocol OPTNotificationCenter {
     init()
 
@@ -89,13 +81,6 @@ func addDecisionNotificationListener(decisionListener:@escaping DecisionListener
  */
 func addDatafileChangeNotificationListener(datafileListener:@escaping DatafileChangeListener) -> Int?
 
-/**
- Add a feature flag rollout toggle listener.
- - Parameter featureListener: Notification to add.
- - Returns: the notification id used to remove the notification. It is greater than 0 on success.
- */
-func addFeatureFlagRolloutChangeListener(featureListener:@escaping FeatureFlagRolloutChangeListener) -> Int?
-
 /**
  Remove the notification listener based on the notificationId passed back from addNotification.
  - Parameter notificationId: the id passed back from add notification.