Fix sorting in database query

Author: sgiehl

plugins/BotTracking/RecordBuilders/AIAssistantReports.php

@@ -219,7 +219,7 @@ private function queryBotRequests(LogAggregator $logAggregator, int $actionType)
                AND log_action.type = %d
                AND %s
              GROUP BY bot.bot_name, url WITH ROLLUP) AS rollupQuery
-             ORDER BY bot_name, requests DESC, url",
+             ORDER BY requests DESC, bot_name, url",
             BotRequestsDao::getPrefixedTableName(),
             Common::prefixTable('log_action'),
             $actionType,

plugins/BotTracking/tests/Fixtures/BotTraffic.php

@@ -77,6 +77,7 @@ private function trackBotRequests(): void
                 ['ChatGPT-User/1.0', $pages[1], 500, 25896, false],
                 ['ChatGPT-User/1.0', $downloads[1], 200, 33658, true],
                 ['Perplexity-User/1.0', $pages[2], 200, 36985, false],
+                ['Perplexity-User/1.0', $pages[2], 200, 36985, false],
                 ['MistralAI-User/2.0', $pages[3], 200, 85236, false],
                 ['Claude-User/3.0', $downloads[3], 200, 12456, true],
                 ['Claude-User/3.0', $downloads[4], 200, 35562, true],

plugins/BotTracking/tests/System/expected/test_ranking_limit_documents__BotTracking.getAIAssistantRequests_day.xml

@@ -15,9 +15,9 @@
 	</row>
 	<row>
 		<label>Perplexity-User</label>
-		<requests>1</requests>
+		<requests>2</requests>
 		<document_requests>0</document_requests>
-		<page_requests>1</page_requests>
+		<page_requests>2</page_requests>
 		<visits_acquired>1</visits_acquired>
 	</row>
 	<row>

plugins/BotTracking/tests/System/expected/test_ranking_limit_documents__BotTracking.getAIAssistantRequests_week.xml

@@ -2,9 +2,9 @@
 <result>
 	<row>
 		<label>Perplexity-User</label>
-		<requests>5</requests>
+		<requests>6</requests>
 		<document_requests>4</document_requests>
-		<page_requests>1</page_requests>
+		<page_requests>2</page_requests>
 		<visits_acquired>2</visits_acquired>
 		<subtable>
 			<row>

plugins/BotTracking/tests/System/expected/test_ranking_limit_pages__BotTracking.getAIAssistantRequests_day.xml

@@ -15,10 +15,16 @@
 	</row>
 	<row>
 		<label>Perplexity-User</label>
-		<requests>1</requests>
+		<requests>2</requests>
 		<document_requests>0</document_requests>
-		<page_requests>1</page_requests>
+		<page_requests>2</page_requests>
 		<visits_acquired>1</visits_acquired>
+		<subtable>
+			<row>
+				<label>example.com/article-3</label>
+				<requests>2</requests>
+			</row>
+		</subtable>
 	</row>
 	<row>
 		<label>Claude-User</label>
@@ -39,7 +45,7 @@
 				<requests>1</requests>
 			</row>
 			<row>
-				<label>example.com/article-4</label>
+				<label>Others</label>
 				<requests>1</requests>
 			</row>
 		</subtable>

plugins/BotTracking/tests/System/expected/test_ranking_limit_pages__BotTracking.getAIAssistantRequests_week.xml

@@ -19,10 +19,16 @@
 	</row>
 	<row>
 		<label>Perplexity-User</label>
-		<requests>6</requests>
+		<requests>7</requests>
 		<document_requests>5</document_requests>
-		<page_requests>1</page_requests>
+		<page_requests>2</page_requests>
 		<visits_acquired>2</visits_acquired>
+		<subtable>
+			<row>
+				<label>example.com/article-3</label>
+				<requests>2</requests>
+			</row>
+		</subtable>
 	</row>
 	<row>
 		<label>ChatGPT-User</label>