fix: views, visitors count issue

Author: me-shaon

src/Services/AnalyticsService.php

@@ -46,7 +46,7 @@ public function getBaseQuery(array $dateRange, ?string $requestCategory = null):
     public function getSummary($query): array
     {
         $totalViews = (clone $query)->count();
-        $uniqueVisitors = (clone $query)->distinct('visitor_id')->count('visitor_id');
+        $uniqueVisitors = $this->getUniqueVisitorCount($query);
         $uniqueSessions = (clone $query)->distinct('session_id')->count('session_id');
         $avgResponseTime = (clone $query)->avg('response_time');
 
@@ -61,11 +61,7 @@ public function getSummary($query): array
     public function getChartData($query, array $dateRange): array
     {
         $dateExpression = $this->getDateExpression('visited_at');
-
-        // Check if we should use session_id instead of visitor_id for counting
-        $totalRecords = (clone $query)->count();
-        $validVisitorIds = (clone $query)->whereNotNull('visitor_id')->where('visitor_id', '!=', '')->count();
-        $useSessionId = $totalRecords > 0 && ($validVisitorIds / $totalRecords) < 0.5;
+        $useSessionId = $this->shouldUseSessionId($query);
 
         $visitorCountExpression = $useSessionId
             ? 'COUNT(DISTINCT session_id) as visitors'
@@ -294,6 +290,7 @@ protected function getCountriesData($query, bool $withPercentages): array
     public function getOperatingSystems($query, bool $withPercentages = false): array
     {
         $totalVisitors = (clone $query)->distinct('session_id')->count('session_id');
+
         if ($totalVisitors === 0) {
             return [];
         }
@@ -390,6 +387,27 @@ public function getDateExpression(string $column): string
         };
     }
 
+    protected function shouldUseSessionId($query): bool
+    {
+        $totalRecords = (clone $query)->count();
+        if ($totalRecords === 0) {
+            return false;
+        }
+
+        $validVisitorIds = (clone $query)->whereNotNull('visitor_id')->where('visitor_id', '!=', '')->count();
+
+        return ($validVisitorIds / $totalRecords) < 0.5;
+    }
+
+    public function getUniqueVisitorCount($query): int
+    {
+        if ($this->shouldUseSessionId($query)) {
+            return (clone $query)->distinct('session_id')->count('session_id');
+        }
+
+        return (clone $query)->distinct('visitor_id')->count('visitor_id');
+    }
+
     public function getDomainExpression(string $column): string
     {
         $connection = config('request-analytics.database.connection');

src/Services/DashboardAnalyticsService.php

@@ -116,17 +116,7 @@ protected function getAverage(): array
         $baseQuery = $this->getBaseQuery($dateRange);
 
         $totalViews = (clone $baseQuery)->count();
-
-        // Try to count unique visitors by visitor_id, fallback to session_id if visitor_id is mostly null/empty
-        $visitorIdCount = (clone $baseQuery)->whereNotNull('visitor_id')->where('visitor_id', '!=', '')->distinct('visitor_id')->count('visitor_id');
-        $totalRecords = (clone $baseQuery)->count();
-
-        // If less than 50% of records have valid visitor_id, use session_id instead
-        if ($totalRecords > 0 && ($visitorIdCount / $totalRecords) < 0.5) {
-            $uniqueVisitors = (clone $baseQuery)->distinct('session_id')->count('session_id');
-        } else {
-            $uniqueVisitors = (clone $baseQuery)->distinct('visitor_id')->count('visitor_id');
-        }
+        $uniqueVisitors = $this->analyticsService->getUniqueVisitorCount($baseQuery);
 
         // Calculate bounce rate (percentage of sessions with only one page view)
         $tableName = config('request-analytics.database.table', 'request_analytics');