bvandeusen
2f66de2928
Operator-asked 2026-06-01 after the Dymkens orphan investigation (Scribe plan #540). The pre-2030 sidecar-synthetic Source pattern (`sidecar:<platform>:<slug>` enabled=false rows) existed solely to satisfy `Post.source_id NOT NULL`, and leaked into the Subscriptions UI as phantom subscriptions. Now the data model says what's true: filesystem-imported content with no live subscription has NULL source_id, full stop. ## Schema (alembic 0030) - `post.artist_id` — NEW NOT NULL FK to artist (CASCADE). Backfilled from source.artist_id in the migration. Indexed for the artist-filter queries. - `post.source_id` — NOT NULL → nullable; FK ondelete CASCADE → SET NULL. Deleting a Source detaches its Posts instead of destroying archived content (subscription ends, archive stays). - `image_provenance.source_id` — same nullable + SET NULL. - Partial unique index `uq_post_artist_external_id_null_source` on (artist_id, external_post_id) WHERE source_id IS NULL — guards filesystem-import dedup since the existing source-bound unique ignores NULLs (Postgres treats NULL != NULL). - Sidecar synthetic Sources deleted: NULL out FKs in post, image_provenance first, then DELETE FROM source WHERE url LIKE 'sidecar:%'. The Dymkens cleanup. ## Model + service changes - `Post.source_id` → `Mapped[int | None]`; new `Post.artist_id` denormalized. - `ImageProvenance.source_id` → `Mapped[int | None]`. - Importer: `_source_for_sidecar` (synthetic-creating) → `_lookup_source_for_sidecar` (returns None when no subscription). `_find_or_create_post` takes required `artist_id`; matches on (source_id, external_post_id) for source-bound posts or (artist_id, external_post_id) for NULL-source posts. - Service queries switched off the Source detour to use Post.artist_id directly: post_feed_service.scroll/around/get_post (LEFT JOIN to Source so NULL-source posts surface); artist_service date_row/ activity/post_count; provenance_service.for_image/for_post (LEFT JOIN); gallery_service._provenance_exists_where_artist via Post.artist_id instead of ImageProvenance.source_id → Source. - `_to_dict` and provenance dict-builders emit `"source": null` for NULL-source rows. ## Frontend - `ProvenancePanel.vue` + `PostCard.vue`: render `e.source?.platform ?? 'filesystem import'` so NULL-source posts get a clear "filesystem import" affordance instead of a NaN crash. ## Tests - `test_importer_upsert_helpers`: removed the four synthetic-anchor tests; added `_find_or_create_post_idempotent_with_null_source` (dedup via the partial unique index) and `_lookup_source_for_sidecar_returns_*` (existing-subscription + none cases). The existing `_find_or_create_post_idempotent` now also passes `artist_id` and asserts it. - 8 other test files updated: every direct `Post(...)` construction gains `artist_id=<artist>.id`. The `_seed_post` helper in `test_post_feed_service` looks up artist_id from the source row so callsites stay one-arg. ## Verification on deploy After alembic 0030 runs: - `SELECT COUNT(*) FROM source WHERE url LIKE 'sidecar:%'` → 0. - `SELECT COUNT(*) FROM post WHERE source_id IS NULL` → count of filesystem-imported posts (Dymkens + any other historical). - Every `post.artist_id` non-null; consistent with source.artist_id for source-bound rows. - Subscriptions tab: no Dymkens phantom row. - Artist detail → Posts/Gallery: Dymkens's content still reachable via Post.artist_id. - Provenance panel renders "filesystem import" chip for NULL-source posts; PostCard same. ## Out of scope - UI to manage/delete orphan NULL-source Posts. Data model is right; UI follows if operator wants it.
110 lines
3.3 KiB
Python
110 lines
3.3 KiB
Python
from datetime import UTC, datetime
|
|
|
|
import pytest
|
|
|
|
from backend.app.models import (
|
|
Artist,
|
|
ImageProvenance,
|
|
ImageRecord,
|
|
Post,
|
|
Source,
|
|
Tag,
|
|
TagKind,
|
|
)
|
|
from backend.app.models.tag import image_tag
|
|
from backend.app.services.artist_service import ArtistService
|
|
|
|
pytestmark = pytest.mark.integration
|
|
|
|
|
|
async def _fixture(db):
|
|
artist = Artist(name="Nadia", slug="nadia")
|
|
db.add(artist)
|
|
await db.flush()
|
|
src = Source(artist_id=artist.id, platform="web", url="http://x")
|
|
db.add(src)
|
|
await db.flush()
|
|
post = Post(
|
|
source_id=src.id, artist_id=artist.id, external_post_id="p1",
|
|
post_date=datetime(2026, 3, 1, tzinfo=UTC),
|
|
)
|
|
db.add(post)
|
|
await db.flush()
|
|
img = ImageRecord(
|
|
path="/images/a/1.jpg", sha256="a" + "0" * 63,
|
|
size_bytes=1, mime="image/jpeg", width=4, height=8,
|
|
origin="downloaded", integrity_status="unknown",
|
|
# FC-2d-vii-c: provenance images also carry the canonical
|
|
# artist_id (set by importer/migration); ArtistService reads it.
|
|
artist_id=artist.id,
|
|
)
|
|
db.add(img)
|
|
await db.flush()
|
|
db.add(ImageProvenance(
|
|
image_record_id=img.id, post_id=post.id, source_id=src.id))
|
|
tag = Tag(name="forest", kind=TagKind.general)
|
|
db.add(tag)
|
|
await db.flush()
|
|
await db.execute(image_tag.insert().values(
|
|
image_record_id=img.id, tag_id=tag.id, source="manual"))
|
|
await db.flush()
|
|
return artist, src, img
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_overview_aggregates(db):
|
|
artist, src, img = await _fixture(db)
|
|
svc = ArtistService(db)
|
|
ov = await svc.overview("nadia")
|
|
assert ov["name"] == "Nadia"
|
|
assert ov["image_count"] == 1
|
|
assert ov["date_range"]["min"].startswith("2026-03-01")
|
|
assert ov["date_range"]["max"].startswith("2026-03-01")
|
|
assert any(t["name"] == "forest" for t in ov["cooccurring_tags"])
|
|
assert ov["sources"][0]["image_count"] == 1
|
|
assert ov["activity"][0]["count"] == 1
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_overview_unknown_slug_returns_none(db):
|
|
svc = ArtistService(db)
|
|
assert await svc.overview("ghost") is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paged_images(db):
|
|
artist, src, img = await _fixture(db)
|
|
svc = ArtistService(db)
|
|
page = await svc.images("nadia", cursor=None, limit=10)
|
|
assert page is not None
|
|
assert len(page.images) == 1
|
|
assert page.images[0]["thumbnail_url"].startswith("/images/thumbs/")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paged_images_unknown_slug_none(db):
|
|
svc = ArtistService(db)
|
|
assert await svc.images("ghost", cursor=None, limit=10) is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_overview_and_images_include_artist_id_only(db):
|
|
# FC-2d-vii-c: a folder-style image has artist_id but no provenance.
|
|
a = Artist(name="Solo", slug="solo")
|
|
db.add(a)
|
|
await db.flush()
|
|
rec = ImageRecord(
|
|
path="/images/s/1.jpg", sha256="s" + "0" * 63,
|
|
size_bytes=1, mime="image/jpeg", width=1, height=1,
|
|
origin="imported_filesystem", integrity_status="unknown",
|
|
artist_id=a.id,
|
|
)
|
|
db.add(rec)
|
|
await db.flush()
|
|
|
|
svc = ArtistService(db)
|
|
ov = await svc.overview("solo")
|
|
assert ov["image_count"] == 1
|
|
page = await svc.images("solo", cursor=None, limit=10)
|
|
assert [i["id"] for i in page.images] == [rec.id]
|