Revert "(chore): cleanup" (#177)

thomaszurkan-optimizely · web-flow · commit fab03861936b · 2019-05-08T12:28:50.000-07:00
* Revert "(chore): cleanup (#173)" This reverts commit 3a5a2e3. * just some cleanup from that we do want included * add better way of testing
diff --git a/DemoSwiftApp/AppDelegate.swift b/DemoSwiftApp/AppDelegate.swift
@@ -51,7 +51,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         //     - initialize immediately with the given JSON datafile or its cached copy
         //     - no network delay, but the local copy is not guaranteed to be in sync with the server experiment settings
         
-        initializeOptimizelySDKWithCustomization()
+        initializeOptimizelySDKAsynchronous()
     }
     
     // MARK: - Initialization Examples
diff --git a/OptimizelySDK/Data Model/Audience/Audience.swift b/OptimizelySDK/Data Model/Audience/Audience.swift
@@ -63,7 +63,7 @@ struct Audience: Codable, Equatable {
         try container.encode(conditions, forKey: .conditions)
     }
     
-    func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {
+    func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {
         return try conditions.evaluate(project: project, attributes: attributes)
     }
 }
diff --git a/OptimizelySDK/Data Model/Audience/ConditionHolder.swift b/OptimizelySDK/Data Model/Audience/ConditionHolder.swift
@@ -61,7 +61,7 @@ enum ConditionHolder: Codable, Equatable {
         }
     }
     
-    func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {
+    func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {
         switch self {
         case .logicalOp:
             throw OptimizelyError.conditionInvalidFormat("Logical operation not evaluated")
@@ -77,7 +77,7 @@ enum ConditionHolder: Codable, Equatable {
 
 extension Array where Element == ConditionHolder {
     
-    func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {
+    func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {
         guard let firstItem = self.first else {
             throw OptimizelyError.conditionInvalidFormat("Empty condition array")
         }
@@ -94,7 +94,7 @@ extension Array where Element == ConditionHolder {
         }
     }
     
-    func evaluate(op: LogicalOp, project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {
+    func evaluate(op: LogicalOp, project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {
         guard self.count > 0 else {
             throw OptimizelyError.conditionInvalidFormat("Empty condition array")
         }
diff --git a/OptimizelySDK/Data Model/Audience/ConditionLeaf.swift b/OptimizelySDK/Data Model/Audience/ConditionLeaf.swift
@@ -50,14 +50,14 @@ enum ConditionLeaf: Codable, Equatable {
         }
     }
     
-    func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {
+    func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {
         switch self {
         case .audienceId(let id):
-            guard var project = project else {
+            guard let project = project else {
                 throw OptimizelyError.conditionCannotBeEvaluated("audienceId: \(id)")
             }
             
-            return try project.getAudience(id: id)?.evaluate(project: project, attributes: attributes) ?? false
+            return try project.evaluateAudience(audienceId: id, attributes: attributes)
         case .attribute(let userAttribute):
             return try userAttribute.evaluate(attributes: attributes)
         }
diff --git a/OptimizelySDK/Data Model/Group.swift b/OptimizelySDK/Data Model/Group.swift
@@ -26,27 +26,14 @@ struct Group: Codable, Equatable {
     var policy: Policy
     var trafficAllocation: [TrafficAllocation]
     var experiments: [Experiment]
-    
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case policy
-        case trafficAllocation
-        case experiments
-    }
-    
-    lazy var experimentMap:[String:Experiment] = {
-        var map:[String:Experiment] = [:]
-        experiments.forEach({map[$0.id] = $0 })
-        return map
-    }()
 }
 
 // MARK: - Utils
 
 extension Group {
     
-    mutating func getExperiment(id: String) -> Experiment? {
-        return self.experimentMap[id]
+    func getExperiemnt(id: String) -> Experiment? {
+        return experiments.filter { $0.id == id }.first
     }
     
 }
diff --git a/OptimizelySDK/Data Model/Project.swift b/OptimizelySDK/Data Model/Project.swift
@@ -16,6 +16,10 @@
 
 import Foundation
 
+protocol ProjectProtocol {
+    func evaluateAudience(audienceId: String, attributes: OptimizelyAttributes?) throws -> Bool
+}
+
 //[REF]: datafile schema
 //       https://github.com/optimizely/optimizely/blob/43454b726a2a8aab7dcd953999cf8e1902b09d4d/src/www/services/datafile_generator/schema.json
 
@@ -38,40 +42,27 @@ struct Project: Codable, Equatable {
     var typedAudiences: [Audience]?
     var featureFlags: [FeatureFlag]
     var botFiltering: Bool?
+}
+
+extension Project: ProjectProtocol {
     
-    private enum CodingKeys: String, CodingKey {
-        case version
-        case projectId
-        case experiments
-        case audiences
-        case groups
-        case attributes
-        case accountId
-        case events
-        case revision
-        case anonymizeIP
-        case rollouts
-        case typedAudiences
-        case featureFlags
-        case botFiltering
+    func evaluateAudience(audienceId: String, attributes: OptimizelyAttributes?) throws -> Bool {
+        guard let audience = getAudience(id: audienceId) else {
+            throw OptimizelyError.conditionNoMatchingAudience(audienceId)
+        }
+        
+        return try audience.evaluate(project: self, attributes: attributes)
     }
     
-    lazy var audienceMap:[String:Audience] = {
-        var map:[String:Audience] = [:]
-        audiences.forEach({map[$0.id] = $0 })
-        typedAudiences?.forEach({map[$0.id] = $0})
-        return map
-    }()
-
-
 }
 
 // MARK: - Utils
 
 extension Project {
     
-    mutating func getAudience(id: String) -> Audience? {
-        return audienceMap[id]
+    func getAudience(id: String) -> Audience? {
+        return typedAudiences?.filter{ $0.id == id }.first ??
+            audiences.filter{ $0.id == id }.first
     }
     
 }
diff --git a/OptimizelySDK/Implementation/DefaultBucketer.swift b/OptimizelySDK/Implementation/DefaultBucketer.swift
@@ -33,13 +33,7 @@ class DefaultBucketer : OPTBucketer {
         
         // check for mutex
         
-        let group = config.project.groups.filter({
-            var g = $0
-            guard let _ = g.experimentMap[experiment.id] else {
-                return false
-            }
-            return true
-        }).first
+        let group = config.project.groups.filter{ $0.getExperiemnt(id: experiment.id) != nil }.first
         
         if let group = group {
             switch group.policy {
@@ -85,12 +79,17 @@ class DefaultBucketer : OPTBucketer {
             return nil;
         }
         
-        for trafficAllocation in group.trafficAllocation where bucketValue <= trafficAllocation.endOfRange {
-            if let experiment = config.getExperiment(id: trafficAllocation.entityId) {
-                return experiment
-            } else {
-                logger?.e(.userBucketedIntoInvalidExperiment(trafficAllocation.entityId))
-                return nil
+        for trafficAllocation in group.trafficAllocation {
+            if bucketValue <= trafficAllocation.endOfRange {
+                let experimentId = trafficAllocation.entityId;
+                
+                // propagate errors and logs for unknown experiment
+                if let experiment = config.getExperiment(id: experimentId) {
+                    return experiment
+                } else {
+                    logger?.e(.userBucketedIntoInvalidExperiment(experimentId))
+                    return nil
+                }
             }
         }
         
@@ -107,14 +106,18 @@ class DefaultBucketer : OPTBucketer {
             return nil
         }
         
-        for trafficAllocation in experiment.trafficAllocation where (bucketValue <= trafficAllocation.endOfRange) {
+        for trafficAllocation in experiment.trafficAllocation {
+            if (bucketValue <= trafficAllocation.endOfRange) {
+                let variationId = trafficAllocation.entityId;
+
                 // propagate errors and logs for unknown variation
-                if let variation = experiment.getVariation(id: trafficAllocation.entityId) {
+                if let variation = experiment.getVariation(id: variationId) {
                     return variation
                 } else {
-                    logger?.e(.userBucketedIntoInvalidVariation(trafficAllocation.entityId))
+                    logger?.e(.userBucketedIntoInvalidVariation(variationId))
                     return nil
                 }
+            }
         }
         
         return nil;
diff --git a/OptimizelySDK/Implementation/DefaultDecisionService.swift b/OptimizelySDK/Implementation/DefaultDecisionService.swift
@@ -63,50 +63,50 @@ class DefaultDecisionService : OPTDecisionService {
             return variation
         }
         
+        var bucketedVariation:Variation?
         // ---- check if the user passes audience targeting before bucketing ----
-        if isInExperiment(config: config, experiment:experiment, userId:userId, attributes:attributes), let bucketedVariation = bucketer.bucketExperiment(config: config, experiment: experiment, bucketingId: bucketingId) {
+        if isInExperiment(config: config, experiment:experiment, userId:userId, attributes:attributes) {
+            // bucket user into a variation
+            bucketedVariation = bucketer.bucketExperiment(config: config, experiment: experiment, bucketingId: bucketingId)
+            
+            if let bucketedVariation = bucketedVariation {
                 // save to user profile
-            self.saveProfile(userId: userId, experimentId: experimentId, variationId: bucketedVariation.id)
-            return bucketedVariation
+                self.saveProfile(userId: userId, experimentId: experimentId, variationId: bucketedVariation.id)
+            }
         } else {
             logger?.i(.userNotInExperiment(userId, experiment.key))
         }
         
-        return nil
+        return bucketedVariation;
     }
     
     func isInExperiment(config:ProjectConfig, experiment:Experiment, userId:String, attributes: OptimizelyAttributes) -> Bool {
-     
-        func innerEvaluate(conditions:ConditionHolder) throws -> Bool {
-            var result = false
-            switch conditions {
-            case .array(let arrConditions):
-                if arrConditions.count > 0 {
-                    result = try conditions.evaluate(project: config.project, attributes: attributes)
-                } else {
-                    // empty conditions (backward compatibility with "audienceIds" is ignored if exists even though empty
-                    result = true
-                }
-            case .leaf:
-                result = try conditions.evaluate(project: config.project, attributes: attributes)
-            default:
-                result = true
-            }
-            return result
-        }
+        
         var result = true   // success as default (no condition, etc)
         
         do {
             if let conditions = experiment.audienceConditions {
-                result = try innerEvaluate(conditions: conditions)
+                switch conditions {
+                case .array(let arrConditions):
+                    if arrConditions.count > 0 {
+                        result = try conditions.evaluate(project: config.project, attributes: attributes)
+                    } else {
+                        // empty conditions (backward compatibility with "audienceIds" is ignored if exists even though empty
+                        result = true
+                    }
+                case .leaf:
+                    result = try conditions.evaluate(project: config.project, attributes: attributes)
+                default:
+                    result = true
+                }
             }
             // backward compatibility with audiencIds list
             else if experiment.audienceIds.count > 0 {
                 var holder = [ConditionHolder]()
                 holder.append(.logicalOp(.or))
-                experiment.audienceIds.forEach({
-                    holder.append(.leaf(.audienceId($0)))
-                })
+                for id in experiment.audienceIds {
+                    holder.append(.leaf(.audienceId(id)))
+                }
                 
                 result = try holder.evaluate(project: config.project, attributes: attributes)
             }
diff --git a/OptimizelySDK/OptimizelySwiftSDK.xcodeproj/project.pbxproj b/OptimizelySDK/OptimizelySwiftSDK.xcodeproj/project.pbxproj
@@ -15,8 +15,6 @@
 		0B05901A2209DC180007F4A2 /* HandlerRegistryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0590172209DC180007F4A2 /* HandlerRegistryService.swift */; };
 		0B05901B2209DC180007F4A2 /* HandlerRegistryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0590172209DC180007F4A2 /* HandlerRegistryService.swift */; };
 		0B11272E2242D817002A9C20 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBAEB6C21E3FEF800D13AA9 /* Optimizely.framework */; };
-		0B272F83227CB217002B302D /* ConditionHolderTests_Evaluate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8B12217C92E00B6EE06 /* ConditionHolderTests_Evaluate.swift */; };
-		0B272F84227CB219002B302D /* ConditionHolderTests_Evaluate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8B12217C92E00B6EE06 /* ConditionHolderTests_Evaluate.swift */; };
 		0B4AE9FA22289CD90047B75D /* BatchEventBuilderTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B4AE9F922289CD90047B75D /* BatchEventBuilderTest.swift */; };
 		0B4AE9FB22289CD90047B75D /* BatchEventBuilderTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B4AE9F922289CD90047B75D /* BatchEventBuilderTest.swift */; };
 		0B4AEA112228A6430047B75D /* bucketing_id.json in Resources */ = {isa = PBXBuildFile; fileRef = 0B4AE9FC2228A6410047B75D /* bucketing_id.json */; };
@@ -616,6 +614,7 @@
 		6EA4258C2218E6A000B074B5 /* OTUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7FC6A222121D27009A171F /* OTUtils.swift */; };
 		6EA4258D2218E6A100B074B5 /* OTUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7FC6A222121D27009A171F /* OTUtils.swift */; };
 		6EA4258E2218E6A200B074B5 /* OTUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7FC6A222121D27009A171F /* OTUtils.swift */; };
+		6EA4258F2218E6AD00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8B12217C92E00B6EE06 /* ConditionHolderTests_Evaluate.swift */; };
 		6EA425902218E6AD00B074B5 /* ConditionHolderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8AA2217736000B6EE06 /* ConditionHolderTests.swift */; };
 		6EA425912218E6AD00B074B5 /* RolloutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E4F0D94221393A500DD13A5 /* RolloutTests.swift */; };
 		6EA425922218E6AD00B074B5 /* AttributeValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E4F0D7D2213536F00DD13A5 /* AttributeValueTests.swift */; };
@@ -630,6 +629,7 @@
 		6EA4259B2218E6AD00B074B5 /* FeatureVariableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7D3EE8220BAB0800410FDE /* FeatureVariableTests.swift */; };
 		6EA4259C2218E6AD00B074B5 /* VariableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E7D3EE6220BA39000410FDE /* VariableTests.swift */; };
 		6EA4259D2218E6AD00B074B5 /* AttributeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E65E55A220B8B0C0048081D /* AttributeTests.swift */; };
+		6EA4259E2218E6AE00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8B12217C92E00B6EE06 /* ConditionHolderTests_Evaluate.swift */; };
 		6EA4259F2218E6AE00B074B5 /* ConditionHolderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E95C8AA2217736000B6EE06 /* ConditionHolderTests.swift */; };
 		6EA425A02218E6AE00B074B5 /* RolloutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E4F0D94221393A500DD13A5 /* RolloutTests.swift */; };
 		6EA425A12218E6AE00B074B5 /* AttributeValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E4F0D7D2213536F00DD13A5 /* AttributeValueTests.swift */; };
@@ -2950,6 +2950,7 @@
 				6EA426342218E74F00B074B5 /* UserAttribute.swift in Sources */,
 				6EA426482218E74F00B074B5 /* HandlerRegistryService.swift in Sources */,
 				6EA425A12218E6AE00B074B5 /* AttributeValueTests.swift in Sources */,
+				6EA4259E2218E6AE00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */,
 				6EA4261E2218E74F00B074B5 /* OPTUserProfileService.swift in Sources */,
 				6EA4261F2218E74F00B074B5 /* DataStoreUserDefaults.swift in Sources */,
 				6EA4262E2218E74F00B074B5 /* OPTDataStore.swift in Sources */,
@@ -2991,7 +2992,6 @@
 				6EA426382218E74F00B074B5 /* Attribute.swift in Sources */,
 				6EA425A72218E6AE00B074B5 /* VariationTests.swift in Sources */,
 				0B7B188E2232DB8700A1F85D /* DataStoreMemory.swift in Sources */,
-				0B272F84227CB219002B302D /* ConditionHolderTests_Evaluate.swift in Sources */,
 				6E8B6A4C221CC2D6006EA8A6 /* ProjectTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3123,6 +3123,7 @@
 				6EA426002218E74E00B074B5 /* UserAttribute.swift in Sources */,
 				6EA426142218E74E00B074B5 /* HandlerRegistryService.swift in Sources */,
 				6EA425922218E6AD00B074B5 /* AttributeValueTests.swift in Sources */,
+				6EA4258F2218E6AD00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */,
 				6EA425EA2218E74E00B074B5 /* OPTUserProfileService.swift in Sources */,
 				6EA425EB2218E74E00B074B5 /* DataStoreUserDefaults.swift in Sources */,
 				6EA425FA2218E74E00B074B5 /* OPTDataStore.swift in Sources */,
@@ -3164,7 +3165,6 @@
 				6EA426042218E74E00B074B5 /* Attribute.swift in Sources */,
 				6EA425982218E6AD00B074B5 /* VariationTests.swift in Sources */,
 				0B7B188A2232DB8500A1F85D /* DataStoreMemory.swift in Sources */,
-				0B272F83227CB217002B302D /* ConditionHolderTests_Evaluate.swift in Sources */,
 				6E8B6A4B221CC2D6006EA8A6 /* ProjectTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/OptimizelySDK/OptimizelyTests/OptimizelyTests-APIs/OptimizelyClientTests.swift b/OptimizelySDK/OptimizelyTests/OptimizelyTests-APIs/OptimizelyClientTests.swift
@@ -44,7 +44,7 @@ class OptimizelyClientTests: XCTestCase {
     
     func testTypedAudienceThroughProject() {
         //        let variation = try? optimizely?.activate(experimentKey: "typed_audience_experiment", userId: "userId", attributes: ["doubleKey":5])
-        let answer = try? optimizely?.config?.project.getAudience(id: "3468206643")?.evaluate( project: optimizely?.config?.project, attributes: ["booleanKey":true])
+        let answer = try? optimizely?.config?.project.evaluateAudience(audienceId: "3468206643", attributes: ["booleanKey":true])
         XCTAssertTrue(answer!!)
         
     }
diff --git a/OptimizelySDK/OptimizelyTests/OptimizelyTests-DataModel/ConditionHolderTests_Evaluate.swift b/OptimizelySDK/OptimizelyTests/OptimizelyTests-DataModel/ConditionHolderTests_Evaluate.swift
@@ -26,6 +26,7 @@ class ConditionHolderTests_Evaluate: XCTestCase {
                                             "type":"custom_attribute",
                                             "match":"gt",
                                             "value":20]
+
     var project:Project?
     
     override func setUp() {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`51`	`51`	`// - initialize immediately with the given JSON datafile or its cached copy`
`52`	`52`	`// - no network delay, but the local copy is not guaranteed to be in sync with the server experiment settings`
`53`	`53`
`54`		`- initializeOptimizelySDKWithCustomization()`
	`54`	`+ initializeOptimizelySDKAsynchronous()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// MARK: - Initialization Examples`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ struct Audience: Codable, Equatable {`
`63`	`63`	`try container.encode(conditions, forKey: .conditions)`
`64`	`64`	`}`
`65`	`65`
`66`		`- func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {`
	`66`	`+ func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {`
`67`	`67`	`return try conditions.evaluate(project: project, attributes: attributes)`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ enum ConditionHolder: Codable, Equatable {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {`
	`64`	`+ func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {`
`65`	`65`	`switch self {`
`66`	`66`	`case .logicalOp:`
`67`	`67`	`throw OptimizelyError.conditionInvalidFormat("Logical operation not evaluated")`
`@@ -77,7 +77,7 @@ enum ConditionHolder: Codable, Equatable {`
`77`	`77`
`78`	`78`	`extension Array where Element == ConditionHolder {`
`79`	`79`
`80`		`- func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {`
	`80`	`+ func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {`
`81`	`81`	`guard let firstItem = self.first else {`
`82`	`82`	`throw OptimizelyError.conditionInvalidFormat("Empty condition array")`
`83`	`83`	`}`
`@@ -94,7 +94,7 @@ extension Array where Element == ConditionHolder {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- func evaluate(op: LogicalOp, project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {`
	`97`	`+ func evaluate(op: LogicalOp, project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {`
`98`	`98`	`guard self.count > 0 else {`
`99`	`99`	`throw OptimizelyError.conditionInvalidFormat("Empty condition array")`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ enum ConditionLeaf: Codable, Equatable {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- func evaluate(project: Project?, attributes: OptimizelyAttributes?) throws -> Bool {`
	`53`	`+ func evaluate(project: ProjectProtocol?, attributes: OptimizelyAttributes?) throws -> Bool {`
`54`	`54`	`switch self {`
`55`	`55`	`case .audienceId(let id):`
`56`		`- guard var project = project else {`
	`56`	`+ guard let project = project else {`
`57`	`57`	`throw OptimizelyError.conditionCannotBeEvaluated("audienceId: \(id)")`
`58`	`58`	`}`
`59`	`59`
`60`		`- return try project.getAudience(id: id)?.evaluate(project: project, attributes: attributes) ?? false`
	`60`	`+ return try project.evaluateAudience(audienceId: id, attributes: attributes)`
`61`	`61`	`case .attribute(let userAttribute):`
`62`	`62`	`return try userAttribute.evaluate(attributes: attributes)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class OptimizelyClientTests: XCTestCase {`
`44`	`44`
`45`	`45`	`func testTypedAudienceThroughProject() {`
`46`	`46`	`// let variation = try? optimizely?.activate(experimentKey: "typed_audience_experiment", userId: "userId", attributes: ["doubleKey":5])`
`47`		`- let answer = try? optimizely?.config?.project.getAudience(id: "3468206643")?.evaluate( project: optimizely?.config?.project, attributes: ["booleanKey":true])`
	`47`	`+ let answer = try? optimizely?.config?.project.evaluateAudience(audienceId: "3468206643", attributes: ["booleanKey":true])`
`48`	`48`	`XCTAssertTrue(answer!!)`
`49`	`49`
`50`	`50`	`}`