fix: views and visitor count issue

Author: me-shaon

src/Services/AnalyticsService.php

@@ -62,11 +62,20 @@ 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;
+
+        $visitorCountExpression = $useSessionId
+            ? 'COUNT(DISTINCT session_id) as visitors'
+            : 'COUNT(DISTINCT visitor_id) as visitors';
+
         $data = (clone $query)
             ->select(
                 DB::raw("{$dateExpression} as date"),
                 DB::raw('COUNT(*) as views'),
-                DB::raw('COUNT(DISTINCT visitor_id) as visitors')
+                DB::raw($visitorCountExpression)
             )
             ->groupBy(DB::raw($dateExpression))
             ->orderBy('date')

src/Services/DashboardAnalyticsService.php

@@ -115,8 +115,18 @@ protected function getAverage(): array
         $startDate = $dateRange['start'];
         $baseQuery = $this->getBaseQuery($dateRange);
 
-        $totalViews = $baseQuery->count();
-        $uniqueVisitors = $baseQuery->distinct('visitor_id')->count('visitor_id');
+        $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');
+        }
 
         // Calculate bounce rate (percentage of sessions with only one page view)
         $tableName = config('request-analytics.database.table', 'request_analytics');