Fix: the groupBy() method works improperly when combined with WHERE

voerro · Feb 9, 2018 · 020f8bb · 020f8bb
1 parent ffd96ab
commit 020f8bb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Controllers/StatisticsController.php b/src/Controllers/StatisticsController.php
@@ -134,8 +134,8 @@ protected function groupedVisits($view, $groupBy, $subtitle)
                 ->visits()
                 ->withUsers()
                 ->latest()
-                ->groupBy($groupBy)
                 ->except(['ajax', 'bots', 'login_attempts'])
+                ->groupBy($groupBy)
                 ->paginate(config('visitortracker.results_per_page', 15)),
             'visitortrackerSubtitle' => $subtitle,
         ], $this->viewSettings()));

diff --git a/src/VisitStats.php b/src/VisitStats.php
@@ -161,6 +161,8 @@ public function groupBy($field)
 
         $this->sqlSelect .= ', v2.visits_count, v2.visitors_count';
 
+        $where = str_replace('v.', '', $this->sqlWhere());
+
         $this->sql .= "
             JOIN 
                 (
@@ -170,6 +172,8 @@ public function groupBy($field)
                         COUNT(*) AS visits_count,
                         COUNT(DISTINCT ip) AS visitors_count
                     FROM visitortracker_visits
+                    
+                    {$where}
                     GROUP BY {$field}
                 ) v2
                 ON v2.{$field} = v.{$field}

diff --git a/tests/StatsTest.php b/tests/StatsTest.php
@@ -193,9 +193,11 @@ public function testGetVisitsGroupedByCountry()
         $results = VisitStats::query()->visits()->groupBy('country_code')->get();
 
         $this->assertCount(4, $results);
+
         $this->assertEquals(6, $results[0]->visits_count);
-        $this->assertEquals(5, $results[1]->visits_count);
         $this->assertEquals(1, $results[0]->visitors_count);
+
+        $this->assertEquals(5, $results[1]->visits_count);
         $this->assertEquals(1, $results[1]->visitors_count);
     }