From 2bc6f2158912418272f532ded4957354eb2d726a Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Mon, 4 Nov 2013 10:22:40 +1300 Subject: [PATCH] Refs #472 trimming event attributes and adding test ensuring labels are not truncated --- core/Tracker/ActionEvent.php | 8 +- core/Tracker/ActionSiteSearch.php | 3 + plugins/Actions/Actions.php | 16 ---- .../Fixtures/TwoVisitsWithCustomEvents.php | 8 ++ ...mEvents__Live.getLastVisitsDetails_day.xml | 82 +++++++++++++------ ...vents__Live.getLastVisitsDetails_month.xml | 82 +++++++++++++------ 6 files changed, 125 insertions(+), 74 deletions(-) diff --git a/core/Tracker/ActionEvent.php b/core/Tracker/ActionEvent.php index 5b0a43e664..6c27590d6e 100644 --- a/core/Tracker/ActionEvent.php +++ b/core/Tracker/ActionEvent.php @@ -26,10 +26,10 @@ class ActionEvent extends Action { parent::__construct(Action::TYPE_EVENT, $request); $this->setActionUrl($url); - $this->eventCategory = $eventCategory; - $this->eventAction = $eventAction; - $this->eventName = $request->getParam('e_n'); - $this->eventValue = $request->getParam('e_v'); + $this->eventCategory = trim($eventCategory); + $this->eventAction = trim($eventAction); + $this->eventName = trim($request->getParam('e_n')); + $this->eventValue = trim($request->getParam('e_v')); } function getCustomFloatValue() diff --git a/core/Tracker/ActionSiteSearch.php b/core/Tracker/ActionSiteSearch.php index 6d7f773a6c..1f878f2a03 100644 --- a/core/Tracker/ActionSiteSearch.php +++ b/core/Tracker/ActionSiteSearch.php @@ -227,6 +227,9 @@ class ActionSiteSearch extends Action } } + $actionName = trim($actionName); + $categoryName = trim($categoryName); + if (empty($actionName)) { Common::printDebug("(this is not a Site Search request)"); return false; diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 0f292b750a..431f784c87 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -36,22 +36,6 @@ class Actions extends \Piwik\Plugin { const ACTIONS_REPORT_ROWS_DISPLAY = 100; - private $columnTranslations; - - public function __construct() - { - parent::__construct(); - - $this->columnTranslations = array( - 'nb_hits' => Piwik::translate('General_ColumnPageviews'), - 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), - 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'), - 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), - 'exit_rate' => Piwik::translate('General_ColumnExitRate'), - 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime'), - ); - } - /** * @see Piwik_Plugin::getListHooksRegistered */ diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php index adc7a7a9f6..c835650990 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php @@ -132,6 +132,14 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomEvents extends Test_Piwik_BaseFixtur $this->moveTimeForward($vis, 268); $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('Movie', 'rating', 'Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)', 9.66)); + + $this->moveTimeForward($vis, 280); + $this->setMovieEventCustomVar($vis); + + // Test event with long names should be truncated + $append = "Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long"; + $append .= " ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- "; + self::checkResponse($vis->doTrackEvent('event category ' . $append, 'event action '.$append, 'event name '.$append, 9.66)); } private function setMusicEventCustomVar(PiwikTracker $vis) diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 3a65006335..2130ae122d 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -12,8 +12,8 @@ <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> - <events>4</events> - <actions>4</actions> + <events>5</events> + <actions>5</actions> <actionDetails> <row> <type>event</type> @@ -64,6 +64,20 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> <eventValue>9.66</eventValue> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <icon>plugins/Zeitgeist/images/event.png</icon> + </row> + <row> + <type>event</type> + <url>http://example.org/movies</url> + <pageIdAction>12</pageIdAction> + + <pageId>20</pageId> + <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> + <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> + <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> + <eventValue>9.66</eventValue> <icon>plugins/Zeitgeist/images/event.png</icon> </row> </actionDetails> @@ -83,8 +97,8 @@ - <visitDuration>2761</visitDuration> - <visitDurationPretty>46 min 1s</visitDurationPretty> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> <visitCount>1</visitCount> <daysSinceLastVisit>0</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -478,15 +492,15 @@ <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> - <events>4</events> - <actions>4</actions> + <events>5</events> + <actions>5</actions> <actionDetails> <row> <type>event</type> <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -499,7 +513,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -512,7 +526,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -525,11 +539,25 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> <eventValue>9.66</eventValue> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <icon>plugins/Zeitgeist/images/event.png</icon> + </row> + <row> + <type>event</type> + <url>http://example.org/movies</url> + <pageIdAction>12</pageIdAction> + + <pageId>40</pageId> + <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> + <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> + <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> + <eventValue>9.66</eventValue> <icon>plugins/Zeitgeist/images/event.png</icon> </row> </actionDetails> @@ -549,8 +577,8 @@ - <visitDuration>2761</visitDuration> - <visitDurationPretty>46 min 1s</visitDurationPretty> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> <visitCount>1</visitCount> <daysSinceLastVisit>0</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -625,7 +653,7 @@ <pageTitle>Welcome!</pageTitle> <pageIdAction>2</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -635,7 +663,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>21</pageId> + <pageId>22</pageId> <eventCategory>Music</eventCategory> <eventAction>play</eventAction> <customVariables> @@ -654,7 +682,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>22</pageId> + <pageId>23</pageId> <eventCategory>Music</eventCategory> <eventAction>play25%</eventAction> <customVariables> @@ -673,7 +701,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>23</pageId> + <pageId>24</pageId> <eventCategory>Music</eventCategory> <eventAction>play50%</eventAction> <customVariables> @@ -692,7 +720,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>24</pageId> + <pageId>25</pageId> <eventCategory>Music</eventCategory> <eventAction>play75%</eventAction> <customVariables> @@ -711,7 +739,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>25</pageId> + <pageId>26</pageId> <eventCategory>Music</eventCategory> <eventAction>playEnd</eventAction> <customVariables> @@ -730,7 +758,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>26</pageId> + <pageId>27</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -750,7 +778,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>27</pageId> + <pageId>28</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -771,7 +799,7 @@ <pageTitle>Movie Theater</pageTitle> <pageIdAction>12</pageIdAction> - <pageId>28</pageId> + <pageId>29</pageId> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -781,7 +809,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>29</pageId> + <pageId>30</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (ã‚‚ã®ã®ã‘姫)</eventName> @@ -794,7 +822,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>30</pageId> + <pageId>31</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (å´–ã®ä¸Šã®ãƒãƒ‹ãƒ§)</eventName> @@ -807,7 +835,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>31</pageId> + <pageId>32</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -820,7 +848,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -833,7 +861,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -846,7 +874,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 3a65006335..2130ae122d 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -12,8 +12,8 @@ <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> - <events>4</events> - <actions>4</actions> + <events>5</events> + <actions>5</actions> <actionDetails> <row> <type>event</type> @@ -64,6 +64,20 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> <eventValue>9.66</eventValue> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <icon>plugins/Zeitgeist/images/event.png</icon> + </row> + <row> + <type>event</type> + <url>http://example.org/movies</url> + <pageIdAction>12</pageIdAction> + + <pageId>20</pageId> + <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> + <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> + <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> + <eventValue>9.66</eventValue> <icon>plugins/Zeitgeist/images/event.png</icon> </row> </actionDetails> @@ -83,8 +97,8 @@ - <visitDuration>2761</visitDuration> - <visitDurationPretty>46 min 1s</visitDurationPretty> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> <visitCount>1</visitCount> <daysSinceLastVisit>0</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -478,15 +492,15 @@ <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> - <events>4</events> - <actions>4</actions> + <events>5</events> + <actions>5</actions> <actionDetails> <row> <type>event</type> <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -499,7 +513,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -512,7 +526,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -525,11 +539,25 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> <eventValue>9.66</eventValue> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <icon>plugins/Zeitgeist/images/event.png</icon> + </row> + <row> + <type>event</type> + <url>http://example.org/movies</url> + <pageIdAction>12</pageIdAction> + + <pageId>40</pageId> + <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> + <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> + <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> + <eventValue>9.66</eventValue> <icon>plugins/Zeitgeist/images/event.png</icon> </row> </actionDetails> @@ -549,8 +577,8 @@ - <visitDuration>2761</visitDuration> - <visitDurationPretty>46 min 1s</visitDurationPretty> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> <visitCount>1</visitCount> <daysSinceLastVisit>0</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -625,7 +653,7 @@ <pageTitle>Welcome!</pageTitle> <pageIdAction>2</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -635,7 +663,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>21</pageId> + <pageId>22</pageId> <eventCategory>Music</eventCategory> <eventAction>play</eventAction> <customVariables> @@ -654,7 +682,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>22</pageId> + <pageId>23</pageId> <eventCategory>Music</eventCategory> <eventAction>play25%</eventAction> <customVariables> @@ -673,7 +701,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>23</pageId> + <pageId>24</pageId> <eventCategory>Music</eventCategory> <eventAction>play50%</eventAction> <customVariables> @@ -692,7 +720,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>24</pageId> + <pageId>25</pageId> <eventCategory>Music</eventCategory> <eventAction>play75%</eventAction> <customVariables> @@ -711,7 +739,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>25</pageId> + <pageId>26</pageId> <eventCategory>Music</eventCategory> <eventAction>playEnd</eventAction> <customVariables> @@ -730,7 +758,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>26</pageId> + <pageId>27</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -750,7 +778,7 @@ <url>http://example.org/webradio</url> <pageIdAction>2</pageIdAction> - <pageId>27</pageId> + <pageId>28</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -771,7 +799,7 @@ <pageTitle>Movie Theater</pageTitle> <pageIdAction>12</pageIdAction> - <pageId>28</pageId> + <pageId>29</pageId> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -781,7 +809,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>29</pageId> + <pageId>30</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (ã‚‚ã®ã®ã‘姫)</eventName> @@ -794,7 +822,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>30</pageId> + <pageId>31</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (å´–ã®ä¸Šã®ãƒãƒ‹ãƒ§)</eventName> @@ -807,7 +835,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>31</pageId> + <pageId>32</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -820,7 +848,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -833,7 +861,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> @@ -846,7 +874,7 @@ <url>http://example.org/movies</url> <pageIdAction>12</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</eventName> -- GitLab