wip: working tv season & episode monitors

migrations/Version20250610222503.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250610222503 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor ADD parent_id INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor ADD CONSTRAINT FK_E1159985727ACA70 FOREIGN KEY (parent_id) REFERENCES monitor (id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_E1159985727ACA70 ON monitor (parent_id)
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor DROP FOREIGN KEY FK_E1159985727ACA70
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP INDEX IDX_E1159985727ACA70 ON monitor
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor DROP parent_id
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
+        SQL);
+    }
+}

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -5,10 +5,13 @@ namespace App\Monitor\Action\Handler;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MonitorOptionEvaluator;
+use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use OneToMany\RichBundle\Contract\CommandInterface;
@@ -27,12 +30,26 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
+        private Tmdb $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
         $monitor = $this->monitorRepository->find($command->movieMonitorId);
+
+        $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
+            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
+            return new MonitorTvEpisodeResult(
+                status: 'OK',
+                result: [
+                    'message' => 'No change',
+                    'monitor' => $monitor,
+                ]
+            );
+        }
+
         $monitor->setStatus('In Progress');
         $this->monitorRepository->getEntityManager()->flush();
 
@@ -71,7 +88,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
         $this->entityManager->flush();
 
-        return new MonitorMovieResult(
+        return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,9 +3,9 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Action\Command\MonitorTvSeasonCommand;
+use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,16 +17,14 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
-/** @implements HandlerInterface<MonitorMovieCommand> */
+/** @implements HandlerInterface<MonitorTvSeasonCommand> */
 readonly class MonitorTvSeasonHandler implements HandlerInterface
 {
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
-        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
@@ -46,54 +44,62 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())
+            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
-                ->episodes[$monitor->getSeason()]
         )->rekey(fn($episode) => $episode['episode_number']);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 
-        // Dispatch Episode commands for each missing Episode
+        if ($downloadedEpisodes->count() !== $episodesInSeason->count()) {
-        foreach ($episodesInSeason as $episode) {
+            // Since $monitor has children monitors, set the status
-            $monitorCheck = $this->monitorRepository->findOneBy([
+            // to Active, so it will be re-executed.
-                'imdbId' => $monitor->getImdbId(),
+            $monitor->setStatus('Active');
-                'title' => $monitor->getTitle(),
-                'monitorType' => 'tvepisode',
-                'season' => $monitor->getSeason(),
-                'episode' => $episode['episode_number'],
-                'status' => ['New', 'Active', 'In Progress']
-            ]);
 
-            $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
+            // Dispatch Episode commands for each missing Episode
+            foreach ($episodesInSeason as $episode) {
+                $monitorCheck = $this->monitorRepository->findOneBy([
+                    'imdbId' => $monitor->getImdbId(),
+                    'title' => $monitor->getTitle(),
+                    'monitorType' => 'tvepisode',
+                    'season' => $monitor->getSeason(),
+                    'episode' => $episode['episode_number'],
+                    'status' => ['New', 'Active', 'In Progress']
+                ]);
 
-            if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
+                $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
-                && null === $monitorCheck
-            ) {
-                $episodeMonitor = (new Monitor())
-                    ->setUser($monitor->getUser())
-                    ->setTmdbId($monitor->getTmdbId())
-                    ->setImdbId($monitor->getImdbId())
-                    ->setTitle($monitor->getTitle())
-                    ->setMonitorType('tvepisode')
-                    ->setSeason($monitor->getSeason())
-                    ->setEpisode($episode['episode_number'])
-                    ->setCreatedAt(new DateTimeImmutable())
-                    ->setSearchCount(0)
-                    ->setStatus('New');
 
-                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+                if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
-                $this->monitorRepository->getEntityManager()->flush();
+                    && null === $monitorCheck
+                ) {
+                    $episodeMonitor = (new Monitor())
+                        ->setParent($monitor)
+                        ->setUser($monitor->getUser())
+                        ->setTmdbId($monitor->getTmdbId())
+                        ->setImdbId($monitor->getImdbId())
+                        ->setTitle($monitor->getTitle())
+                        ->setMonitorType('tvepisode')
+                        ->setSeason($monitor->getSeason())
+                        ->setEpisode($episode['episode_number'])
+                        ->setCreatedAt(new DateTimeImmutable())
+                        ->setSearchCount(0)
+                        ->setStatus('New');
 
-                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                    $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
-                $this->monitorTvEpisodeHandler->handle($command);
+                    $this->monitorRepository->getEntityManager()->flush();
-                $this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+
+                    $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                    $this->monitorTvEpisodeHandler->handle($command);
+                    $this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                }
             }
+        } else {
+            $monitor->setStatus('Complete');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $monitor->setStatus('Complete');
+
         $this->entityManager->flush();
 
-        return new MonitorMovieResult(
+        return new MonitorTvSeasonResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -5,7 +5,7 @@ namespace App\Monitor\Action\Handler;
 use Aimeos\Map;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Result\MonitorTvEpisodeResult;
+use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,7 +17,6 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<MonitorMovieCommand> */
 readonly class MonitorTvShowHandler implements HandlerInterface
@@ -25,8 +24,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
+        private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
-        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
     ) {}
@@ -44,46 +43,61 @@ readonly class MonitorTvShowHandler implements HandlerInterface
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())
+            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
-                ->episodes
         )->flat(1);
-        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
+        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
-        // Dispatch Episode commands for each missing Episode
+        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
-        foreach ($episodesInShow as $episode) {
+            // Since $monitor has children monitors, set the status
-            $episodeAlreadyDownloaded = $downloadedEpisodes->find(
+            // to Active, so it will be re-executed.
-                fn($ep) => $ep->episode === $episode['episode_number'] && $ep->season === $episode['season_number']
+            $monitor->setStatus('Active');
-            );
-            $episodeAlreadyDownloaded = !is_null($episodeAlreadyDownloaded);
 
-            if (false === $episodeAlreadyDownloaded) {
+            // Dispatch Episode commands for each missing Episode
-                $monitor = (new Monitor())
+            foreach ($episodesInShow as $episode) {
-                    ->setUser($monitor->getUser())
+                $monitorCheck = $this->monitorRepository->findOneBy([
-                    ->setTmdbId($monitor->getTmdbId())
+                    'imdbId' => $monitor->getImdbId(),
-                    ->setImdbId($monitor->getImdbId())
+                    'title' => $monitor->getTitle(),
-                    ->setTitle($monitor->getTitle())
+                    'monitorType' => 'tvepisode',
-                    ->setMonitorType('tvshow')
+                    'season' => $monitor->getSeason(),
-                    ->setSeason($episode['season_number'])
+                    'episode' => $episode['episode_number'],
-                    ->setEpisode($episode['episode_number'])
+                    'status' => ['New', 'Active', 'In Progress']
-                    ->setCreatedAt(new DateTimeImmutable())
+                ]);
-                    ->setSearchCount(0)
-                    ->setStatus('New');
 
-                $this->monitorRepository->getEntityManager()->persist($monitor);
+                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
-                $this->monitorRepository->getEntityManager()->flush();
 
-                $command = new MonitorTvEpisodeCommand($monitor->getId());
+                if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
-                $this->bus->dispatch($command);
+                    && null === $monitorCheck
-                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                ) {
+                    $episodeMonitor = (new Monitor())
+                        ->setParent($monitor)
+                        ->setUser($monitor->getUser())
+                        ->setTmdbId($monitor->getTmdbId())
+                        ->setImdbId($monitor->getImdbId())
+                        ->setTitle($monitor->getTitle())
+                        ->setMonitorType('tvepisode')
+                        ->setSeason($monitor->getSeason())
+                        ->setEpisode($episode['episode_number'])
+                        ->setCreatedAt(new DateTimeImmutable())
+                        ->setSearchCount(0)
+                        ->setStatus('New');
+
+                    $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+                    $this->monitorRepository->getEntityManager()->flush();
+
+                    $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                    $this->monitorTvEpisodeHandler->handle($command);
+                    $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                }
             }
+        } else {
+            $monitor->setStatus('Complete');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $monitor->setStatus('Complete');
         $this->entityManager->flush();
 
-        return new MonitorTvEpisodeResult(
+        return new MonitorTvShowResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,

src/Monitor/Action/Result/MonitorTvSeasonResult.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Monitor\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class MonitorTvSeasonResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+        public array $result,
+    ) {}
+}

src/Monitor/Action/Result/MonitorTvShowResult.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Monitor\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class MonitorTvShowResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+        public array $result,
+    ) {}
+}

src/Monitor/Framework/Entity/Monitor.php

@@ -4,6 +4,8 @@ namespace App\Monitor\Framework\Entity;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Ignore;
@@ -56,6 +58,17 @@ class Monitor
     #[ORM\Column(nullable: true)]
     private ?\DateTimeImmutable $downloadedAt = null;
 
+    #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
+    private ?self $parent = null;
+
+    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
+    private Collection $children;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -204,4 +217,46 @@ class Monitor
 
         return $this;
     }
+
+    public function getParent(): ?self
+    {
+        return $this->parent;
+    }
+
+    public function setParent(?self $parent): static
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, self>
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function addChild(self $child): static
+    {
+        if (!$this->children->contains($child)) {
+            $this->children->add($child);
+            $child->setParent($this);
+        }
+
+        return $this;
+    }
+
+    public function removeChild(self $child): static
+    {
+        if ($this->children->removeElement($child)) {
+            // set the owning side to null (unless already changed)
+            if ($child->getParent() === $this) {
+                $child->setParent(null);
+            }
+        }
+
+        return $this;
+    }
 }