From 107147670f46b234afadefe82e0c384b10c41279 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Thu, 1 Dec 2016 12:57:37 +1300
Subject: New visit dimension  "total interactions" and new action dimension
 "Interaction position"  and corresponding segments (#10911)

* adding new interaction segments
* add possibility to limit queries
* fix Piwik does not join correctly if 2 custom joins require each other
* added position to api output
* Contents plugin: Rename "Interaction" metric to "Content Interaction"
---
 .../expected/test___Live.getVisitorProfile.xml     | 24 +++++++++++-
 .../test_higherLimit__Live.getVisitorProfile.xml   | 44 +++++++++++++++++++++-
 2 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'plugins/Live/tests/System')

diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 5a85f3d795..53edd3b829 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -45,14 +45,14 @@
 	<firstVisit>
 		
 		
-		<daysAgo>2148</daysAgo>
+		
 		<referrerType>direct</referrerType>
 		<referralSummary>Direct Entry</referralSummary>
 	</firstVisit>
 	<lastVisit>
 		
 		
-		<daysAgo>2118</daysAgo>
+		
 		<referrerType>direct</referrerType>
 		<referralSummary>Direct Entry</referralSummary>
 	</lastVisit>
@@ -73,6 +73,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>31</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -99,6 +100,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -173,6 +175,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>30</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -199,6 +202,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -273,6 +277,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>29</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -299,6 +304,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -373,6 +379,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>28</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -399,6 +406,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -473,6 +481,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>27</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -499,6 +508,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -573,6 +583,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>26</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -599,6 +610,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -673,6 +685,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>25</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -699,6 +712,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -773,6 +787,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>24</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -799,6 +814,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -873,6 +889,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>23</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -899,6 +916,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -973,6 +991,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>22</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -999,6 +1018,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index 135d6e020a..ef8519446f 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -45,14 +45,14 @@
 	<firstVisit>
 		
 		
-		<daysAgo>2148</daysAgo>
+		
 		<referrerType>direct</referrerType>
 		<referralSummary>Direct Entry</referralSummary>
 	</firstVisit>
 	<lastVisit>
 		
 		
-		<daysAgo>2118</daysAgo>
+		
 		<referrerType>direct</referrerType>
 		<referralSummary>Direct Entry</referralSummary>
 	</lastVisit>
@@ -73,6 +73,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>31</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -99,6 +100,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -173,6 +175,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>30</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -199,6 +202,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -273,6 +277,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>29</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -299,6 +304,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -373,6 +379,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>28</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -399,6 +406,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -473,6 +481,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>27</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -499,6 +508,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -573,6 +583,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>26</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -599,6 +610,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -673,6 +685,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>25</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -699,6 +712,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -773,6 +787,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>24</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -799,6 +814,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -873,6 +889,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>23</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -899,6 +916,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -973,6 +991,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>22</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -999,6 +1018,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1073,6 +1093,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>21</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1099,6 +1120,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1173,6 +1195,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>20</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1199,6 +1222,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1273,6 +1297,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>19</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1299,6 +1324,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1373,6 +1399,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>18</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1399,6 +1426,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1473,6 +1501,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>17</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1499,6 +1528,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1573,6 +1603,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>16</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1599,6 +1630,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1673,6 +1705,7 @@
 					<pageIdAction>6</pageIdAction>
 					
 					<pageId>15</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1699,6 +1732,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1773,6 +1807,7 @@
 					<pageIdAction>4</pageIdAction>
 					
 					<pageId>14</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1799,6 +1834,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1873,6 +1909,7 @@
 					<pageIdAction>2</pageIdAction>
 					
 					<pageId>13</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1899,6 +1936,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
@@ -1973,6 +2011,7 @@
 					<pageIdAction>7</pageIdAction>
 					
 					<pageId>12</pageId>
+					<interactionPosition>1</interactionPosition>
 					<icon />
 					
 				</row>
@@ -1999,6 +2038,7 @@
 			<visitDurationPretty>0s</visitDurationPretty>
 			<searches>0</searches>
 			<actions>1</actions>
+			<interactions>1</interactions>
 			<referrerType>direct</referrerType>
 			<referrerTypeName>Direct Entry</referrerTypeName>
 			<referrerName />
-- 
cgit v1.2.3