WIP: cleanup

Author: muzahidul-opti

Sources/Implementation/DefaultDecisionService.swift

@@ -218,12 +218,16 @@ class DefaultDecisionService: OPTDecisionService {
                                 user: OptimizelyUserContext,
                                 options: [OptimizelyDecideOption]? = nil) -> DecisionResponse<FeatureDecision> {
 
-        guard let response = getVariationForFeatureList(config: config, featureFlags: [featureFlag], user: user, options: options).first else {
-            let reasons = DecisionReasons(options: options)
+        let response = getVariationForFeatureList(config: config, featureFlags: [featureFlag], user: user, options: options).first
+        
+        guard response?.result != nil else {
+            let reasons = response?.reasons ?? DecisionReasons(options: options)
             return DecisionResponse(result: nil, reasons: reasons)
         }
 
-        return response
+        return response!
+        
+        
 
 //        // Evaluate in this order:
 //        
@@ -285,6 +289,8 @@ class DefaultDecisionService: OPTDecisionService {
 
             if let decision = decisionResponse.result {
                 decisions.append(DecisionResponse(result: decision, reasons: reasons))
+            } else {
+                decisions.append(DecisionResponse(result: nil, reasons: reasons))
             }
         }
 

Sources/Optimizely+Decide/OptimizelyClient+Decide.swift

@@ -123,17 +123,16 @@ extension OptimizelyClient {
         let decisionList = (decisionService as? DefaultDecisionService)?.getVariationForFeatureList(config: config, featureFlags: flagsWithoutForceDecision, user: user, options: allOptions)
 
         for index in 0..<flagsWithoutForceDecision.count {
-            if decisionList?.indices.contains(index) ?? false,
-               let decision = decisionList?[index],
-               let result = decision.result {
+            if decisionList?.indices.contains(index) ?? false {
+                let decision = decisionList?[index]
+                let result = decision?.result
                 let flagKey = flagsWithoutForceDecision[index].key
                 flagDecisions[flagKey] = result
                 let _reasons = decisionReasonMap[flagKey]
-                _reasons?.merge(decision.reasons)
-                decisionReasonMap[flagKey] = _reasons
-                
-            } else {
-                logger.e("Decsion not found in decisionList")
+                if decision?.reasons != nil {
+                    _reasons?.merge(decision!.reasons)
+                    decisionReasonMap[flagKey] = _reasons
+                }
             }
         }