Making function more generic and usable

Author: aliabbasrizvi

optimizely/project_config.py

@@ -61,7 +61,7 @@ def __init__(self, datafile, logger, error_handler):
     self.event_key_map = self._generate_key_map(self.events, 'key', entities.Event)
     self.attribute_key_map = self._generate_key_map(self.attributes, 'key', entities.Attribute)
     self.audience_id_map = self._generate_key_map(self.audiences, 'id', entities.Audience)
-    self.flag_id_map = self._generate_key_map(self.feature_flags, 'id', entities.FeatureFlag)
+    self.feature_flag_id_map = self._generate_key_map(self.feature_flags, 'id', entities.FeatureFlag)
     self.audience_id_map = self._deserialize_audience(self.audience_id_map)
     for group in self.group_id_map.values():
       experiments_in_group_key_map = self._generate_key_map(group.experiments, 'key', entities.Experiment)
@@ -82,7 +82,9 @@ def __init__(self, datafile, logger, error_handler):
       )
       self.variation_id_map[experiment.key] = {}
       for variation in self.variation_key_map.get(experiment.key).values():
-        self.variation_id_map[experiment.key][variation.id] = self._create_feature_flag_map(variation, self.flag_id_map)
+        feature_flag_to_value_map = self._map_feature_flag_to_value(variation.variables, self.feature_flag_id_map)
+        variation.featureFlagMap = feature_flag_to_value_map
+        self.variation_id_map[experiment.key][variation.id] = variation
 
     self.parsing_succeeded = True
 
@@ -145,24 +147,25 @@ def _get_typecast_value(self, value, type):
     else:
       return value
 
-  def _create_feature_flag_map(self, variation, flag_id_map):
-    """ Helper method to create map on variation object mapping feature flag key to related value.
+  def _map_feature_flag_to_value(self, variables, feature_flag_id_map):
+    """ Helper method to create map of feature flag key to associated value for a given variation's feature flag set.
 
     Args:
-      variation: Object representing variation.
-      flag_id_map: Dict mapping feature flag key to feature flag object.
+      variables: List of dicts representing variables on an instance of Variation object.
+      feature_flag_id_map: Dict mapping feature flag key to feature flag object.
 
     Returns:
-      Variation object with the feature flag map property computed.
+      Dict mapping values from feature flag key to value stored on the variation's variable.
     """
 
-    for variable in variation.variables:
-      feature_flag = flag_id_map[variable.get('id')]
+    feature_flag_value_map = {}
+    for variable in variables:
+      feature_flag = feature_flag_id_map[variable.get('id')]
       if not feature_flag:
         continue
-      variation.featureFlagMap[feature_flag.key] = self._get_typecast_value(variable.get('value'), feature_flag.type)
+      feature_flag_value_map[feature_flag.key] = self._get_typecast_value(variable.get('value'), feature_flag.type)
 
-    return variation
+    return feature_flag_value_map
 
   def was_parsing_successful(self):
     """ Helper method to determine if parsing the datafile was successful.

tests/test_config.py

@@ -505,7 +505,7 @@ def test_init__with_v3_datafile(self):
         '28906': entities.Variation('28906', 'group_exp_2_variation')
       }
     }
-    expected_flag_id_map = {
+    expected_feature_flag_id_map = {
       '127': entities.FeatureFlag('127', 'is_working', 'boolean', 'true'),
       '128': entities.FeatureFlag('128', 'environment', 'string', 'devel'),
       '129': entities.FeatureFlag('129', 'number_of_days', 'integer', '192'),
@@ -520,7 +520,7 @@ def test_init__with_v3_datafile(self):
     self.assertEqual(expected_audience_id_map, project_config.audience_id_map)
     self.assertEqual(expected_variation_key_map, project_config.variation_key_map)
     self.assertEqual(expected_variation_id_map, project_config.variation_id_map)
-    self.assertEqual(expected_flag_id_map, project_config.flag_id_map)
+    self.assertEqual(expected_feature_flag_id_map, project_config.feature_flag_id_map)
 
   def test_get_version(self):
     """ Test that JSON version is retrieved correctly when using get_version. """