init

Author: ozayr-zaviar

src/Optimizely/Bucketer.php

@@ -197,7 +197,7 @@ public function bucket(ProjectConfigInterface $config, Experiment $experiment, $
         list($variationId, $reasons) = $this->findBucket($bucketingId, $userId, $experiment->getId(), $experiment->getTrafficAllocation());
         $decideReasons = array_merge($decideReasons, $reasons);
         if (!empty($variationId)) {
-            $variation = $config->getVariationFromId($experiment->getKey(), $variationId);
+            $variation = $config->getVariationFromIdByExperimentId($experiment->getId(), $variationId);
 
             return [ $variation, $decideReasons ];
         }

src/Optimizely/Config/DatafileProjectConfig.php

@@ -123,6 +123,16 @@ class DatafileProjectConfig implements ProjectConfigInterface
      */
     private $_variationIdMap;
 
+    /**
+     * @var array Associative array of experiment id to associative array of variation ID to variations.
+     */
+    private $_variationIdMapByExperimentId;
+
+    /**
+     * @var array Associative array of experiment id to associative array of variation key to variations.
+     */
+    private $_variationKeyMapByExperimentId;
+    
     /**
      * @var array Associative array of event key to Event(s) in the datafile.
      */
@@ -247,7 +257,7 @@ public function __construct($datafile, $logger, $errorHandler)
         }
 
         $this->_groupIdMap = ConfigParser::generateMap($groups, 'id', Group::class);
-        $this->_experimentKeyMap = ConfigParser::generateMap($experiments, 'key', Experiment::class);
+        $this->_experimentIdMap = ConfigParser::generateMap($experiments, 'id', Experiment::class);
         $this->_eventKeyMap = ConfigParser::generateMap($events, 'key', Event::class);
         $this->_attributeKeyMap = ConfigParser::generateMap($attributes, 'key', Attribute::class);
         $typedAudienceIdMap = ConfigParser::generateMap($typedAudiences, 'id', Audience::class);
@@ -256,32 +266,36 @@ public function __construct($datafile, $logger, $errorHandler)
         $this->_featureFlags = ConfigParser::generateMap($featureFlags, null, FeatureFlag::class);
 
         foreach (array_values($this->_groupIdMap) as $group) {
-            $experimentsInGroup = ConfigParser::generateMap($group->getExperiments(), 'key', Experiment::class);
+            $experimentsInGroup = ConfigParser::generateMap($group->getExperiments(), 'id', Experiment::class);
             foreach (array_values($experimentsInGroup) as $experiment) {
                 $experiment->setGroupId($group->getId());
                 $experiment->setGroupPolicy($group->getPolicy());
             }
-            $this->_experimentKeyMap = $this->_experimentKeyMap + $experimentsInGroup;
+            $this->_experimentIdMap = $this->_experimentIdMap + $experimentsInGroup;
         }
 
         foreach ($this->_rollouts as $rollout) {
             foreach ($rollout->getExperiments() as $experiment) {
-                $this->_experimentKeyMap[$experiment->getKey()] = $experiment;
+                $this->_experimentIdMap[$experiment->getId()] = $experiment;
             }
         }
 
         $this->_variationKeyMap = [];
         $this->_variationIdMap = [];
-        $this->_experimentIdMap = [];
+        $this->_experimentKeyMap = [];
 
-        foreach (array_values($this->_experimentKeyMap) as $experiment) {
+        foreach (array_values($this->_experimentIdMap) as $experiment) {
             $this->_variationKeyMap[$experiment->getKey()] = [];
             $this->_variationIdMap[$experiment->getKey()] = [];
-            $this->_experimentIdMap[$experiment->getId()] = $experiment;
+            $this->_variationIdMapByExperimentId[$experiment->getID()] = [];
+            $this->_variationKeyMapByExperimentId[$experiment->getID()] = [];
+            $this->_experimentKeyMap[$experiment->getKey()] = $experiment;
 
             foreach ($experiment->getVariations() as $variation) {
                 $this->_variationKeyMap[$experiment->getKey()][$variation->getKey()] = $variation;
                 $this->_variationIdMap[$experiment->getKey()][$variation->getId()] = $variation;
+                $this->_variationKeyMapByExperimentId[$experiment->getID()][$variation->getKey()] = $variation;
+                $this->_variationIdMapByExperimentId[$experiment->getID()][$variation->getId()] = $variation;
             }
         }
 
@@ -655,6 +669,60 @@ public function getVariationFromId($experimentKey, $variationId)
         return new Variation();
     }
 
+    /**
+     * @param $experimentId string ID for experiment.
+     * @param $variationId string ID for variation.
+     *
+     * @return Variation Entity corresponding to the provided experiment ID and variation ID.
+     *         Dummy entity is returned if key or ID is invalid.
+     */
+    public function getVariationFromIdByExperimentId($experimentId, $variationId)
+    {
+        if (isset($this->_variationIdMapByExperimentId[$experimentId])
+            && isset($this->_variationIdMapByExperimentId[$experimentId][$variationId])
+        ) {
+            return $this->_variationIdMapByExperimentId[$experimentId][$variationId];
+        }
+
+        $this->_logger->log(
+            Logger::ERROR,
+            sprintf(
+                'No variation ID "%s" defined in datafile for experiment "%s".',
+                $variationId,
+                $experimentId
+            )
+        );
+        $this->_errorHandler->handleError(new InvalidVariationException('Provided variation is not in datafile.'));
+        return new Variation();
+    }
+
+    /**
+     * @param $experimentId string ID for experiment.
+     * @param $variationKey string Key for variation.
+     *
+     * @return Variation Entity corresponding to the provided experiment ID and variation Key.
+     *         Dummy entity is returned if key or ID is invalid.
+     */
+    public function getVariationFromKeyByExperimentId($experimentId, $variationKey)
+    {
+        if (isset($this->_variationKeyMapByExperimentId[$experimentId])
+            && isset($this->_variationKeyMapByExperimentId[$experimentId][$variationKey])
+        ) {
+            return $this->_variationKeyMapByExperimentId[$experimentId][$variationKey];
+        }
+
+        $this->_logger->log(
+            Logger::ERROR,
+            sprintf(
+                'No variation Key "%s" defined in datafile for experiment "%s".',
+                $variationKey,
+                $experimentId
+            )
+        );
+        $this->_errorHandler->handleError(new InvalidVariationException('Provided variation is not in datafile.'));
+        return new Variation();
+    }
+
     /**
      * Gets the feature variable instance given feature flag key and variable key
      *

src/Optimizely/Config/ProjectConfigInterface.php

@@ -141,6 +141,24 @@ public function getVariationFromKey($experimentKey, $variationKey);
      */
     public function getVariationFromId($experimentKey, $variationId);
 
+    /**
+     * @param $experimentId string ID for experiment.
+     * @param $variationId string ID for variation.
+     *
+     * @return Variation Entity corresponding to the provided experiment ID and variation ID.
+     *         Dummy entity is returned if key or ID is invalid.
+     */
+    public function getVariationFromIdByExperimentId($experimentId, $variationId);
+
+    /**
+     * @param $experimentId string ID for experiment.
+     * @param $variationKey string Key for variation.
+     *
+     * @return Variation Entity corresponding to the provided experiment ID and variation Key.
+     *         Dummy entity is returned if key or ID is invalid.
+     */
+    public function getVariationFromKeyByExperimentId($experimentId, $variationKey);
+
     /**
      * Gets the feature variable instance given feature flag key and variable key
      *