Refs #472 Making eventValue match work by only matching events actions + adding test

plugins/Actions/Archiver.php

@@ -124,7 +124,7 @@ class Archiver extends \Piwik\Plugin\Archiver
     /**
      * @return string
      */
-    protected function getWhereClauseActionIsNotEvent()
+    static public function getWhereClauseActionIsNotEvent()
     {
         return " AND log_link_visit_action.idaction_event_category IS NULL";
     }

plugins/Events/Events.php

@@ -11,12 +11,11 @@
 namespace Piwik\Plugins\Events;
 
 use Piwik\Piwik;
-use Piwik\Plugin;
 
 /**
  * @package Events
  */
-class Events extends Plugin
+class Events extends \Piwik\Plugin
 {
     /**
      * @see Piwik\Plugin::getListHooksRegistered
@@ -56,13 +55,6 @@ class Events extends Plugin
             'sqlSegment' => 'log_link_visit_action.idaction_name',
             'sqlFilter'  => $sqlFilter,
         );
-        $segments[] = array(
-            'type'       => 'metric',
-            'category'   => 'Events_Events',
-            'name'       => 'Events_EventValue',
-            'segment'    => 'eventValue',
-            'sqlSegment' => 'log_link_visit_action.custom_float'
-        );
         $segments[] = array(
             'type'           => 'metric',
             'category'       => Piwik::translate('General_Visit'),
@@ -71,5 +63,24 @@ class Events extends Plugin
             'sqlSegment'     => 'log_visit.visit_total_events',
             'acceptedValues' => 'To select all visits who triggered an Event, use: &segment=events>0',
         );
+        $segments[] = array(
+            'type'       => 'metric',
+            'category'   => 'Events_Events',
+            'name'       => 'Events_EventValue',
+            'segment'    => 'eventValue',
+            'sqlSegment' => 'log_link_visit_action.custom_float',
+            'sqlFilter'  => '\\Piwik\\Plugins\\Events\\Events::getSegmentEventValue'
+        );
+    }
+
+    public static function getSegmentEventValue($valueToMatch, $sqlField, $matchType, $segmentName)
+    {
+        $isNotEvent = \Piwik\Plugins\Actions\Archiver::getWhereClauseActionIsNotEvent();
+        $isEvent = str_replace("IS NULL", "IS NOT NULL", $isNotEvent);
+
+        return array(
+            'SQL' => " $sqlField $matchType ? " . $isEvent,
+            'bind' => $valueToMatch
+        );
     }
 }

plugins/ExamplePlugin/ExamplePlugin.php

@@ -10,12 +10,10 @@
  */
 namespace Piwik\Plugins\ExamplePlugin;
 
-use Piwik\Plugin;
-
 /**
  * @package ExamplePlugin
  */
-class ExamplePlugin extends Plugin
+class ExamplePlugin extends \Piwik\Plugin
 {
     /**
      * @see Piwik\Plugin::getListHooksRegistered

plugins/ExampleVisualization/ExampleVisualization.php

@@ -10,12 +10,10 @@
  */
 namespace Piwik\Plugins\ExampleVisualization;
 
-use Piwik\Plugin;
-
 /**
  * @package ExampleVisualization
  */
-class ExampleVisualization extends Plugin
+class ExampleVisualization extends \Piwik\Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered

tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php

@@ -59,6 +59,7 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomEvents extends Test_Piwik_BaseFixtur
     protected function trackMusicPlaying(PiwikTracker $vis)
     {
         $vis->setUrl('http://example.org/webradio');
+        $vis->setGenerationTime(333);
         self::checkResponse($vis->doTrackPageView('Welcome!'));
 
         $this->moveTimeForward($vis, 1);
@@ -96,6 +97,7 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomEvents extends Test_Piwik_BaseFixtur
         // First a pageview so the time on page is tracked properly
         $this->moveTimeForward($vis, 30);
         $vis->setUrl('http://example.org/movies');
+        $vis->setGenerationTime(666);
         self::checkResponse($vis->doTrackPageView('Movie Theater'));
 
         $this->moveTimeForward($vis, 31);

tests/PHPUnit/Integration/CustomEventsTest.php

@@ -71,13 +71,25 @@ class Test_Piwik_Integration_CustomEvents extends IntegrationTestCase
                 'setDateLastN' => false,
                 'testSuffix'   => '_eventCategoryOrNameMatch')
             ),
+
+            // eventAction should not match any page view
             array('Actions.getPageUrls', array(
                 'idSite'       => $idSite1,
                 'date'         => $dateTime,
                 'periods'      => $dayPeriod,
                 'segment'      => "eventAction=@play",
                 'setDateLastN' => false,
-                'testSuffix'   => '_eventActionContainsPlay')
+                'testSuffix'   => '_eventSegmentMatchNoAction')
+            ),
+
+            // eventValue should not match any page view
+            array('Actions.getPageUrls', array(
+                'idSite'       => $idSite1,
+                'date'         => $dateTime,
+                'periods'      => $dayPeriod,
+                'segment'      => "eventValue>0",
+                'setDateLastN' => false,
+                'testSuffix'   => '_eventSegmentMatchNoAction')
             ),
         );
 

tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml

@@ -48,7 +48,7 @@
 				<avg_time_on_page>00:00:00</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0s</avg_time_generation>
+				<avg_time_generation>0.67s</avg_time_generation>
 			</row>
 			<row>
 				<label>/webradio</label>
@@ -57,7 +57,7 @@
 				<avg_time_on_page>00:24:59</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<avg_time_generation>0s</avg_time_generation>
+				<avg_time_generation>0.33s</avg_time_generation>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />

tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml

@@ -6,11 +6,15 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.666</min_time_generation>
+		<max_time_generation>0.666</max_time_generation>
 		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
 		<exit_nb_visits>2</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.666</avg_time_generation>
 		<url>http://example.org/movies</url>
 	</row>
 	<row>
@@ -19,6 +23,9 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>2998</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.333</min_time_generation>
+		<max_time_generation>0.333</max_time_generation>
 		<entry_nb_uniq_visitors>2</entry_nb_uniq_visitors>
 		<entry_nb_visits>2</entry_nb_visits>
 		<entry_nb_actions>30</entry_nb_actions>
@@ -27,6 +34,7 @@
 		<avg_time_on_page>1499</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
+		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://example.org/webradio</url>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml

@@ -5,12 +5,16 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.666</min_time_generation>
+		<max_time_generation>0.666</max_time_generation>
 		<exit_nb_visits>2</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.666</avg_time_generation>
 		<url>http://example.org/movies</url>
 	</row>
 	<row>
@@ -18,6 +22,9 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>2998</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.333</min_time_generation>
+		<max_time_generation>0.333</max_time_generation>
 		<entry_nb_visits>2</entry_nb_visits>
 		<entry_nb_actions>30</entry_nb_actions>
 		<entry_sum_visit_length>7202</entry_sum_visit_length>
@@ -27,6 +34,7 @@
 		<avg_time_on_page>1499</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
+		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://example.org/webradio</url>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml

@@ -8,5 +8,5 @@
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0</avg_time_generation>
+	<avg_time_generation>0.5</avg_time_generation>
 </result>
\ No newline at end of file

tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml

@@ -8,5 +8,5 @@
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0</avg_time_generation>
+	<avg_time_generation>0.5</avg_time_generation>
 </result>
\ No newline at end of file

tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml

@@ -178,6 +178,7 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>1</pageId>
+				<generationTime>0.33s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -324,6 +325,7 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>9</pageId>
+				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -654,6 +656,7 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>21</pageId>
+				<generationTime>0.33s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -800,6 +803,7 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>29</pageId>
+				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />

tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml

@@ -178,6 +178,7 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>1</pageId>
+				<generationTime>0.33s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -324,6 +325,7 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>9</pageId>
+				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -654,6 +656,7 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>21</pageId>
+				<generationTime>0.33s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
@@ -800,6 +803,7 @@
 				<pageIdAction>12</pageIdAction>
 				
 				<pageId>29</pageId>
+				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />