Fixed a bug in getting the sticky bucketing values -- used wrong variation getter.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYBucketer.m

@@ -69,9 +69,8 @@ - (OPTLYVariation *)bucketExperiment:(OPTLYExperiment *)experiment
 
     NSString *stickyBucketingVariationKey = [self.config.userProfile getVariationFor:userId experiment:experiment.experimentKey];
     if ([stickyBucketingVariationKey length] > 0) {
-        OPTLYVariation *stickyBucketingVariation = [self.config getVariationForVariationKey:stickyBucketingVariationKey];
+        OPTLYVariation *stickyBucketingVariation = [experiment getVariationForVariationKey:stickyBucketingVariationKey];
         if (stickyBucketingVariation) {
-            
             NSString *logMessage =  [NSString stringWithFormat:OPTLYLoggerMessagesBucketerUserDataRetrieved, userId, experiment.experimentKey, stickyBucketingVariation.variationKey];
             [self.config.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h

@@ -52,7 +52,6 @@
 
 /// a comprehensive list of experiments that includes experiments being whitelisted (in Groups)
 @property (nonatomic, strong, nullable) NSArray<OPTLYExperiment, Ignore> *allExperiments;
-@property (nonatomic, strong, nullable) NSArray<OPTLYVariation, Ignore> *allVariations;
 @property (nonatomic, strong, nullable) id<OPTLYLogger, Ignore> logger;
 @property (nonatomic, strong, nullable) id<OPTLYErrorHandler, Ignore> errorHandler;
 @property (nonatomic, strong, nullable) id<OPTLYUserProfile, Ignore> userProfile;
@@ -119,10 +118,6 @@
                                                 userId:(nonnull NSString *)userId
                                             attributes:(nullable NSDictionary<NSString *,NSString *> *)attributes
                                               bucketer:(nullable id<OPTLYBucketer>)bucketer;
-/**
- * Get variation for given variation key.
- */
-- (nullable OPTLYVariation *)getVariationForVariationKey:(nonnull NSString *)variationKey;
 
 /*
  * Returns the client type (e.g., objective-c-sdk-core, objective-c-sdk-iOS, objective-c-sdk-tvOS)

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -223,19 +223,6 @@ - (OPTLYVariable *)getVariableForVariableKey:(NSString *)variableKey {
     return variable;
 }
 
-- (OPTLYVariation *)getVariationForVariationKey:(NSString *)variationKey {
-    NSArray *allVariations = [self allVariations];
-    for (OPTLYVariation *variation in allVariations) {
-        if ([variation.variationKey isEqualToString:variationKey]) {
-            return variation;
-        }
-    }
-    
-    NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesVariationUnknownForVariationKey, variationKey];
-    [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelWarning];
-    return nil;
-}
-
 #pragma mark -- Property Getters --
 
 - (NSArray *)allExperiments
@@ -252,18 +239,6 @@ - (NSArray *)allExperiments
     return _allExperiments;
 }
 
-- (NSArray *)allVariations
-{
-    if (!_allVariations) {
-        NSMutableArray *all = [NSMutableArray new];
-        for (OPTLYExperiment *experiment in [self allExperiments]) {
-            [all addObject:experiment.variations];
-        }
-        _allVariations = [all copy];
-    }
-    return _allVariations;
-}
-
 - (NSDictionary *)audienceIdToAudienceMap
 {
     if (!_audienceIdToAudienceMap) {

OptimizelySDKUserProfile/OptimizelySDKUserProfile/OPTLYUserProfile.h

@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import "OPTLYUserProfileBuilder.h"
 #import <OptimizelySDKCore/OPTLYUserProfile.h>
+#import "OPTLYUserProfileBuilder.h"
 
 @protocol OPTLYLogger;
 

OptimizelyiOSDemoApp/OptimizelyiOSDemoApp/AppDelegate.swift

@@ -33,7 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var attributes = ["browser_type" : "firefox"]
     var eventKey = "testEventWithAudiences"
     var experimentKey = "testExperimentWithFirefoxAudience" // experiment ID: 6383811281
-    let downloadDatafile = true
+    let downloadDatafile = false
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
@@ -107,6 +107,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 optimizely = (Optimizely.initWithBuilderBlock({(builder)in
                     builder!.datafile = jsonData
                     builder!.eventDispatcher = eventDispatcher
+                    builder!.userProfile = OPTLYUserProfile.init()
                 }))
             } catch {
                 print("invalid json data")
@@ -135,6 +136,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             let optimizely : Optimizely? = (Optimizely.initWithBuilderBlock({(builder)in
                 builder!.datafile = data;
                 builder!.eventDispatcher = eventDispatcher;
+                builder!.userProfile = OPTLYUserProfile.init()
             }));
 
             completionHandler(optimizely)