Optimize sitemap performance

Author: JanMikes

src/Controller/SitemapController.php

@@ -4,7 +4,7 @@
 
 namespace SpeedPuzzling\Web\Controller;
 
-use SpeedPuzzling\Web\Query\GetPuzzlesOverview;
+use SpeedPuzzling\Web\Query\GetPuzzleIdsForSitemap;
 use SpeedPuzzling\Web\Value\CountryCode;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -13,8 +13,10 @@
 
 final class SitemapController extends AbstractController
 {
+    private const array LOCALES = ['cs', 'en', 'es', 'ja', 'fr', 'de'];
+
     public function __construct(
-        readonly private GetPuzzlesOverview $getPuzzlesOverview,
+        readonly private GetPuzzleIdsForSitemap $getPuzzleIdsForSitemap,
     ) {
     }
 
@@ -31,20 +33,25 @@ public function __invoke(): Response
         $staticRoutes = ['homepage', 'contact', 'faq', 'ladder', 'ladder_solo_500_pieces', 'ladder_solo_1000_pieces', 'ladder_pairs_500_pieces', 'ladder_pairs_1000_pieces', 'ladder_groups_500_pieces', 'ladder_groups_1000_pieces', 'privacy_policy', 'puzzles', 'players', 'recent_activity', 'terms_of_service', 'hub', 'events'];
 
         foreach ($staticRoutes as $route) {
-            foreach (['cs', 'en', 'es', 'ja', 'fr', 'de'] as $locale) {
+            foreach (self::LOCALES as $locale) {
                 $urls[$route][$locale] = $this->generateUrl($route, ['_locale' => $locale], UrlGeneratorInterface::ABSOLUTE_URL);
             }
         }
 
-        foreach (['cs', 'en', 'es', 'ja', 'fr', 'de'] as $locale) {
-            foreach ($this->getPuzzlesOverview->allApprovedOrAddedByPlayer(null) as $puzzles) {
-                $urls[$puzzles->puzzleId][$locale] = $this->generateUrl('puzzle_detail', [
+        // Fetch puzzle IDs once (not inside locale loop!)
+        $puzzleIds = $this->getPuzzleIdsForSitemap->allApproved();
+
+        foreach ($puzzleIds as $puzzleId) {
+            foreach (self::LOCALES as $locale) {
+                $urls[$puzzleId][$locale] = $this->generateUrl('puzzle_detail', [
                     '_locale' => $locale,
-                    'puzzleId' => $puzzles->puzzleId,
+                    'puzzleId' => $puzzleId,
                 ], UrlGeneratorInterface::ABSOLUTE_URL);
             }
+        }
 
-            foreach (CountryCode::cases() as $countryCode) {
+        foreach (CountryCode::cases() as $countryCode) {
+            foreach (self::LOCALES as $locale) {
                 $urls['players_per_country_' . $countryCode->name][$locale] = $this->generateUrl('players_per_country', [
                     '_locale' => $locale,
                     'countryCode' => $countryCode->name,
@@ -53,9 +60,13 @@ public function __invoke(): Response
         }
 
         $response = new Response(headers: [
-            'Content-Type', 'text/xml',
+            'Content-Type' => 'text/xml',
         ]);
 
+        // Cache for 6 hours - sitemap doesn't need real-time updates
+        $response->setSharedMaxAge(21600);
+        $response->setMaxAge(3600);
+
         return $this->render('sitemap.xml.twig', [
             'urls' => $urls,
         ], $response);

src/Query/GetPuzzleIdsForSitemap.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SpeedPuzzling\Web\Query;
+
+use Doctrine\DBAL\Connection;
+
+readonly final class GetPuzzleIdsForSitemap
+{
+    public function __construct(
+        private Connection $database,
+    ) {
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function allApproved(): array
+    {
+        $query = <<<SQL
+SELECT puzzle.id
+FROM puzzle
+WHERE puzzle.approved = true
+SQL;
+
+        /** @var array<string> $puzzleIds */
+        $puzzleIds = $this->database
+            ->executeQuery($query)
+            ->fetchFirstColumn();
+
+        return $puzzleIds;
+    }
+}