feat(manga): regrouper les chapitres d'un volume importé dans la liste API
Les chapitres partageant le même pagesDirectory non-null et le même volume non-null (import CBZ en bloc) sont fusionnés en un seul item isVolumeGroup=true côté Application, avec volumeChaptersRange et volumeChapterCount. Le frontend affiche "Vol. X — Chapitres Y-Z" à la place de N lignes identiques.
This commit is contained in:
parent
c268b2c312
commit
fb8f64ee59
@@ -23,18 +23,60 @@ readonly class GetMangaChaptersHandler
|
||||
throw new MangaNotFoundException();
|
||||
}
|
||||
|
||||
$chapters = $this->mangaRepository->findChapters(
|
||||
$allChapters = $this->mangaRepository->findAllChapters(
|
||||
mangaId: $query->mangaId,
|
||||
page: $query->page,
|
||||
limit: $query->limit,
|
||||
sortOrder: $query->sortOrder
|
||||
sortOrder: 'asc'
|
||||
);
|
||||
|
||||
$total = $this->mangaRepository->countChapters($query->mangaId);
|
||||
$grouped = $this->groupChapters($allChapters);
|
||||
|
||||
if ($query->sortOrder === 'desc') {
|
||||
usort($grouped, fn (ChapterResponse $a, ChapterResponse $b) => $b->number <=> $a->number);
|
||||
}
|
||||
|
||||
$total = count($grouped);
|
||||
$offset = ($query->page - 1) * $query->limit;
|
||||
$paginatedChapters = array_slice($grouped, $offset, $query->limit);
|
||||
|
||||
return new ChapterListResponse(
|
||||
chapters: array_map(
|
||||
fn (Chapter $chapter) => new ChapterResponse(
|
||||
chapters: $paginatedChapters,
|
||||
total: $total,
|
||||
page: $query->page,
|
||||
limit: $query->limit
|
||||
);
|
||||
}
|
||||
|
||||
/** @param Chapter[] $chapters */
|
||||
private function groupChapters(array $chapters): array
|
||||
{
|
||||
$result = [];
|
||||
$currentGroup = [];
|
||||
$currentPagesDir = null;
|
||||
$currentVolume = null;
|
||||
|
||||
foreach ($chapters as $chapter) {
|
||||
$pagesDir = $chapter->getPagesDirectory();
|
||||
$volume = $chapter->getVolume();
|
||||
|
||||
if ($pagesDir !== null && $volume !== null) {
|
||||
if ($pagesDir === $currentPagesDir && $volume === $currentVolume) {
|
||||
$currentGroup[] = $chapter;
|
||||
} else {
|
||||
if (!empty($currentGroup)) {
|
||||
$result[] = $this->buildVolumeGroupResponse($currentGroup);
|
||||
}
|
||||
$currentGroup = [$chapter];
|
||||
$currentPagesDir = $pagesDir;
|
||||
$currentVolume = $volume;
|
||||
}
|
||||
} else {
|
||||
if (!empty($currentGroup)) {
|
||||
$result[] = $this->buildVolumeGroupResponse($currentGroup);
|
||||
$currentGroup = [];
|
||||
$currentPagesDir = null;
|
||||
$currentVolume = null;
|
||||
}
|
||||
$result[] = new ChapterResponse(
|
||||
id: $chapter->getId(),
|
||||
number: $chapter->getNumber(),
|
||||
title: $chapter->getTitle(),
|
||||
@@ -42,12 +84,39 @@ readonly class GetMangaChaptersHandler
|
||||
isVisible: $chapter->isVisible(),
|
||||
pagesDirectory: $chapter->getPagesDirectory(),
|
||||
createdAt: $chapter->getCreatedAt()->format(\DateTimeInterface::RFC3339)
|
||||
),
|
||||
$chapters
|
||||
),
|
||||
total: $total,
|
||||
page: $query->page,
|
||||
limit: $query->limit
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($currentGroup)) {
|
||||
$result[] = $this->buildVolumeGroupResponse($currentGroup);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/** @param Chapter[] $group */
|
||||
private function buildVolumeGroupResponse(array $group): ChapterResponse
|
||||
{
|
||||
$first = $group[0];
|
||||
$numbers = array_map(fn (Chapter $c) => $c->getNumber(), $group);
|
||||
$min = min($numbers);
|
||||
$max = max($numbers);
|
||||
|
||||
$fmt = fn (float $n) => $n == (int) $n ? (string) (int) $n : (string) $n;
|
||||
$range = count($group) > 1 ? $fmt($min) . '-' . $fmt($max) : $fmt($min);
|
||||
|
||||
return new ChapterResponse(
|
||||
id: $first->getId(),
|
||||
number: $first->getNumber(),
|
||||
title: $first->getTitle(),
|
||||
volume: $first->getVolume(),
|
||||
isVisible: $first->isVisible(),
|
||||
pagesDirectory: $first->getPagesDirectory(),
|
||||
createdAt: $first->getCreatedAt()->format(\DateTimeInterface::RFC3339),
|
||||
isVolumeGroup: true,
|
||||
volumeChaptersRange: $range,
|
||||
volumeChapterCount: count($group)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,10 @@ readonly class ChapterResponse
|
||||
public ?int $volume,
|
||||
public bool $isVisible,
|
||||
public ?string $pagesDirectory,
|
||||
public string $createdAt
|
||||
public string $createdAt,
|
||||
public bool $isVolumeGroup = false,
|
||||
public ?string $volumeChaptersRange = null,
|
||||
public int $volumeChapterCount = 0,
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,11 @@ interface MangaRepositoryInterface
|
||||
// --- Chapters (read) ---
|
||||
|
||||
public function findChapters(string $mangaId, int $page = 1, int $limit = 20, string $sortOrder = 'desc'): array;
|
||||
|
||||
/**
|
||||
* @return Chapter[]
|
||||
*/
|
||||
public function findAllChapters(string $mangaId, string $sortOrder = 'desc'): array;
|
||||
public function countChapters(string $mangaId): int;
|
||||
public function countAvailableChapters(string $mangaId): int;
|
||||
public function findChapterById(string $id): ?Chapter;
|
||||
|
||||
@@ -14,7 +14,10 @@ readonly class ChapterListItem
|
||||
public ?int $volume,
|
||||
public bool $isVisible,
|
||||
public bool $isAvailable,
|
||||
public string $createdAt
|
||||
public string $createdAt,
|
||||
public bool $isVolumeGroup = false,
|
||||
public ?string $volumeChaptersRange = null,
|
||||
public int $volumeChapterCount = 0,
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +54,10 @@ readonly class GetMangaChaptersStateProvider implements ProviderInterface
|
||||
volume: $chapter->volume,
|
||||
isVisible: $chapter->isVisible,
|
||||
isAvailable: $chapter->pagesDirectory !== null,
|
||||
createdAt: $chapter->createdAt
|
||||
createdAt: $chapter->createdAt,
|
||||
isVolumeGroup: $chapter->isVolumeGroup,
|
||||
volumeChaptersRange: $chapter->volumeChaptersRange,
|
||||
volumeChapterCount: $chapter->volumeChapterCount,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,6 +185,21 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
|
||||
);
|
||||
}
|
||||
|
||||
public function findAllChapters(string $mangaId, string $sortOrder = 'desc'): array
|
||||
{
|
||||
$queryBuilder = $this->entityManager->createQueryBuilder()
|
||||
->select('c')
|
||||
->from(EntityChapter::class, 'c')
|
||||
->where('c.manga = :mangaId')
|
||||
->orderBy('c.number', $sortOrder)
|
||||
->setParameter('mangaId', $mangaId);
|
||||
|
||||
return array_map(
|
||||
fn (EntityChapter $entity) => $this->toChapterDomain($entity),
|
||||
$queryBuilder->getQuery()->getResult()
|
||||
);
|
||||
}
|
||||
|
||||
public function countChapters(string $mangaId): int
|
||||
{
|
||||
return $this->entityManager->createQueryBuilder()
|
||||
|
||||
Reference in New Issue
Block a user