wtf

src/Controller/AlbumController.php

@@ -9,6 +9,7 @@ use App\Entity\User;
 use App\Form\ReviewType;
 use App\Form\AlbumType;
 use App\Repository\AlbumRepository;
+use App\Repository\AlbumTrackRepository;
 use App\Repository\ReviewRepository;
 use App\Service\AlbumSearchService;
 use App\Service\ImageStorage;
@@ -89,20 +90,25 @@ class AlbumController extends AbstractController
      * Renders a detailed album view plus inline review form.
      */
     #[Route('/albums/{id}', name: 'album_show', methods: ['GET', 'POST'])]
-    public function show(string $id, Request $request, SpotifyClient $spotify, ReviewRepository $reviewRepo, AlbumRepository $albumRepo, EntityManagerInterface $em): Response
+    public function show(string $id, Request $request, SpotifyClient $spotify, ReviewRepository $reviewRepo, AlbumRepository $albumRepo, AlbumTrackRepository $trackRepo, EntityManagerInterface $em): Response
     {
         $albumEntity = $this->findAlbum($id, $albumRepo);
         $isSaved = $albumEntity !== null;
         if (!$albumEntity) {
-            $spotifyAlbum = $spotify->getAlbum($id);
+            $spotifyAlbum = $spotify->getAlbumWithTracks($id);
             if ($spotifyAlbum === null) {
                 throw $this->createNotFoundException('Album not found');
             }
-            $albumEntity = $albumRepo->upsertFromSpotifyAlbum($spotifyAlbum);
+            $albumEntity = $this->persistSpotifyAlbumPayload($spotifyAlbum, $albumRepo, $trackRepo);
             $em->flush();
+        } else {
+            if ($this->syncSpotifyTracklistIfNeeded($albumEntity, $albumRepo, $trackRepo, $spotify)) {
+                $em->flush();
+            }
         }
         $albumCard = $albumEntity->toTemplateArray();
         $canManage = $this->canManageAlbum($albumEntity);
+        $trackRows = array_map(static fn($track) => $track->toTemplateArray(), $albumEntity->getTracks()->toArray());
 
         $existing = $reviewRepo->findBy(['album' => $albumEntity], ['createdAt' => 'DESC']);
         $count = count($existing);
@@ -137,6 +143,9 @@ class AlbumController extends AbstractController
             'avg' => $avg,
             'count' => $count,
             'form' => $form->createView(),
+            'albumOwner' => $albumEntity->getCreatedBy(),
+            'albumCreatedAt' => $albumEntity->getCreatedAt(),
+            'tracks' => $trackRows,
         ]);
     }
 
@@ -145,7 +154,7 @@ class AlbumController extends AbstractController
      */
     #[IsGranted('ROLE_USER')]
     #[Route('/albums/{id}/save', name: 'album_save', methods: ['POST'])]
-    public function save(string $id, Request $request, SpotifyClient $spotify, AlbumRepository $albumRepo, EntityManagerInterface $em): Response
+    public function save(string $id, Request $request, SpotifyClient $spotify, AlbumRepository $albumRepo, AlbumTrackRepository $trackRepo, EntityManagerInterface $em): Response
     {
         $token = (string) $request->request->get('_token');
         if (!$this->isCsrfTokenValid('save-album-' . $id, $token)) {
@@ -153,11 +162,11 @@ class AlbumController extends AbstractController
         }
         $existing = $albumRepo->findOneBySpotifyId($id);
         if (!$existing) {
-            $spotifyAlbum = $spotify->getAlbum($id);
+            $spotifyAlbum = $spotify->getAlbumWithTracks($id);
             if ($spotifyAlbum === null) {
                 throw $this->createNotFoundException('Album not found');
             }
-            $albumRepo->upsertFromSpotifyAlbum($spotifyAlbum);
+            $this->persistSpotifyAlbumPayload($spotifyAlbum, $albumRepo, $trackRepo);
             $em->flush();
             $this->addFlash('success', 'Album saved.');
         } else {
@@ -267,9 +276,12 @@ class AlbumController extends AbstractController
      */
     private function findAlbum(string $id, AlbumRepository $albumRepo): ?Album
     {
-        return str_starts_with($id, 'u_')
-            ? $albumRepo->findOneByLocalId($id)
-            : $albumRepo->findOneBySpotifyId($id);
+        $local = $albumRepo->findOneByLocalId($id);
+        if ($local instanceof Album) {
+            return $local;
+        }
+
+        return $albumRepo->findOneBySpotifyId($id);
     }
 
     /**
@@ -334,6 +346,51 @@ class AlbumController extends AbstractController
         }
     }
 
+    /**
+     * @param array<string,mixed> $spotifyAlbum
+     */
+    private function persistSpotifyAlbumPayload(array $spotifyAlbum, AlbumRepository $albumRepo, AlbumTrackRepository $trackRepo): Album
+    {
+        $album = $albumRepo->upsertFromSpotifyAlbum($spotifyAlbum);
+        $tracks = $spotifyAlbum['tracks']['items'] ?? [];
+        if (is_array($tracks) && $tracks !== []) {
+            $trackRepo->replaceAlbumTracks($album, $tracks);
+            $album->setTotalTracks(count($tracks));
+        }
+        return $album;
+    }
+
+    private function syncSpotifyTracklistIfNeeded(Album $album, AlbumRepository $albumRepo, AlbumTrackRepository $trackRepo, SpotifyClient $spotify): bool
+    {
+        if ($album->getSource() !== 'spotify') {
+            return false;
+        }
+        $spotifyId = $album->getSpotifyId();
+        if ($spotifyId === null) {
+            return false;
+        }
+        $storedCount = $album->getTracks()->count();
+        $needsSync = $storedCount === 0;
+        if (!$needsSync && $album->getTotalTracks() > 0 && $storedCount !== $album->getTotalTracks()) {
+            $needsSync = true;
+        }
+        if (!$needsSync) {
+            return false;
+        }
+        $spotifyAlbum = $spotify->getAlbumWithTracks($spotifyId);
+        if ($spotifyAlbum === null) {
+            return false;
+        }
+        $albumRepo->upsertFromSpotifyAlbum($spotifyAlbum);
+        $tracks = $spotifyAlbum['tracks']['items'] ?? [];
+        if (!is_array($tracks) || $tracks === []) {
+            return false;
+        }
+        $trackRepo->replaceAlbumTracks($album, $tracks);
+        $album->setTotalTracks(count($tracks));
+        return true;
+    }
+
 }