fix(Data360Metrics-UserStorage): track multiple trigger goals and goa…

…ls with where condition even if present in user storage
wingify · Oct 17, 2023 · 13394ed · 13394ed
1 parent 7b81015
commit 13394ed
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.64.0] - 2023-10-17
+
+### Fixed
+
+- Issue with multiple trigger goals and goals with where condition not getting triggered multiple times if user storage connected
+
 ## [1.62.0] - 2023-10-13
 
 ### Fixed

diff --git a/src/Utils/ImpressionBuilder.php b/src/Utils/ImpressionBuilder.php
@@ -31,7 +31,7 @@ class ImpressionBuilder
     /**
      * sdk version for api hit
      */
-    const SDK_VERSION = '1.62.0';
+    const SDK_VERSION = '1.64.0';
     /**
      * sdk langauge for api hit
      */

diff --git a/src/VWO.php b/src/VWO.php
@@ -654,13 +654,14 @@ public function track($campaignKey = '', $userId = '', $goalIdentifier = '', arr
                             $identifiers = [];
                         }
 
-
+
+                        $checkHasProps = isset($goal['hasProps']) ? $goal['hasProps'] : false;
                         if (!in_array($goalIdentifier, $identifiers)) {
                             $bucketInfo['goalIdentifier'] .=  "_vwo_$goalIdentifier";
                             if (!empty($this->_userStorageObj)) {
                                 $this->variationDecider->userStorageSet($this->_userStorageObj, $userId, $campaign['key'], $bucketInfo, $bucketInfo['goalIdentifier']);
                             }
-                        } elseif ($mca != -1) {
+                        } elseif (!($goal['type'] == "REVENUE_TRACKING" && $mca != null && $mca == -1) && !($checkHasProps)) {
                             LoggerService::log(
                                 Logger::INFO,
                                 'CAMPAIGN_GOAL_ALREADY_TRACKED',

diff --git a/tests/VWOTest.php b/tests/VWOTest.php
@@ -25,6 +25,7 @@
 use vwo\Utils\Common;
 use vwo\Utils\DataLocationManager;
 use vwo\Utils\SegmentEvaluator;
+use vwo\Storage\UserStorageInterface;
 
 /***
  * Class VWOTest
@@ -53,6 +54,7 @@ protected function setUp()
         $this->settings9 = Settings9::setup();
         $this->settingsFileEventProperties = SettingsFileEventProperties::setup();
         $this->MABTrueSettingsFile = MABTrueSettingsFile::setup();
+        $this->settingsFileHasProps = SettingsFileHasProps::setup();
         $segmentEvaluatorJson = new SegmentEvaluatorJson();
         $results = new VariationResults();
 
@@ -1032,7 +1034,7 @@ public function testIfEventPropertiesIsPassedInsteadOfRevenueValue(){
         $options = [
             'eventProperties' => $eventProperties
         ];
-        $response = $vwoInstance->track($campaignKey,'Abby','Track3',$options);
+        $response = $vwoInstance->track($campaignKey, 'Abby', 'Track3', $options);
         $this->assertEquals(true, $response);
     }
 
@@ -1063,4 +1065,89 @@ public function testWhenMABTrueWithUserStorageEnabled(){
         $variation = $vwoInstance->activate($campaignKey, 'George');
         $this->assertEquals($variation, 'Control');
     }
+
+    public function testTrackGoalHasProps()
+    {
+        $userStorageInstance = new UserStorageService();
+        $campaignInfo = [
+            "userId" => "Ashley",
+            "campaignKey" => "Track",
+            "variationName" => "Variation-1",
+            "goalIdentifier" => "Track1"
+        ];
+        $userStorageInstance->set($campaignInfo);
+        $config = [
+            'settingsFile' => $this->settingsFileHasProps,
+            'logging' => new CustomLogger(),
+            'userStorageService' =>  $userStorageInstance
+        ];
+        $sdkInstance = new VWO($config);
+        $result = $sdkInstance->track("Track", "Ashley", "Track1");
+        $this->assertEquals($result, true);
+    }
+
+    public function testTrackGoalNoHasProps()
+    {
+        $userStorageInstance = new UserStorageservice();
+        $campaignInfo = [
+            "userId" => "Ashley",
+            "campaignKey" => "Track",
+            "variationName" => "Control",
+            "goalIdentifier" => "Track2"
+        ];
+        $userStorageInstance->set($campaignInfo);
+        $config = [
+            'settingsFile' => $this->settingsFileHasProps,
+            'logging' => new CustomLogger(),
+            'userStorageService' =>  $userStorageInstance
+        ];
+        $sdkInstance = new VWO($config);
+        $result = $sdkInstance->track("Track", "Ashley", "Track2");
+        $this->assertEquals($result, false);
+    }
 }
+
+
+class UserStorageService implements UserStorageInterface
+{
+    public $campaignStorageArray = array();
+    private $goalIdentifier = '';
+
+    /**
+     * @param  $userId
+     * @param  $campaignKey
+     * @return array
+     */
+    public function get($userId, $campaignKey)
+    {
+        if (is_array($this->campaignStorageArray)) {
+            //var_dump($this->campaignStorageArray);
+            foreach ($this->campaignStorageArray as $savedCampaign) {
+                if (isset($savedCampaign['userId']) && isset($savedCampaign['campaignKey']) && $savedCampaign['userId'] === $userId && $savedCampaign['campaignKey'] === $campaignKey) {
+                    return $savedCampaign;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param  $campaignInfo
+     * @return bool
+     */
+
+    public function set($campaignUserMapping)
+    {
+        if (!in_array($campaignUserMapping, $this->campaignStorageArray, true)) {
+            $this->campaignStorageArray[] = $campaignUserMapping;
+        }
+    }
+    /**
+     * @param $goalIdentifier
+     */
+    public function setGoalIdentifier($goalIdentifier)
+    {
+        $this->goalIdentifier = $goalIdentifier;
+    }
+}
diff --git a/tests/assets/SettingsFileHasProps.php b/tests/assets/SettingsFileHasProps.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Copyright 2019-2022 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace vwo;
+
+class SettingsFileHasProps
+{
+    public static function setup()
+    {
+        return [
+            'sdkKey' => 'abcde',
+            'campaigns' => [
+            [
+                'goals' => [
+                    [
+                        'identifier' => 'Track1',
+                        'id' => 216,
+                        'type' => 'CUSTOM_GOAL',
+                        'hasProps' => true
+                    ],
+                    [
+                        'identifier' => 'Track2',
+                        'id' => 217,
+                        'type' => 'CUSTOM_GOAL'
+                    ],
+                    [
+                        'identifier' => 'Track3',
+                        'id' => 218,
+                        'type' => 'REVENUE_TRACKING',
+                        'revenueProp' => 'abcd'
+                    ]
+                ],
+                'variations' => [
+                    [
+                    'id' => 1,
+                    'name' => 'Control',
+                    'changes' => [],
+                    'weight' => 10
+                    ],
+                    [
+                    'id' => 2,
+                    'name' => 'Variation-1',
+                    'changes' => [],
+                    'weight' => 90
+                    ]
+                ],
+                'id' => 233,
+                'name' => "Track",
+                'percentTraffic' => 100,
+                'key' => 'Track',
+                'status' => 'RUNNING',
+                'type' => 'VISUAL_AB',
+                'isForcedVariationEnabled'=> false
+            ]
+            ],
+            'accountId' => 123456,
+            'version' => 1,
+            'isEventArchEnabled' => true
+        ];
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -39,4 +39,5 @@
 require 'TestUtil.php';
 require 'assets/SettingsFileBucketing.php';
 require 'assets/SettingsFileEventProperties.php';
-require 'assets/MABTrueSettingsFile.php';
+require 'assets/MABTrueSettingsFile.php';
+require 'assets/SettingsFileHasProps.php';