User profile feature.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYBuilder.h

@@ -47,6 +47,8 @@ typedef void (^OPTLYBuilderBlock)(OPTLYBuilder * _Nullable builder);
 /// User profile stores user-specific data, like bucketing.
 @property (nonatomic, strong, nullable) id<OPTLYUserProfile> userProfile;
 
+@property (nonatomic, strong, nullable) id<OPTLYUserProfile> userProfile;
+
 /// Create an Optimizely Builder object.
 + (nullable instancetype)builderWithBlock:(nonnull OPTLYBuilderBlock)block;
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.h

@@ -69,13 +69,6 @@ extern NSString *const OPTLYLoggerMessagesNoVariationFoundForExperimentWithLiveV
 // ---- debug ----
 extern NSString *const OPTLYLoggerMessagesBucketAssigned;
 
-// ---- User Profile ----
-// Debug
-extern NSString *const OPTLYLoggerMessagesUserProfileVariation;
-extern NSString *const OPTLYLoggerMessagesUserProfileNoVariation;
-extern NSString *const OPTLYLoggerMessagesUserProfileRemoveVariation;
-extern NSString *const OPTLYLoggerMessagesUserProfileRemoveVariationNotFound;
-
 // ---- Event Dispatcher ----
 // info
 extern NSString *const OPTLYLoggerMessagesConversionSuccess;
@@ -128,6 +121,13 @@ extern NSString *const OPTLYLoggerMessagesDataStoreDatabaseGetTVOSWarning;
 extern NSString *const OPTLYLoggerMessagesDataStoreDatabaseGetNumberEventsTVOSWarning;
 extern NSString *const OPTLYLoggerMessagesDataStoreDatabaseRemoveTVOSWarning;
 
+// ---- User Profile ----
+// Debug
+extern NSString *const OPTLYLoggerMessagesUserProfileVariation;
+extern NSString *const OPTLYLoggerMessagesUserProfileNoVariation;
+extern NSString *const OPTLYLoggerMessagesUserProfileRemoveVariation;
+extern NSString *const OPTLYLoggerMessagesUserProfileRemoveVariationNotFound;
+
 @interface OPTLYLoggerMessages : NSObject
 
 @end

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.m

@@ -128,7 +128,12 @@
 NSString *const OPTLYLoggerMessagesDataStoreDatabaseGetNumberEventsTVOSWarning = @"[DATABASE] tvOS can only get number of events from cache. eventType: %ld.";
 NSString *const OPTLYLoggerMessagesDataStoreDatabaseRemoveTVOSWarning = @"[DATABASE] tvOS can only remove data from cache> Number of events: %ld, eventType: %ld.";
 
-
+// ---- User Profile ----
+// Debug
+NSString *const OPTLYLoggerMessagesUserProfileVariation = @"Variation %@ for user %@, experiment %@ found.";
+NSString *const OPTLYLoggerMessagesUserProfileNoVariation = @"Variation for user %@, experiment %@ not found.";
+NSString *const OPTLYLoggerMessagesUserProfileRemoveVariation = @"Removed variation %@ for user %@, experiment %@.";
+NSString *const OPTLYLoggerMessagesUserProfileRemoveVariationNotFound = @"Not removing variation for user %@, experiment %@. Variation not found.";
 
 @implementation OPTLYLoggerMessages
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h

@@ -17,13 +17,8 @@
 #import <Foundation/Foundation.h>
 #import <JSONModel/JSONModelLib.h>
 
-<<<<<<< HEAD
 @class OPTLYAttribute, OPTLYAudience, OPTLYBucketer, OPTLYEvent, OPTLYExperiment, OPTLYGroup, OPTLYVariation, OPTLYVariable;
 @protocol OPTLYAttribute, OPTLYAudience, OPTLYBucketer, OPTLYErrorHandler, OPTLYEvent, OPTLYExperiment, OPTLYGroup, OPTLYLogger, OPTLYUserProfile, OPTLYVariable, OPTLYVariation;
-=======
-@class OPTLYExperiment, OPTLYGroup, OPTLYEvent, OPTLYAttribute, OPTLYAudience, OPTLYVariation, OPTLYVariable, OPTLYBucketer;
-@protocol OPTLYExperiment, OPTLYEvent, OPTLYAudience, OPTLYAttribute, OPTLYGroup, OPTLYVariable, OPTLYLogger, OPTLYErrorHandler, OPTLYBucketer;
->>>>>>> Introduce live variable class and getters (#35)
 
 /*
     This class represents all the data contained in the project datafile 
@@ -69,7 +64,6 @@
                                withLogger:(nullable id<OPTLYLogger>)logger
                          withErrorHandler:(nullable id<OPTLYErrorHandler>)errorHandler
                           withUserProfile:(nullable id<OPTLYUserProfile>)userProfile;
-
 /**
  * Get an Experiment object for a key.
  */

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -30,9 +30,12 @@
 #import "OPTLYUserProfile.h"
 #import "OPTLYVariable.h"
 #import "OPTLYUserProfile.h"
+<<<<<<< HEAD
 =======
 #import "OPTLYVariable.h"
 >>>>>>> Introduce live variable class and getters (#35)
+=======
+>>>>>>> User profile feature.
 
 NSString * const kClientEngine             = @"objective-c-sdk-core";
 
@@ -90,6 +93,7 @@ - (nullable instancetype)initWithDatafile:(nullable NSData *)datafile
 
     if (userProfile) {
         if ([OPTLYUserProfile conformsToOPTLYUserProfileProtocol:[userProfile class]]) {
+<<<<<<< HEAD
             _userProfile = (id<OPTLYUserProfile, Ignore>)userProfile;
         } else {
             NSError *error = [NSError errorWithDomain:OPTLYErrorHandlerMessagesDomain
@@ -101,6 +105,11 @@ - (nullable instancetype)initWithDatafile:(nullable NSData *)datafile
             NSString *logMessage = OPTLYErrorHandlerMessagesUserProfileInvalid;
             [_logger logMessage:logMessage withLevel:OptimizelyLogLevelError];
         }
+=======
+            _userProfile = userProfile;
+        }
+        // TODO - log error
+>>>>>>> User profile feature.
     }
 
     OPTLYProjectConfig* projectConfig = nil;

OptimizelySDKUserProfile/OptimizelySDKUserProfileTests/OptimizelySDKUserProfileTests.m

@@ -48,9 +48,13 @@ - (void)setUp {
     }];
     [self.userProfile save:kUserId1 experiment:kExperimentKey1 variation:kVariationKey1];
     [self.userProfile save:kUserId2 experiment:kExperimentKey2 variation:kVariationKey2];
+<<<<<<< HEAD
     [self.userProfile save:kUserId3 experiment:kExperimentKey3a variation:kVariationKey3a];
     [self.userProfile save:kUserId3 experiment:kExperimentKey3b variation:kVariationKey3b];
     [self.userProfile save:kUserId3 experiment:kExperimentKey3c variation:kVariationKey3c];
+=======
+    [self.userProfile save:kUserId3 experiment:kExperimentKey3 variation:kVariationKey3];
+>>>>>>> User profile feature.
     [super setUp];
 }
 
@@ -65,7 +69,11 @@ - (void)testUserProfileInitWithBuilderBlock
     XCTAssert([self.userProfile.logger isKindOfClass:[OPTLYLoggerDefault class]]);
 }
 
+<<<<<<< HEAD
 - (void)testSaveUserData
+=======
+- (void)testSave
+>>>>>>> User profile feature.
 {
     NSDictionary *userData = [self.userProfile.dataStore getUserDataForType:OPTLYDataStoreDataTypeUserProfile];
     NSArray *users = [userData allKeys];
@@ -108,6 +116,7 @@ - (void)testGetVariation
 
     NSString *variationKey3c = [self.userProfile getVariationFor:kUserId3 experiment:kExperimentKey3c];
     XCTAssert([variationKey3c isEqualToString:kVariationKey3c], @"Invalid variation for userId 3c for getVariation.");
+
 }
 
 - (void)testRemoveVariation
@@ -121,6 +130,7 @@ - (void)testRemoveVariation
     XCTAssertNotNil(variationKey2, @"Variation for userId 1 should not have been removed.");
 
     [self.userProfile remove:kUserId3 experiment:kExperimentKey2];
+
     NSString *variationKey3a = [self.userProfile getVariationFor:kUserId3 experiment:kExperimentKey3a];
     XCTAssertNotNil(variationKey3a, @"Variation for userId 3a should not have been removed.");