From 88bee8c7ab48b043067672f5aa8657ff6fc6d37f Mon Sep 17 00:00:00 2001
From: Josef Citrine <josefcitrine@googlemail.com>
Date: Wed, 4 May 2016 00:50:59 +0100
Subject: [PATCH] Laravel-ised queries

---
 .../Controllers/Api/Web/StatsController.php   | 42 +++++++------------
 .../app/controllers/track-stats.coffee        | 10 ++---
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/Api/Web/StatsController.php b/app/Http/Controllers/Api/Web/StatsController.php
index fb6e0c49..4415703f 100644
--- a/app/Http/Controllers/Api/Web/StatsController.php
+++ b/app/Http/Controllers/Api/Web/StatsController.php
@@ -30,23 +30,15 @@ use Carbon\Carbon;
 
 class StatsController extends ApiControllerBase
 {
-    private function pluralise($count, $singular, $plural = false)
-    {
-        if (!$plural) $plural = $singular . 's';
-
-        return ($count == 1 ? $singular : $plural) ;
-    }
-
     public function getTrackStatsHourly($id)
     {
-        // I know, raw SQL ugh. I'm not used to laravel's query system
-        $query = DB::select(DB::raw('
-            SELECT TIMESTAMP(created_at) AS `time`, COUNT(1) AS `plays`
-            FROM `resource_log_items`
-            WHERE `track_id` = :id AND `log_type` = 3 AND `created_at` > now() - INTERVAL 1 DAY
-            GROUP BY TIMESTAMP(created_at);'), array(
-            'id' => $id
-        ));
+        $query = DB::table('resource_log_items')
+            ->selectRaw('created_at AS time, COUNT(1) AS `plays`')
+            ->where('track_id', '=', $id)
+            ->where('log_type', '=', 3)
+            ->whereRaw('`created_at` > now() - INTERVAL 1 DAY')
+            ->groupBy('created_at')
+            ->get();
 
         $now = Carbon::now();
         $calcArray = array();
@@ -76,7 +68,7 @@ class StatsController extends ApiControllerBase
 
         // Covert calcArray into output we can understand
         foreach($calcArray as $hour => $plays) {
-            $set = array('hour' => $hour . ' ' . $this->pluralise($hour, 'hour', 'hours'), 'plays' => $plays);
+            $set = array('hour' => $hour . ' ' . str_plural('hour', $hour), 'plays' => $plays);
             array_push($output, $set);
         }
 
@@ -85,15 +77,13 @@ class StatsController extends ApiControllerBase
 
     public function getTrackStatsDaily($id)
     {
-        // I know, raw SQL ugh. I'm not used to laravel's query system
-        // Only go back 1 month for daily stuff, may change in the future
-        $query = DB::select(DB::raw('
-            SELECT TIMESTAMP(created_at) AS `time`, COUNT(1) AS `plays`
-            FROM `resource_log_items`
-            WHERE `track_id` = :id AND `log_type` = 3 AND `created_at` > now() - INTERVAL 1 MONTH
-            GROUP BY TIMESTAMP(created_at);'), array(
-            'id' => $id
-        ));
+        $query = DB::table('resource_log_items')
+            ->selectRaw('created_at AS time, COUNT(1) AS `plays`')
+            ->where('track_id', '=', $id)
+            ->where('log_type', '=', 3)
+            ->whereRaw('`created_at` > now() - INTERVAL 1 MONTH')
+            ->groupBy('created_at')
+            ->get();
 
         $now = Carbon::now();
         $calcArray = array();
@@ -123,7 +113,7 @@ class StatsController extends ApiControllerBase
 
         // Covert calcArray into output we can understand
         foreach($calcArray as $days => $plays) {
-            $set = array('days' => $days . ' ' . $this->pluralise($days, 'day', 'days'), 'plays' => $plays);
+            $set = array('days' => $days . ' ' . str_plural('day', $days), 'plays' => $plays);
             array_push($output, $set);
         }
 
diff --git a/resources/assets/scripts/app/controllers/track-stats.coffee b/resources/assets/scripts/app/controllers/track-stats.coffee
index f697a904..6a285d98 100644
--- a/resources/assets/scripts/app/controllers/track-stats.coffee
+++ b/resources/assets/scripts/app/controllers/track-stats.coffee
@@ -22,7 +22,7 @@ module.exports = angular.module('ponyfm').controller 'track-stats', [
 
         labelArray = []
         dailyArray = []
-        cumArray = []
+        cumulativeArray = []
 
         statsLoaded = (stats) ->
             console.log(stats)
@@ -34,13 +34,13 @@ module.exports = angular.module('ponyfm').controller 'track-stats', [
             i = 0
             while i < dailyArray.length
                 if i == 0
-                    cumArray[i] = dailyArray[0]
+                    cumulativeArray[i] = dailyArray[0]
                 else
-                    cumArray[i] = cumArray[i - 1] + dailyArray[i]
+                    cumulativeArray[i] = cumulativeArray[i - 1] + dailyArray[i]
                 i++
 
             $scope.playsLabels = labelArray
-            $scope.playsData = cumArray
+            $scope.playsData = cumulativeArray
             $scope.colours = ['#B885BD']
             $scope.series = ['Plays']
             $scope.totalSelected = true
@@ -48,7 +48,7 @@ module.exports = angular.module('ponyfm').controller 'track-stats', [
             $scope.dailyText = stats.type
 
         $scope.totalClick = () ->
-            $scope.playsData = cumArray
+            $scope.playsData = cumulativeArray
             $scope.totalSelected = true
 
         $scope.dailyClick = () ->