fix samples for optimizely-config-v2 (#428)

Author: jaeopt

DemoSwiftApp/AppDelegate.swift

@@ -20,18 +20,18 @@ import Optimizely
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
     let logLevel = OptimizelyLogLevel.debug
-
+    
     let sdkKey = "FCnSegiEkRry9rhVMroit4"
     let datafileName = "demoTestDatafile"
     let featureKey = "decide_demo"
     let experimentKey = "background_experiment_decide"
     let eventKey = "sample_conversion"
-
+    
     let userId = String(Int.random(in: 0..<100000))
     let attributes: [String: Any] = ["location": "NY",
                                      "bool_attr": false,
                                      "semanticVersioning": "1.2"]
-
+    
     var window: UIWindow?
     var optimizely: OptimizelyClient!
     var user: OptimizelyUserContext!
@@ -43,9 +43,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return UIStoryboard(name: "tvOSMain", bundle: nil)
         #endif
     }
-
+    
     func applicationDidFinishLaunching(_ application: UIApplication) {
-
+        
         // initialize SDK in one of these two ways:
         // (1) asynchronous SDK initialization (RECOMMENDED)
         //     - fetch a JSON datafile from the server
@@ -56,14 +56,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         initializeOptimizelySDKWithCustomization()
     }
-
+    
     // MARK: - Initialization Examples
-
+    
     func initializeOptimizelySDKAsynchronous() {
         optimizely = OptimizelyClient(sdkKey: sdkKey, defaultLogLevel: logLevel)
-
+        
         addNotificationListeners()
-
+        
         optimizely.start { result in
             switch result {
             case .failure(let error):
@@ -73,20 +73,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             @unknown default:
                 print("Optimizely SDK initiliazation failed with unknown result")
             }
-
+            
             self.startWithRootViewController()
         }
     }
-
+    
     func initializeOptimizelySDKSynchronous() {
         guard let localDatafilePath = Bundle.main.path(forResource: datafileName, ofType: "json") else {
             fatalError("Local datafile cannot be found")
         }
-
+        
         optimizely = OptimizelyClient(sdkKey: sdkKey, defaultLogLevel: logLevel)
 
         addNotificationListeners()
-
+        
         do {
             let datafileJSON = try String(contentsOfFile: localDatafilePath, encoding: .utf8)
             try optimizely.start(datafile: datafileJSON)
@@ -95,29 +95,29 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         } catch {
             print("Optimizely SDK initiliazation failed: \(error)")
         }
-
+        
         startWithRootViewController()
     }
-
+    
     func initializeOptimizelySDKWithCustomization() {
         // customization example (optional)
-
+        
         // You can enable background datafile polling by setting periodicDownloadInterval (polling is disabled by default)
         // 60 sec interval may be too frequent. This is for demo purpose. (You can set this to nil to use the recommended value of 600 secs).
         let downloadIntervalInSecs: Int? = 60
-
+        
         // You can turn off event batching with 0 timerInterval (this means that events are sent out immediately to the server instead of saving in the local queue for batching)
         let eventDispatcher = DefaultEventDispatcher(timerInterval: 0)
-
+        
         // customize logger
         let customLogger = CustomLogger()
 
         optimizely = OptimizelyClient(sdkKey: sdkKey,
-                                       logger: customLogger,
-                                       eventDispatcher: eventDispatcher,
-                                       periodicDownloadInterval: downloadIntervalInSecs,
-                                       defaultLogLevel: logLevel)
-    
+                                      logger: customLogger,
+                                      eventDispatcher: eventDispatcher,
+                                      periodicDownloadInterval: downloadIntervalInSecs,
+                                      defaultLogLevel: logLevel)
+        
         addNotificationListeners()
 
         // initialize SDK
@@ -141,15 +141,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func addNotificationListeners() {
         // notification listeners
         let notificationCenter = optimizely.notificationCenter!
-            
+        
         _ = notificationCenter.addDecisionNotificationListener(decisionListener: { (type, userId, attributes, decisionInfo) in
             print("Received decision notification: \(type) \(userId) \(String(describing: attributes)) \(decisionInfo)")
         })
 
         _ = notificationCenter.addTrackNotificationListener(trackListener: { (eventKey, userId, attributes, eventTags, event) in
             print("Received track notification: \(eventKey) \(userId) \(String(describing: attributes)) \(String(describing: eventTags)) \(event)")
         })
-
+        
         _ = notificationCenter.addDatafileChangeNotificationListener(datafileListener: { _ in
             DispatchQueue.main.async {
                 #if os(iOS)
@@ -161,7 +161,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 #else
                 print("Datafile changed")
                 #endif
-
+                
                 if let controller = self.window?.rootViewController as? VariationViewController {
                     let decision = self.user.decide(key: "show_coupon")
                     controller.showCoupon = decision.enabled
@@ -177,9 +177,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             print("Received logEvent notification: \(url) \(event)")
         })
     }
-
+    
     // MARK: - ViewControl
-
+    
     func startWithRootViewController() {
         DispatchQueue.main.async {
             self.user = self.optimizely.createUserContext(userId: self.userId,
@@ -194,49 +194,49 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
     }
-
+    
     func openVariationView(variationKey: String?) {
         if let variationViewController = storyboard.instantiateViewController(withIdentifier: "VariationViewController")
             as? VariationViewController {
-
+            
             let decision = self.user.decide(key: "show_coupon")
             variationViewController.showCoupon = decision.enabled
-
+            
             variationViewController.optimizely = optimizely
             variationViewController.userId = userId
             variationViewController.variationKey = variationKey
             variationViewController.eventKey = eventKey
-
+            
             window?.rootViewController = variationViewController
         }
     }
-
+    
     func openFailureView() {
         window?.rootViewController = storyboard.instantiateViewController(withIdentifier: "FailureViewController")
     }
-
+    
     // MARK: - AppDelegate
-
+    
     func applicationWillResignActive(_ application: UIApplication) {
     }
-
+    
     func applicationDidEnterBackground(_ application: UIApplication) {
     }
-
+    
     func applicationWillEnterForeground(_ application: UIApplication) {
     }
-
+    
     func applicationDidBecomeActive(_ application: UIApplication) {
     }
-
+    
     func applicationWillTerminate(_ application: UIApplication) {
     }
-
+    
     func application(_ application: UIApplication,
                      performFetchWithCompletionHandler completionHandler: (UIBackgroundFetchResult) -> Void) {
-
+        
         // add background fetch task here
-
+        
         completionHandler(.newData)
     }
 }

DemoSwiftApp/Samples/SamplesForAPI.swift

@@ -158,40 +158,10 @@ class SamplesForAPI {
             print("[OptimizelyConfig]   -- (id, key, experimentIds) = (\(event.id), \(event.key), \(event.experimentIds))")
         }
 
-        //let experiments = optConfig.experimentsMap.values
-        let experimentKeys = optConfig.experimentsMap.keys
-        print("[OptimizelyConfig] all experiment keys = \(experimentKeys)")
-
         //let features = optConfig.featureFlagsMap.values
         let featureKeys = optConfig.featuresMap.keys
         print("[OptimizelyConfig] all feature keys = \(featureKeys)")
 
-        // enumerate all experiments (variations, and associated variables)
-        
-        experimentKeys.forEach { expKey in
-            print("[OptimizelyConfig] experimentKey = \(expKey)")
-            
-            let experiment = optConfig.experimentsMap[expKey]!
-            
-            let variationsMap = experiment.variationsMap
-            let variationKeys = variationsMap.keys
-            
-            variationKeys.forEach { varKey in
-                print("[OptimizelyConfig]   - variationKey = \(varKey)")
-                
-                let variation = variationsMap[varKey]!
-                
-                let variablesMap = variation.variablesMap
-                let variableKeys = variablesMap.keys
-                
-                variableKeys.forEach { variableKey in
-                    let variable = variablesMap[variableKey]!
-                    
-                    print("[OptimizelyConfig]       -- variable: \(variableKey), \(variable)")
-                }
-            }
-        }
-        
         // enumerate all features (experiments, variations, and assocated variables)
 
         featureKeys.forEach { featKey in
@@ -201,13 +171,14 @@ class SamplesForAPI {
 
             let feature = optConfig.featuresMap[featKey]!
 
-            let experimentsMap = feature.experimentsMap
-            let experimentKeys = experimentsMap.keys
+            let experimentRules = feature.experimentRules
+            let deliveryRules = feature.deliveryRules
 
-            experimentKeys.forEach { expKey in
-                print("[OptimizelyConfig]   - experimentKey = \(expKey)")
-                
-                let variationsMap = experimentsMap[expKey]!.variationsMap
+            experimentRules.forEach { experiment in
+                print("[OptimizelyConfig]   - experiment rule-key = \(experiment.key)")
+                print("[OptimizelyConfig]   - experiment audiences = \(experiment.audiences)")
+
+                let variationsMap = experiment.variationsMap
                 let variationKeys = variationsMap.keys
 
                 variationKeys.forEach { varKey in
@@ -225,6 +196,13 @@ class SamplesForAPI {
                 }
             }
 
+            deliveryRules.forEach { delivery in
+                print("[OptimizelyConfig]   - delivery rule-key = \(delivery.key)")
+                print("[OptimizelyConfig]   - delivery audiences = \(delivery.audiences)")
+
+                // use delivery rule data here...
+            }
+            
             // enumerate all feature-variables
 
             let variablesMap = optConfig.featuresMap[featKey]!.variablesMap

Sources/Optimizely/OptimizelyConfig.swift

@@ -20,8 +20,8 @@ import Foundation
 
 public protocol OptimizelyConfig {
     var environmentKey: String { get }
-    var revision: String { get }
     var sdkKey: String { get }
+    var revision: String { get }
     var experimentsMap: [String: OptimizelyExperiment] { get }
     var featuresMap: [String: OptimizelyFeature] { get }
     var attributes: [OptimizelyAttribute] { get }
@@ -82,8 +82,8 @@ public protocol OptimizelyEvent {
 
 struct OptimizelyConfigImp: OptimizelyConfig {
     var environmentKey: String = ""
-    var revision: String = ""
     var sdkKey: String = ""
+    var revision: String = ""
     var experimentsMap: [String: OptimizelyExperiment] = [:]
     var featuresMap: [String: OptimizelyFeature] = [:]
     var attributes: [OptimizelyAttribute] = []