NixReaperandClaude Sonnet 5
f1ac072794
CI / lint (push) Canceled after 0s
CI / typecheck (push) Canceled after 0s
CI / unit-tests (push) Canceled after 0s
CI / integration-tests (push) Canceled after 0s
CI / container-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
Completes browse/discover across all five entity types: movies, series, people, companies, and now collections. No filter (no categorical field like company_type exists for a collection) -- just page/page_size, always alphabetical by name. While adding poster_path to CollectionBriefOut for the browse listing, found the same class of bug fixed earlier for company logo_path: movie_service's embedded `collection` field never looked up its poster artwork either, so it stayed null even after ingest_collection populated one. Fixed alongside since it's the same schema field this feature was already touching. Also removed PageMeta from schemas/common.py -- scaffolding from early spec work that was never actually wired into any endpoint; all five browse endpoints shipped this session use a flat page/page_size/ total_results/total_pages shape instead. Co-Authored-By: Claude Sonnet 5 <[email protected]>
100 lines
3.8 KiB
Python
100 lines
3.8 KiB
Python
"""Assembles Collection/franchise API responses from repository data."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.core.ids import aurora_id, parse_aurora_id
|
|
from app.models.collection import Collection
|
|
from app.models.enums import ArtworkType
|
|
from app.repositories import collection_repository, polymorphic
|
|
from app.schemas.collection import CollectionDetailOut, CollectionListOut
|
|
from app.schemas.common import CollectionBriefOut
|
|
from app.services.common import primary_artwork_path
|
|
from app.services.movie_service import build_movie_summaries
|
|
from app.services.tv_service import build_series_summaries
|
|
|
|
|
|
class CollectionNotFoundError(Exception):
|
|
pass
|
|
|
|
|
|
def _resolve_collection_id(aid: str) -> uuid.UUID:
|
|
try:
|
|
return uuid.UUID(parse_aurora_id(aid, expected_type="collection"))
|
|
except ValueError as exc:
|
|
raise CollectionNotFoundError(str(exc)) from exc
|
|
|
|
|
|
async def get_collection_detail(
|
|
session: AsyncSession, collection_aurora_id: str
|
|
) -> CollectionDetailOut:
|
|
collection_id = _resolve_collection_id(collection_aurora_id)
|
|
collection = await collection_repository.get_collection_by_id(session, collection_id)
|
|
if collection is None:
|
|
raise CollectionNotFoundError(collection_aurora_id)
|
|
|
|
movies = await collection_repository.get_collection_movies(session, collection_id)
|
|
series = await collection_repository.get_collection_series(session, collection_id)
|
|
posters = await polymorphic.get_artwork(session, "collection", collection_id, ArtworkType.POSTER)
|
|
backdrops = await polymorphic.get_artwork(
|
|
session, "collection", collection_id, ArtworkType.BACKDROP
|
|
)
|
|
|
|
return CollectionDetailOut(
|
|
id=aurora_id("collection", str(collection.id)),
|
|
name=collection.name,
|
|
overview=collection.overview,
|
|
poster_path=primary_artwork_path(posters, ArtworkType.POSTER),
|
|
backdrop_path=primary_artwork_path(backdrops, ArtworkType.BACKDROP),
|
|
movies=await build_movie_summaries(session, [m.id for m in movies]),
|
|
series=await build_series_summaries(session, [s.id for s in series]),
|
|
created_at=collection.created_at,
|
|
updated_at=collection.updated_at,
|
|
)
|
|
|
|
|
|
async def _collection_summary_from_row(
|
|
session: AsyncSession, collection: Collection
|
|
) -> CollectionBriefOut:
|
|
posters = await polymorphic.get_artwork(session, "collection", collection.id, ArtworkType.POSTER)
|
|
return CollectionBriefOut(
|
|
id=aurora_id("collection", str(collection.id)),
|
|
name=collection.name,
|
|
poster_path=primary_artwork_path(posters, ArtworkType.POSTER),
|
|
)
|
|
|
|
|
|
async def build_collection_summary(
|
|
session: AsyncSession, collection_id: uuid.UUID
|
|
) -> CollectionBriefOut | None:
|
|
collection = await collection_repository.get_collection_by_id(session, collection_id)
|
|
if collection is None:
|
|
return None
|
|
return await _collection_summary_from_row(session, collection)
|
|
|
|
|
|
async def build_collection_summaries(
|
|
session: AsyncSession, collection_ids: list[uuid.UUID]
|
|
) -> list[CollectionBriefOut]:
|
|
out: list[CollectionBriefOut] = []
|
|
for collection_id in collection_ids:
|
|
summary = await build_collection_summary(session, collection_id)
|
|
if summary is not None:
|
|
out.append(summary)
|
|
return out
|
|
|
|
|
|
async def list_collections(session: AsyncSession, *, page: int, page_size: int) -> CollectionListOut:
|
|
collections, total = await collection_repository.list_collections(
|
|
session, limit=page_size, offset=(page - 1) * page_size
|
|
)
|
|
results = [await _collection_summary_from_row(session, c) for c in collections]
|
|
total_pages = (total + page_size - 1) // page_size if total else 0
|
|
|
|
return CollectionListOut(
|
|
page=page, page_size=page_size, total_results=total, total_pages=total_pages, results=results
|
|
)
|