colgora/Mangarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(manga): merge ChapterRepositoryInterface into MangaRepositoryInterface + pagesDirectory

Browse Source 
- Supprime ChapterRepositoryInterface du domaine Manga (et ses implémentations
  LegacyChapterRepository et InMemoryChapterRepository)
- Déplace toutes les méthodes chapter vers MangaRepositoryInterface avec nommage
  explicite (findChapterById, findVisibleChapterById, updateChapter, deleteChapter, etc.)
- Remplace cbzPath par pagesDirectory + pageCount dans le modèle Chapter
  (transition : toChapterDomain conserve un fallback cbzPath pour les données existantes,
  updateChapter synchronise les deux colonnes jusqu'à la Phase 4)
- Ajoute la migration Doctrine (pages_directory, page_count sur la table chapter)
- Met à jour tous les handlers, listeners, query handlers et state providers du domaine
  Manga pour injecter uniquement MangaRepositoryInterface
- Adapte les tests unitaires et InMemoryMangaRepository avec les nouvelles méthodes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
ext.jeremy.guillot@maxicoffee.domains
2026-03-09 17:54:35 +01:00
parent dae215dd3d
commit c50f1638ee
27 changed files with 410 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Domain/Manga/Application/CommandHandler/DeleteCbzHandler.php
View File

@@ -3,7 +3,7 @@
namespace App\Domain\Manga\Application\CommandHandler;
use App\Domain\Manga\Application\Command\DeleteCbz;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Service\FileServiceInterface;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
use App\Domain\Manga\Domain\Exception\CbzFileNotFoundException;
@@ -15,7 +15,7 @@ use App\Domain\Shared\Domain\Contract\CommandInterface;
readonly class DeleteCbzHandler implements CommandHandlerInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository,
private MangaRepositoryInterface $mangaRepository,
private FileServiceInterface $fileService
) {}
@@ -23,22 +23,16 @@ readonly class DeleteCbzHandler implements CommandHandlerInterface
{
assert($command instanceof DeleteCbz);
$chapter = $this->chapterRepository->findVisibleById($command->chapterId);
$chapter = $this->mangaRepository->findVisibleChapterById($command->chapterId);
if (!$chapter) {
throw new ChapterNotFoundException($command->chapterId);
}
// Check if chapter has a CBZ file
if (!$chapter->isAvailable()) {
throw new CbzFileNotFoundException($command->chapterId);
}
// Delete the physical CBZ file
// Note: We'll need to get the CBZ path from somewhere, likely from a legacy repository
// For now, we'll just mark the chapter as not available
// Update chapter to mark CBZ as not available
$updatedChapter = new Chapter(
new ChapterId($chapter->getId()),
$chapter->getMangaId(),
@@ -47,9 +41,10 @@ readonly class DeleteCbzHandler implements CommandHandlerInterface
$chapter->getVolume(),
$chapter->isVisible(),
null,
0,
$chapter->getCreatedAt()
);
$this->chapterRepository->save($updatedChapter);
$this->mangaRepository->updateChapter($updatedChapter);
}
}

11
src/Domain/Manga/Application/CommandHandler/DeleteChapterHandler.php
View File

@@ -3,7 +3,7 @@
namespace App\Domain\Manga\Application\CommandHandler;
use App\Domain\Manga\Application\Command\DeleteChapter;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
use App\Domain\Manga\Domain\Model\Chapter;
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
@@ -13,14 +13,14 @@ use App\Domain\Shared\Domain\Contract\CommandInterface;
readonly class DeleteChapterHandler implements CommandHandlerInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository
private MangaRepositoryInterface $mangaRepository
) {}
public function handle(CommandInterface $command): void
{
assert($command instanceof DeleteChapter);
$chapter = $this->chapterRepository->findVisibleById($command->chapterId);
$chapter = $this->mangaRepository->findVisibleChapterById($command->chapterId);
if (!$chapter) {
throw new ChapterNotFoundException($command->chapterId);
@@ -33,10 +33,11 @@ readonly class DeleteChapterHandler implements CommandHandlerInterface
title: $chapter->getTitle(),
volume: $chapter->getVolume(),
isVisible: false,
cbzPath: $chapter->getCbzPath(),
pagesDirectory: $chapter->getPagesDirectory(),
pageCount: $chapter->getPageCount(),
createdAt: $chapter->getCreatedAt()
);
$this->chapterRepository->save($updatedChapter);
$this->mangaRepository->updateChapter($updatedChapter);
}
}

8
src/Domain/Manga/Application/CommandHandler/EditMultipleChaptersHandler.php
View File

@@ -3,19 +3,19 @@
namespace App\Domain\Manga\Application\CommandHandler;
use App\Domain\Manga\Application\Command\EditMultipleChapters;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
readonly class EditMultipleChaptersHandler
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository
private MangaRepositoryInterface $mangaRepository
) {}
public function handle(EditMultipleChapters $command): void
{
foreach ($command->chapters as $chapterData) {
$chapter = $this->chapterRepository->findById($chapterData->id);
$chapter = $this->mangaRepository->findChapterById($chapterData->id);
if (!$chapter) {
throw new ChapterNotFoundException($chapterData->id);
@@ -31,7 +31,7 @@ readonly class EditMultipleChaptersHandler
$updatedChapter = $updatedChapter->updateVolume($chapterData->volume);
}
$this->chapterRepository->save($updatedChapter);
$this->mangaRepository->updateChapter($updatedChapter);
}
}
}

22
src/Domain/Manga/Application/CommandHandler/ImportChapterHandler.php
View File

@@ -3,20 +3,17 @@
namespace App\Domain\Manga\Application\CommandHandler;
use App\Domain\Manga\Application\Command\ImportChapter;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
use App\Domain\Manga\Domain\Model\Chapter;
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
use App\Domain\Shared\Domain\Contract\MangaPathManagerInterface;
use Ramsey\Uuid\Uuid;
readonly class ImportChapterHandler
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private ChapterRepositoryInterface $chapterRepository,
private MangaPathManagerInterface $pathManager
) {}
@@ -34,7 +31,7 @@ readonly class ImportChapterHandler
}
// 3. Check if chapter exists
$existingChapter = $this->chapterRepository->findByMangaIdAndChapterNumber(
$existingChapter = $this->mangaRepository->findChapterByMangaIdAndNumber(
$command->mangaId,
$command->chapterNumber
);
@@ -46,7 +43,8 @@ readonly class ImportChapterHandler
// 4. Save the CBZ file to storage using the path manager
$cbzPath = $this->saveCbzFile($command, $manga, $existingChapter);
// 5. Update existing chapter with new CBZ path
// 5. Update existing chapter with new path
// Note: pagesDirectory holds CBZ path during transition; Phase 3 will store individual images
$updatedChapter = new Chapter(
id: new ChapterId($existingChapter->getId()),
mangaId: $existingChapter->getMangaId(),
@@ -54,29 +52,22 @@ readonly class ImportChapterHandler
title: $existingChapter->getTitle(),
volume: $existingChapter->getVolume(),
isVisible: $existingChapter->isVisible(),
cbzPath: $cbzPath,
pagesDirectory: $cbzPath,
pageCount: $existingChapter->getPageCount(),
createdAt: $existingChapter->getCreatedAt()
);
$this->chapterRepository->save($updatedChapter);
$this->mangaRepository->updateChapter($updatedChapter);
}
/**
* Validate that the binary data is a valid CBZ (ZIP) file
*/
private function isValidCbzFile(string $fileBinary): bool
{
// CBZ files are ZIP archives, check for ZIP magic number
$zipMagicNumber = "\x50\x4b\x03\x04"; // PK\x03\x04
return strpos($fileBinary, $zipMagicNumber) === 0;
}
/**
* Save the CBZ file to storage and return the path
*/
private function saveCbzFile(ImportChapter $command, \App\Domain\Manga\Domain\Model\Manga $manga, Chapter $chapter): string
{
// Build the final CBZ path using the path manager (creates directories)
$volumeNumber = $chapter->getVolume() ?? 0;
$cbzPath = $this->pathManager->buildChapterCbzPath(
$manga->getTitle()->getValue(),
@@ -85,7 +76,6 @@ readonly class ImportChapterHandler
(string)$command->chapterNumber
);
// Write the binary content directly to the CBZ path
if (!file_put_contents($cbzPath, $command->fileBinary)) {
throw new \RuntimeException('Failed to save CBZ file');
}

25
src/Domain/Manga/Application/CommandHandler/ImportVolumeHandler.php
View File

@@ -3,7 +3,6 @@
namespace App\Domain\Manga\Application\CommandHandler;
use App\Domain\Manga\Application\Command\ImportVolume;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
use App\Domain\Manga\Domain\Model\Chapter;
@@ -14,7 +13,6 @@ readonly class ImportVolumeHandler
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private ChapterRepositoryInterface $chapterRepository,
private MangaPathManagerInterface $pathManager
) {}
@@ -32,7 +30,7 @@ readonly class ImportVolumeHandler
}
// 3. Get all chapters for this volume
$chapters = $this->chapterRepository->findByMangaIdAndVolume(
$chapters = $this->mangaRepository->findChaptersByMangaIdAndVolume(
$command->mangaId,
$command->volumeNumber
);
@@ -46,7 +44,8 @@ readonly class ImportVolumeHandler
// 4. Save the CBZ file to storage using the path manager
$cbzPath = $this->saveCbzFile($command, $manga);
// 5. Update all chapters with the volume CBZ path
// 5. Update all chapters with the volume path
// Note: pagesDirectory holds CBZ path during transition; Phase 3 will store individual images
foreach ($chapters as $chapter) {
$updatedChapter = new Chapter(
id: new ChapterId($chapter->getId()),
@@ -55,37 +54,29 @@ readonly class ImportVolumeHandler
title: $chapter->getTitle(),
volume: $chapter->getVolume(),
isVisible: $chapter->isVisible(),
cbzPath: $cbzPath,
pagesDirectory: $cbzPath,
pageCount: $chapter->getPageCount(),
createdAt: $chapter->getCreatedAt()
);
$this->chapterRepository->save($updatedChapter);
$this->mangaRepository->updateChapter($updatedChapter);
}
}
/**
* Validate that the binary data is a valid CBZ (ZIP) file
*/
private function isValidCbzFile(string $fileBinary): bool
{
// CBZ files are ZIP archives, check for ZIP magic number
$zipMagicNumber = "\x50\x4b\x03\x04"; // PK\x03\x04
return strpos($fileBinary, $zipMagicNumber) === 0;
}
/**
* Save the CBZ file to storage and return the path
*/
private function saveCbzFile(ImportVolume $command, \App\Domain\Manga\Domain\Model\Manga $manga): string
{
// Build the final CBZ path using the path manager (creates directories)
$cbzPath = $this->pathManager->buildVolumeCbzPath(
$manga->getTitle()->getValue(),
(string)$manga->getPublicationYear(),
$command->volumeNumber
);
// Write the binary content directly to the CBZ path
if (!file_put_contents($cbzPath, $command->fileBinary)) {
throw new \RuntimeException('Failed to save CBZ file');
}
@@ -93,7 +84,3 @@ readonly class ImportVolumeHandler
return $cbzPath;
}
}

11
src/Domain/Manga/Application/EventListener/ChapterImportedEventListener.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace App\Domain\Manga\Application\EventListener;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Model\Chapter;
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
@@ -15,17 +14,16 @@ readonly class ChapterImportedEventListener
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private ChapterRepositoryInterface $chapterRepository,
) {}
public function __invoke(ChapterImported $event): void
{
$manga = $this->mangaRepository->findBySlug(new MangaSlug($event->mangaSlug));
if (!$manga) {
return; // Manga introuvable, on ignore
return;
}
$chapters = $this->chapterRepository->findVisibleByMangaIdAndVolume($manga->getId()->getValue(), (int) $event->volume);
$chapters = $this->mangaRepository->findVisibleChaptersByMangaIdAndVolume($manga->getId()->getValue(), (int) $event->volume);
foreach ($chapters as $chapter) {
if ($chapter->getNumber() === (float) $event->chapterNumber) {
$updated = new Chapter(
@@ -36,13 +34,12 @@ readonly class ChapterImportedEventListener
$chapter->getVolume(),
$chapter->isVisible(),
$event->cbzPath,
$chapter->getPageCount(),
$chapter->getCreatedAt(),
);
$this->chapterRepository->save($updated);
$this->mangaRepository->updateChapter($updated);
break;
}
}
}
}

9
src/Domain/Manga/Application/EventListener/VolumeImportedEventListener.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace App\Domain\Manga\Application\EventListener;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Model\Chapter;
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
@@ -15,7 +14,6 @@ readonly class VolumeImportedEventListener
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private ChapterRepositoryInterface $chapterRepository,
) {}
public function __invoke(VolumeImported $event): void
@@ -25,7 +23,7 @@ readonly class VolumeImportedEventListener
return;
}
$chapters = $this->chapterRepository->findByMangaIdAndVolume($manga->getId()->getValue(), (int) $event->volume);
$chapters = $this->mangaRepository->findChaptersByMangaIdAndVolume($manga->getId()->getValue(), (int) $event->volume);
if ($chapters === []) {
return;
}
@@ -39,11 +37,10 @@ readonly class VolumeImportedEventListener
$chapter->getVolume(),
$chapter->isVisible(),
$event->cbzPath,
$chapter->getPageCount(),
$chapter->getCreatedAt(),
);
$this->chapterRepository->save($updated);
$this->mangaRepository->updateChapter($updated);
}
}
}

15
src/Domain/Manga/Application/QueryHandler/DownloadCbzHandler.php
View File

@@ -4,7 +4,7 @@ namespace App\Domain\Manga\Application\QueryHandler;
use App\Domain\Manga\Application\Query\DownloadCbz;
use App\Domain\Manga\Application\Response\DownloadResponse;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Service\FileServiceInterface;
use App\Domain\Manga\Domain\Exception\CbzFileNotFoundException;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
@@ -16,7 +16,7 @@ use App\Domain\Shared\Domain\Contract\ResponseInterface;
readonly class DownloadCbzHandler implements QueryHandlerInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository,
private MangaRepositoryInterface $mangaRepository,
private FileServiceInterface $fileService
) {}
@@ -24,7 +24,7 @@ readonly class DownloadCbzHandler implements QueryHandlerInterface
{
assert($query instanceof DownloadCbz);
$chapter = $this->chapterRepository->findVisibleById($query->chapterId);
$chapter = $this->mangaRepository->findVisibleChapterById($query->chapterId);
if (!$chapter) {
throw new ChapterNotFoundException($query->chapterId);
@@ -34,14 +34,11 @@ readonly class DownloadCbzHandler implements QueryHandlerInterface
throw new ChapterNotAvailableException($query->chapterId);
}
// Use the actual CBZ path from the chapter
$cbzPath = $chapter->getCbzPath();
// Extract the existing filename from the path
$filename = basename($cbzPath);
$pagesDirectory = $chapter->getPagesDirectory();
$filename = basename($pagesDirectory);
try {
$httpResponse = $this->fileService->downloadCbz($cbzPath, $filename);
$httpResponse = $this->fileService->downloadCbz($pagesDirectory, $filename);
} catch (CbzFileNotFoundException $e) {
throw new ChapterNotAvailableException($query->chapterId);
}

7
src/Domain/Manga/Application/QueryHandler/DownloadVolumeHandler.php
View File

@@ -4,7 +4,6 @@ namespace App\Domain\Manga\Application\QueryHandler;
use App\Domain\Manga\Application\Query\DownloadVolume;
use App\Domain\Manga\Application\Response\DownloadResponse;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Service\FileServiceInterface;
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
@@ -16,7 +15,6 @@ use App\Domain\Shared\Domain\Contract\ResponseInterface;
readonly class DownloadVolumeHandler implements QueryHandlerInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository,
private MangaRepositoryInterface $mangaRepository,
private FileServiceInterface $fileService
) {}
@@ -31,7 +29,7 @@ readonly class DownloadVolumeHandler implements QueryHandlerInterface
throw new MangaNotFoundException($query->mangaId);
}
$chapters = $this->chapterRepository->findVisibleWithCbzByMangaIdAndVolume(
$chapters = $this->mangaRepository->findVisibleChaptersWithPagesByMangaIdAndVolume(
$query->mangaId,
$query->volume
);
@@ -40,10 +38,9 @@ readonly class DownloadVolumeHandler implements QueryHandlerInterface
throw new VolumeNotFoundException($query->mangaId, $query->volume);
}
// Collect CBZ paths for all chapters
$cbzPaths = [];
foreach ($chapters as $chapter) {
$cbzPaths[] = $chapter->getCbzPath();
$cbzPaths[] = $chapter->getPagesDirectory();
}
$volumeName = sprintf('%s_vol%d',

2
src/Domain/Manga/Application/QueryHandler/GetMangaChaptersHandler.php
View File

@@ -38,7 +38,7 @@ readonly class GetMangaChaptersHandler
title: $chapter->getTitle(),
volume: $chapter->getVolume(),
isVisible: $chapter->isVisible(),
cbzPath: $chapter->getCbzPath(),
pagesDirectory: $chapter->getPagesDirectory(),
createdAt: $chapter->getCreatedAt()
),
$chapters

4
src/Domain/Manga/Application/Response/ChapterResponse.php
View File

@@ -10,7 +10,7 @@ readonly class ChapterResponse
public ?string $title,
public ?int $volume,
public bool $isVisible,
public ?string $cbzPath,
public ?string $pagesDirectory,
public \DateTimeImmutable $createdAt
) {}
}
}

29
src/Domain/Manga/Domain/Contract/Repository/ChapterRepositoryInterface.php
View File

@@ -1,29 +0,0 @@
<?php
namespace App\Domain\Manga\Domain\Contract\Repository;
use App\Domain\Manga\Domain\Model\Chapter;
interface ChapterRepositoryInterface
{
public function findById(string $id): ?Chapter;
public function findVisibleById(string $id): ?Chapter;
public function findByMangaIdAndChapterNumber(string $mangaId, float $chapterNumber): ?Chapter;
public function save(Chapter $chapter): void;
public function delete(Chapter $chapter): void;
/**
* @return Chapter[]
*/
public function findByMangaIdAndVolume(string $mangaId, int $volume): array;
/**
* @return Chapter[]
*/
public function findVisibleByMangaIdAndVolume(string $mangaId, int $volume): array;
/**
* @return Chapter[]
*/
public function findVisibleWithCbzByMangaIdAndVolume(string $mangaId, int $volume): array;
}

47
src/Domain/Manga/Domain/Contract/Repository/MangaRepositoryInterface.php
View File

@@ -11,18 +11,31 @@ use App\Domain\Manga\Domain\Model\ValueObject\MangaSlug;
interface MangaRepositoryInterface
{
// --- Manga ---
public function findAll(int $page = 1, int $limit = 20, string $sortBy = 'title', string $sortOrder = 'asc'): array;
public function count(): int;
public function findById(string $id): ?Manga;
public function findBySlug(MangaSlug $slug): ?Manga;
public function findByExternalId(ExternalId $externalId): ?Manga;
public function save(Manga $manga): void;
public function delete(Manga $manga): void;
public function findChapters(string $mangaId, int $page = 1, int $limit = 20, string $sortOrder = 'desc'): array;
public function countChapters(string $mangaId): int;
public function findByExternalId(ExternalId $externalId): ?Manga;
public function saveChapter(Chapter $chapter): ChapterId;
public function findBySlug(MangaSlug $slug): ?Manga;
public function search(string $query, int $page = 1, int $limit = 20): array;
public function countSearch(string $query): int;
/**
* @return Manga[]
*/
public function findByMonitoringCriteria(MonitoringCriteria $criteria): array;
// --- Chapters (read) ---
public function findChapters(string $mangaId, int $page = 1, int $limit = 20, string $sortOrder = 'desc'): array;
public function countChapters(string $mangaId): int;
public function findChapterById(string $id): ?Chapter;
public function findVisibleChapterById(string $id): ?Chapter;
public function findChapterByMangaIdAndNumber(string $mangaId, float $chapterNumber): ?Chapter;
/**
* @param float[] $chapterNumbers
* @return array<float, Chapter>
@@ -30,7 +43,27 @@ interface MangaRepositoryInterface
public function findExistingChaptersByNumbers(string $mangaId, array $chapterNumbers): array;
/**
* @return Manga[]
* @return Chapter[]
*/
public function findByMonitoringCriteria(MonitoringCriteria $criteria): array;
public function findChaptersByMangaIdAndVolume(string $mangaId, int $volume): array;
/**
* @return Chapter[]
*/
public function findVisibleChaptersByMangaIdAndVolume(string $mangaId, int $volume): array;
/**
* @return Chapter[]
*/
public function findVisibleChaptersWithPagesByMangaIdAndVolume(string $mangaId, int $volume): array;
// --- Chapters (write) ---
/** Create a new chapter and return its generated ID. */
public function saveChapter(Chapter $chapter): ChapterId;
/** Update an existing chapter. */
public function updateChapter(Chapter $chapter): void;
public function deleteChapter(Chapter $chapter): void;
}

20
src/Domain/Manga/Domain/Model/Chapter.php
View File

@@ -13,7 +13,8 @@ readonly class Chapter
private ?string $title,
private ?int $volume,
private bool $isVisible,
private ?string $cbzPath = null,
private ?string $pagesDirectory = null,
private int $pageCount = 0,
private \DateTimeImmutable $createdAt = new \DateTimeImmutable()
) {}
@@ -49,12 +50,17 @@ readonly class Chapter
public function isAvailable(): bool
{
return $this->cbzPath !== null;
return $this->pagesDirectory !== null;
}
public function getCbzPath(): ?string
public function getPagesDirectory(): ?string
{
return $this->cbzPath;
return $this->pagesDirectory;
}
public function getPageCount(): int
{
return $this->pageCount;
}
public function getCreatedAt(): \DateTimeImmutable
@@ -71,7 +77,8 @@ readonly class Chapter
$title,
$this->volume,
$this->isVisible,
$this->cbzPath,
$this->pagesDirectory,
$this->pageCount,
$this->createdAt
);
}
@@ -85,7 +92,8 @@ readonly class Chapter
$this->title,
$volume,
$this->isVisible,
$this->cbzPath,
$this->pagesDirectory,
$this->pageCount,
$this->createdAt
);
}

6
src/Domain/Manga/Infrastructure/ApiPlatform/State/Provider/DeleteCbzProvider.php
View File

@@ -4,7 +4,7 @@ namespace App\Domain\Manga\Infrastructure\ApiPlatform\State\Provider;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProviderInterface;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
use App\Domain\Manga\Domain\Exception\CbzFileNotFoundException;
use App\Domain\Manga\Infrastructure\ApiPlatform\Resource\DeleteCbzResource;
@@ -13,7 +13,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
readonly class DeleteCbzProvider implements ProviderInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository
private MangaRepositoryInterface $mangaRepository
) {}
public function provide(Operation $operation, array $uriVariables = [], array $context = []): DeleteCbzResource
@@ -25,7 +25,7 @@ readonly class DeleteCbzProvider implements ProviderInterface
$chapterId = $uriVariables['id'];
try {
$chapter = $this->chapterRepository->findVisibleById($chapterId);
$chapter = $this->mangaRepository->findVisibleChapterById($chapterId);
if (!$chapter) {
throw new ChapterNotFoundException($chapterId);

6
src/Domain/Manga/Infrastructure/ApiPlatform/State/Provider/DeleteChapterProvider.php
View File

@@ -4,7 +4,7 @@ namespace App\Domain\Manga\Infrastructure\ApiPlatform\State\Provider;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProviderInterface;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
use App\Domain\Manga\Infrastructure\ApiPlatform\Resource\DeleteChapterResource;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -12,7 +12,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
readonly class DeleteChapterProvider implements ProviderInterface
{
public function __construct(
private ChapterRepositoryInterface $chapterRepository
private MangaRepositoryInterface $mangaRepository
) {}
public function provide(Operation $operation, array $uriVariables = [], array $context = []): DeleteChapterResource
@@ -24,7 +24,7 @@ readonly class DeleteChapterProvider implements ProviderInterface
$chapterId = $uriVariables['id'];
try {
$chapter = $this->chapterRepository->findVisibleById($chapterId);
$chapter = $this->mangaRepository->findVisibleChapterById($chapterId);
if (!$chapter) {
throw new ChapterNotFoundException($chapterId);

2
src/Domain/Manga/Infrastructure/ApiPlatform/State/Provider/GetMangaChaptersStateProvider.php
View File

@@ -52,7 +52,7 @@ readonly class GetMangaChaptersStateProvider implements ProviderInterface
title: $chapter->title,
volume: $chapter->volume,
isVisible: $chapter->isVisible,
isAvailable: $chapter->cbzPath !== null,
isAvailable: $chapter->pagesDirectory !== null,
createdAt: $chapter->createdAt->format(\DateTimeInterface::RFC3339)
);
}

111
src/Domain/Manga/Infrastructure/Persistence/LegacyMangaRepository.php
View File

@@ -179,7 +179,9 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
->setNumber($chapter->getNumber())
->setTitle($chapter->getTitle())
->setVolume($chapter->getVolume())
->setVisible($chapter->isVisible());
->setVisible($chapter->isVisible())
->setPagesDirectory($chapter->getPagesDirectory())
->setPageCount($chapter->getPageCount());
$this->entityManager->persist($entity);
$this->entityManager->flush();
@@ -187,6 +189,107 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
return new ChapterId((string) $entity->getId());
}
public function findChapterById(string $id): ?Chapter
{
$entity = $this->entityManager->find(EntityChapter::class, $id);
return $entity ? $this->toChapterDomain($entity) : null;
}
public function findVisibleChapterById(string $id): ?Chapter
{
$entity = $this->entityManager->createQueryBuilder()
->select('c')
->from(EntityChapter::class, 'c')
->where('c.id = :id')
->andWhere('c.visible = :visible')
->setParameter('id', $id)
->setParameter('visible', 1)
->getQuery()
->getOneOrNullResult();
return $entity ? $this->toChapterDomain($entity) : null;
}
public function findChapterByMangaIdAndNumber(string $mangaId, float $chapterNumber): ?Chapter
{
$entity = $this->entityManager->createQueryBuilder()
->select('c')
->from(EntityChapter::class, 'c')
->where('c.manga = :mangaId')
->andWhere('c.number = :chapterNumber')
->setParameter('mangaId', $mangaId)
->setParameter('chapterNumber', $chapterNumber)
->getQuery()
->getOneOrNullResult();
return $entity ? $this->toChapterDomain($entity) : null;
}
public function updateChapter(Chapter $chapter): void
{
$entity = $this->entityManager->find(EntityChapter::class, $chapter->getId());
if (!$entity) {
throw new \RuntimeException(sprintf('Chapter with id %s not found', $chapter->getId()));
}
$entity->setVisible($chapter->isVisible())
->setPagesDirectory($chapter->getPagesDirectory())
->setPageCount($chapter->getPageCount())
->setTitle($chapter->getTitle())
->setVolume($chapter->getVolume())
// Keep cbzPath in sync during transition (Phase 4 will drop this column)
->setCbzPath($chapter->getPagesDirectory());
$this->entityManager->persist($entity);
$this->entityManager->flush();
}
public function deleteChapter(Chapter $chapter): void
{
$entity = $this->entityManager->find(EntityChapter::class, $chapter->getId());
if ($entity) {
$this->entityManager->remove($entity);
$this->entityManager->flush();
}
}
public function findChaptersByMangaIdAndVolume(string $mangaId, int $volume): array
{
$entities = $this->entityManager->getRepository(EntityChapter::class)
->findBy(['manga' => $mangaId, 'volume' => $volume]);
return array_map([$this, 'toChapterDomain'], $entities);
}
public function findVisibleChaptersByMangaIdAndVolume(string $mangaId, int $volume): array
{
$entities = $this->entityManager->getRepository(EntityChapter::class)
->findBy(['manga' => $mangaId, 'volume' => $volume, 'visible' => true]);
return array_map([$this, 'toChapterDomain'], $entities);
}
public function findVisibleChaptersWithPagesByMangaIdAndVolume(string $mangaId, int $volume): array
{
$entities = $this->entityManager->createQueryBuilder()
->select('c')
->from(EntityChapter::class, 'c')
->where('c.manga = :mangaId')
->andWhere('c.volume = :volume')
->andWhere('c.visible = true')
->andWhere('c.pagesDirectory IS NOT NULL OR c.cbzPath IS NOT NULL')
->setParameter('mangaId', $mangaId)
->setParameter('volume', $volume)
->orderBy('c.number', 'ASC')
->getQuery()
->getResult();
return array_map([$this, 'toChapterDomain'], $entities);
}
public function search(string $query, int $page = 1, int $limit = 20): array
{
$offset = ($page - 1) * $limit;
@@ -314,12 +417,14 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
{
return new Chapter(
id: new ChapterId((string) $entity->getId()),
mangaId: $entity->getManga()->getId(),
mangaId: (string) $entity->getManga()->getId(),
number: $entity->getNumber(),
title: $entity->getTitle(),
volume: $entity->getVolume(),
isVisible: $entity->isVisible(),
cbzPath: $entity->getCbzPath()
// Fallback to cbzPath during transition (Phase 4 will drop cbzPath column)
pagesDirectory: $entity->getPagesDirectory() ?? $entity->getCbzPath(),
pageCount: $entity->getPageCount(),
);
}
}

128
src/Domain/Manga/Infrastructure/Persistence/Repository/LegacyChapterRepository.php
View File

@@ -1,128 +0,0 @@
<?php
namespace App\Domain\Manga\Infrastructure\Persistence\Repository;
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
use App\Domain\Manga\Domain\Model\Chapter;
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
use App\Entity\Chapter as ChapterEntity;
use Doctrine\ORM\EntityManagerInterface;
readonly class LegacyChapterRepository implements ChapterRepositoryInterface
{
public function __construct(
private EntityManagerInterface $entityManager
) {}
public function findById(string $id): ?Chapter
{
$entity = $this->entityManager->find(ChapterEntity::class, $id);
return $entity ? $this->toDomainModel($entity) : null;
}
public function findVisibleById(string $id): ?Chapter
{
$qb = $this->entityManager->createQueryBuilder()
->select('c')
->from(ChapterEntity::class, 'c')
->where('c.id = :id')
->andWhere('c.visible = :visible')
->setParameter('id', $id)
->setParameter('visible', 1);
$entity = $qb->getQuery()->getOneOrNullResult();
return $entity ? $this->toDomainModel($entity) : null;
}
public function findByMangaIdAndChapterNumber(string $mangaId, float $chapterNumber): ?Chapter
{
$qb = $this->entityManager->createQueryBuilder()
->select('c')
->from(ChapterEntity::class, 'c')
->where('c.manga = :mangaId')
->andWhere('c.number = :chapterNumber')
->setParameter('mangaId', $mangaId)
->setParameter('chapterNumber', $chapterNumber);
$entity = $qb->getQuery()->getOneOrNullResult();
return $entity ? $this->toDomainModel($entity) : null;
}
public function save(Chapter $chapter): void
{
$entity = $this->entityManager->find(ChapterEntity::class, $chapter->getId());
if (!$entity) {
throw new \RuntimeException(sprintf('Chapter with id %s not found', $chapter->getId()));
}
$entity->setVisible($chapter->isVisible());
$entity->setCbzPath($chapter->getCbzPath());
$entity->setTitle($chapter->getTitle());
$entity->setVolume($chapter->getVolume());
$this->entityManager->persist($entity);
$this->entityManager->flush();
}
public function delete(Chapter $chapter): void
{
$entity = $this->entityManager->find(ChapterEntity::class, $chapter->getId());
if ($entity) {
$this->entityManager->remove($entity);
$this->entityManager->flush();
}
}
public function findByMangaIdAndVolume(string $mangaId, int $volume): array
{
$entities = $this->entityManager->getRepository(ChapterEntity::class)
->findBy(['manga' => $mangaId, 'volume' => $volume]);
return array_map([$this, 'toDomainModel'], $entities);
}
public function findVisibleByMangaIdAndVolume(string $mangaId, int $volume): array
{
$entities = $this->entityManager->getRepository(ChapterEntity::class)
->findBy(['manga' => $mangaId, 'volume' => $volume, 'visible' => true]);
return array_map([$this, 'toDomainModel'], $entities);
}
public function findVisibleWithCbzByMangaIdAndVolume(string $mangaId, int $volume): array
{
$qb = $this->entityManager->createQueryBuilder()
->select('c')
->from(ChapterEntity::class, 'c')
->where('c.manga = :mangaId')
->andWhere('c.volume = :volume')
->andWhere('c.visible = true')
->andWhere('c.cbzPath IS NOT NULL')
->setParameter('mangaId', $mangaId)
->setParameter('volume', $volume)
->orderBy('c.number', 'ASC');
$entities = $qb->getQuery()->getResult();
return array_map([$this, 'toDomainModel'], $entities);
}
private function toDomainModel(ChapterEntity $entity): Chapter
{
return new Chapter(
new ChapterId((string) $entity->getId()),
(string) $entity->getManga()->getId(),
$entity->getNumber(),
$entity->getTitle(),
$entity->getVolume(),
$entity->isVisible(),
$entity->getCbzPath(),
new \DateTimeImmutable()
);
}
}

13
src/Domain/Manga/Infrastructure/Service/MangadxChapterSynchronizationService.php
View File

@@ -73,6 +73,7 @@ readonly class MangadxChapterSynchronizationService implements ChapterSynchroniz
isset($chapterData['attributes']['volume']) ? (int) $chapterData['attributes']['volume'] : null,
true,
null,
0,
new \DateTimeImmutable()
);
$chapterLanguages[(string) $chapterNumber] = $language;
@@ -142,7 +143,8 @@ readonly class MangadxChapterSynchronizationService implements ChapterSynchroniz
$currentChapter->getTitle(),
null, // volume = null
$currentChapter->isVisible(),
$currentChapter->getCbzPath(),
$currentChapter->getPagesDirectory(),
$currentChapter->getPageCount(),
$currentChapter->getCreatedAt()
);
}
@@ -155,7 +157,8 @@ readonly class MangadxChapterSynchronizationService implements ChapterSynchroniz
$currentChapter->getTitle(),
$prevVolume, // prend le volume des adjacents
$currentChapter->isVisible(),
$currentChapter->getCbzPath(),
$currentChapter->getPagesDirectory(),
$currentChapter->getPageCount(),
$currentChapter->getCreatedAt()
);
}
@@ -209,7 +212,8 @@ readonly class MangadxChapterSynchronizationService implements ChapterSynchroniz
$currentChapter->getTitle(),
$prevVolume,
$currentChapter->isVisible(),
$currentChapter->getCbzPath(),
$currentChapter->getPagesDirectory(),
$currentChapter->getPageCount(),
$currentChapter->getCreatedAt()
);
}
@@ -222,7 +226,8 @@ readonly class MangadxChapterSynchronizationService implements ChapterSynchroniz
$currentChapter->getTitle(),
$nextVolume,
$currentChapter->isVisible(),
$currentChapter->getCbzPath(),
$currentChapter->getPagesDirectory(),
$currentChapter->getPageCount(),
$currentChapter->getCreatedAt()
);
}