From 2823e037931f49e266aa08d3c2aab904f9fa5d29 Mon Sep 17 00:00:00 2001
From: Russ Long <rl@tfmm.co>
Date: Mon, 19 May 2025 12:14:14 -0400
Subject: [PATCH] update judging categories

---
 app/Console/Commands/TabulateWinners.php | 44 ++++++++++++------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/Console/Commands/TabulateWinners.php b/app/Console/Commands/TabulateWinners.php
index a403cec..7d6159d 100644
--- a/app/Console/Commands/TabulateWinners.php
+++ b/app/Console/Commands/TabulateWinners.php
@@ -118,52 +118,52 @@ class TabulateWinners extends Command
             return $zeroTo43Query->vehicle;
         }
 
-        function fortyThreeToSixtySevenWinner()
+        function fortyThreeToSixtyEightWinner()
         {
-            $fortyThreeToSixtySevenQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
+            $fortyThreeToSixtyEightQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
                 ->groupBy('vehicles.id')
                 ->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
                 ->whereNotIn('vehicle_scores.vehicle', function($query){
                     $query->select('vehicle')->from('car_show_winners');
                 })
                 ->where('vehicles.year', '>=', 1943)
-                ->where('vehicles.year', '<=', 1967)
+                ->where('vehicles.year', '<=', 1968)
                 ->where('vehicles.doNotJudge', '=', 0)
                 ->orderBy('totalscore','desc')
                 ->first();
-            return $fortyThreeToSixtySevenQuery->vehicle;
+            return $fortyThreeToSixtyEightQuery->vehicle;
         }
 
-        function sixtyEightToNinetyEightWinner()
+        function sixtyNineToNinetyNineWinner()
         {
-            $sixtyEightToNinetyEightQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
+            $sixtyNineToNinetyNineQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
                 ->groupBy('vehicles.id')
                 ->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
                 ->whereNotIn('vehicle_scores.vehicle', function($query){
                     $query->select('vehicle')->from('car_show_winners');
                 })
-                ->where('vehicles.year', '>=', 1968)
-                ->where('vehicles.year', '<=', 1998)
+                ->where('vehicles.year', '>=', 1969)
+                ->where('vehicles.year', '<=', 1999)
                 ->where('vehicles.doNotJudge', '=', 0)
                 ->orderBy('totalscore','desc')
                 ->first();
-            return $sixtyEightToNinetyEightQuery->vehicle;
+            return $sixtyNineToNinetyNineQuery->vehicle;
         }
 
-        function NinetyNineToCurrentWinner()
+        function TwoThousandToCurrentWinner()
         {
-            $NinetyNineToCurrentQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
+            $TwoThousandToCurrentQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
                 ->groupBy('vehicles.id')
                 ->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
                 ->whereNotIn('vehicle_scores.vehicle', function($query){
                     $query->select('vehicle')->from('car_show_winners');
                 })
-                ->where('vehicles.year', '>=', 1999)
+                ->where('vehicles.year', '>=', 2000)
                 //->where('vehicles.year', '<=', 1997)
                 ->where('vehicles.doNotJudge', '=', 0)
                 ->orderBy('totalscore','desc')
                 ->first();
-            return $NinetyNineToCurrentQuery->vehicle;
+            return $TwoThousandToCurrentQuery->vehicle;
         }
 
         // Truncate table first
@@ -226,7 +226,7 @@ class TabulateWinners extends Command
                     'place' => 'first'
                 ],
                 [
-                    'vehicle' => fortyThreeToSixtySevenWinner()
+                    'vehicle' => fortyThreeToSixtyEightWinner()
                 ]
             );
         CarShowWinner::updateOrCreate(
@@ -235,7 +235,7 @@ class TabulateWinners extends Command
                     'place' => 'second'
                 ],
                 [
-                    'vehicle' => fortyThreeToSixtySevenWinner()
+                    'vehicle' => fortyThreeToSixtyEightWinner()
                 ]
             );  
         CarShowWinner::updateOrCreate(
@@ -244,7 +244,7 @@ class TabulateWinners extends Command
                     'place' => 'third'
                 ],
                 [
-                    'vehicle' => fortyThreeToSixtySevenWinner()
+                    'vehicle' => fortyThreeToSixtyEightWinner()
                 ]
             );  
 
@@ -255,7 +255,7 @@ class TabulateWinners extends Command
                 'place' => 'first'
             ],
             [
-                'vehicle' => sixtyEightToNinetyEightWinner()
+                'vehicle' => sixtyNineToNinetyNineWinner()
             ]
         );
         CarShowWinner::updateOrCreate(
@@ -264,7 +264,7 @@ class TabulateWinners extends Command
                 'place' => 'second'
             ],
             [
-                'vehicle' => sixtyEightToNinetyEightWinner()
+                'vehicle' => sixtyNineToNinetyNineWinner()
             ]
         );  
         CarShowWinner::updateOrCreate(
@@ -273,7 +273,7 @@ class TabulateWinners extends Command
                 'place' => 'third'
             ],
             [
-                'vehicle' => sixtyEightToNinetyEightWinner()
+                'vehicle' => sixtyNineToNinetyNineWinner()
             ]
         );  
 
@@ -284,7 +284,7 @@ class TabulateWinners extends Command
                 'place' => 'first'
             ],
             [
-                'vehicle' => NinetyNineToCurrentWinner()
+                'vehicle' => TwoThousandToCurrentWinner()
             ]
         );
         CarShowWinner::updateOrCreate(
@@ -293,7 +293,7 @@ class TabulateWinners extends Command
                 'place' => 'second'
             ],
             [
-                'vehicle' => NinetyNineToCurrentWinner()
+                'vehicle' => TwoThousandToCurrentWinner()
             ]
         );  
         CarShowWinner::updateOrCreate(
@@ -302,7 +302,7 @@ class TabulateWinners extends Command
                 'place' => 'third'
             ],
             [
-                'vehicle' => NinetyNineToCurrentWinner()
+                'vehicle' => TwoThousandToCurrentWinner()
             ]
         );  
     }