feat: more work on completing switchover

site/app/Http/Controllers/PageController.php

@@ -4,28 +4,51 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use App\Models\Artwork;
 use App\Models\Artist;
 use App\Models\Episode;
 
+
 class PageController extends Controller
 {
-    public function landing()
+    public function landing(Request $request)
     {
         $user = auth()->user();
         $headerCounters = $this->getHeaderCounters();
         $recentEpisodes = $this->mostRecentEpisodes();
+        $recentSubmissions = $this->mostRecentSubmissions();
+        $leaderboard = $this->leaderboardTwelveMonths();
+
         return view('home.page', [
             'user' => $user,
+            'pageTitle' => 'Home',
             'headerCounters' => $headerCounters,
             'recentEpisodes' => $recentEpisodes,
+            'recentSubmissions' => $recentSubmissions,
+            'leaderboard' => $leaderboard,
+            'preferredTheme' => $request->session()->get('preferred_theme') ?? 'dark',
         ]);
     }
 
+    private function mostRecentSubmissions() {
+        $artworks = Cache::remember('latestSubmissions', 30, function() {
+            return Artwork::whereNotNull('approved_by')
+                ->with('artist')
+                ->with('episode')
+                ->with('podcast')
+                ->orderBy('created_at', 'desc')
+                ->limit(50)
+                ->get();
+        });
+        return $artworks;
+    }
+
     private function mostRecentEpisodes()
     {
         $episodes = Cache::remember('latestEpisodes', 30, function() {
             return Episode::where('published', true)
+                ->whereHas('artwork')
                 ->with('podcast')
                 ->with('artwork')
                 ->with('artwork.artist')
@@ -39,7 +62,7 @@ class PageController extends Controller
     private function getHeaderCounters()
     {
         $headerCounters = [];
-        $artworkCountNumber = Cache::remember('artworkCountNumber', 10, function() { 
+        $artworkCountNumber = Cache::remember('artworkCountNumber', 10, function() {
             return Artwork::all()->count();
         });
         $artistCountNumber = Cache::remember('artistCountNumber', 10, function() {
@@ -60,7 +83,7 @@ class PageController extends Controller
             $number /= 1000;
         }
         return [
-            'number' => $this->numberFormatPrecision($number, 1), //number_format(floatval($number), 1), 
+            'number' => $this->numberFormatPrecision($number, 1), //number_format(floatval($number), 1),
             'unit' => $units[$i],
         ];
     }
@@ -76,4 +99,46 @@ class PageController extends Controller
         return $response;
     }
 
+    private function leaderboardTwelveMonths() {
+        $endDate = now()->endOfDay()->subYear()->format('Y-m-d');
+        $leaderboard = DB::table('episodes')
+            ->join('artworks', 'artworks.id', '=', 'episodes.artwork_id')
+            ->join('artists', 'artists.id', '=', 'artworks.artist_id')
+            ->select([
+                DB::raw('artists.id as artistId'),
+                DB::raw('artists.name as artistName'),
+                DB::raw('count(artworks.id) as artworkCount')
+            ])
+            ->where('episodes.published', 1)
+            ->where('episodes.episode_date', '>=', $endDate)
+            ->groupBy('artistId')
+            ->orderByDesc('artworkCount')
+            ->limit(10)
+            ->get();
+        $leaderboard = $this->addArtistModelToLeaderboard($leaderboard);
+        return $leaderboard;
+    }
+
+    private function addArtistModelToLeaderboard($leaderboard) {
+        $artistIds = [];
+        foreach ($leaderboard as $lb) {
+            $artistIds[] = $lb->artistId;
+        }
+        $artists = Artist::whereIn('id', $artistIds)->get();
+        foreach ($leaderboard as $lb) {
+            $lb->artist = $artists->where('id', $lb->artistId)->first();
+        }
+        $p = 0;
+        foreach ($leaderboard as $lb) {
+            $p++;
+            $lb->position = $p;
+        }
+        return $leaderboard;
+    }
+
+    public function setSessionTheme(Request $request) {
+
+
+    }
+
 }