FSC fixes

ozayr-zaviar · ozayr-zaviar · commit e2f1db3d1c46 · 2021-11-18T15:40:59.000+05:00
diff --git a/optimizely/event/user_event_factory.py b/optimizely/event/user_event_factory.py
@@ -51,6 +51,8 @@ def create_impression_event(
 
         if variation_id and experiment_id:
             variation = project_config.get_variation_from_id_by_experiment_id(experiment_id, variation_id)
+        elif variation_id and flag_key:
+            variation = project_config.get_flag_variation_by_id(flag_key, variation_id)
         event_context = user_event.EventContext(
             project_config.account_id, project_config.project_id, project_config.revision, project_config.anonymize_ip,
         )
diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py
@@ -198,6 +198,19 @@ def _send_impression_event(self, project_config, experiment, variation, flag_key
           user_id: ID for user.
           attributes: Dict representing user attributes and values which need to be recorded.
         """
+        if not experiment:
+            experiment = entities.Experiment(
+                id='',
+                key='',
+                layerId='',
+                status='',
+                variations=[],
+                trafficAllocation=[],
+                audienceIds=[],
+                audienceConditions=[],
+                forcedVariations={}
+            )
+
         variation_id = variation.id if variation is not None else None
         user_event = user_event_factory.UserEventFactory.create_impression_event(
             project_config, experiment, variation_id, flag_key, rule_key, rule_type, enabled, user_id, attributes
@@ -1057,7 +1070,7 @@ def _decide(self, user_context, key, decide_options=None):
         if decision.experiment is not None:
             experiment = decision.experiment
             source_info["experiment"] = experiment
-            rule_key = experiment.key
+            rule_key = experiment.key if experiment else None
         if decision.variation is not None:
             variation = decision.variation
             variation_key = variation.key
diff --git a/optimizely/project_config.py b/optimizely/project_config.py
@@ -166,8 +166,8 @@ def __init__(self, datafile, logger, error_handler):
             variations = []
             for rule in rules:
                 # get variations as objects (rule.variations gives list)
-                variation_objects = self.variation_key_map[rule.key].values()
 
+                variation_objects = self.variation_id_map_by_experiment_id[rule.id].values()
                 for variation in variation_objects:
                     if variation.id not in [var.id for var in variations]:
                         variations.append(variation)
@@ -651,3 +651,26 @@ def get_variation_from_key_by_experiment_id(self, experiment_id, variation_key):
                           variation_key, experiment_id)
 
         return {}
+
+    def get_flag_variation_by_id(self, flag_key, variation_id):
+        """
+        Gets variation by id.
+        variation_id can be a string or in case of forced decisions, it can be an object.
+
+        Args:
+            flag_key: flag key
+            variation_key: variation id
+
+        Returns:
+            Variation as a map.
+        """
+
+        if not flag_key:
+            return None
+
+        variations = self.flag_variations_map.get(flag_key)
+        for variation in variations:
+            if variation.id == variation_id:
+                return variation
+
+        return None

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ def create_impression_event(`
`51`	`51`
`52`	`52`	`if variation_id and experiment_id:`
`53`	`53`	`variation = project_config.get_variation_from_id_by_experiment_id(experiment_id, variation_id)`
	`54`	`+ elif variation_id and flag_key:`
	`55`	`+ variation = project_config.get_flag_variation_by_id(flag_key, variation_id)`
`54`	`56`	`event_context = user_event.EventContext(`
`55`	`57`	`project_config.account_id, project_config.project_id, project_config.revision, project_config.anonymize_ip,`
`56`	`58`	`)`