Decouple blog models and BlogService from shared layer

Move Post/Author/Tag/PostAuthor/PostTag/PostUser models from
shared/models/ghost_content.py to blog/models/content.py so blog-domain
models no longer live in the shared layer. Replace the shared
SqlBlogService + BlogService protocol with a blog-local singleton
(blog_service), and switch entry_associations.py from direct DB access
to HTTP fetch_data("blog", "post-by-id") to respect the inter-service
boundary.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

shared/contracts/__init__.py

@@ -10,7 +10,6 @@ from .dtos import (
     CartSummaryDTO,
 )
 from .protocols import (
-    BlogService,
     CalendarService,
     MarketService,
     CartService,
@@ -24,7 +23,6 @@ __all__ = [
     "ProductDTO",
     "CartItemDTO",
     "CartSummaryDTO",
-    "BlogService",
     "CalendarService",
     "MarketService",
     "CartService",

shared/contracts/protocols.py

@@ -11,7 +11,6 @@ from typing import Protocol, runtime_checkable
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from .dtos import (
-    PostDTO,
     CalendarDTO,
     CalendarEntryDTO,
     TicketDTO,
@@ -29,17 +28,6 @@ from .dtos import (
 )
 
 
-@runtime_checkable
-class BlogService(Protocol):
-    async def get_post_by_slug(self, session: AsyncSession, slug: str) -> PostDTO | None: ...
-    async def get_post_by_id(self, session: AsyncSession, id: int) -> PostDTO | None: ...
-    async def get_posts_by_ids(self, session: AsyncSession, ids: list[int]) -> list[PostDTO]: ...
-
-    async def search_posts(
-        self, session: AsyncSession, query: str, page: int = 1, per_page: int = 10,
-    ) -> tuple[list[PostDTO], int]: ...
-
-
 @runtime_checkable
 class CalendarService(Protocol):
     async def calendars_for_container(

shared/models/__init__.py

@@ -10,7 +10,6 @@ from .ghost_membership_entities import (
     GhostNewsletter, UserNewsletter,
     GhostTier, GhostSubscription,
 )
-from .ghost_content import Tag, Post, Author, PostAuthor, PostTag
 from .page_config import PageConfig
 from .order import Order, OrderItem
 from .market import (

shared/models/ghost_content.py

@@ -1,208 +0,0 @@
-from datetime import datetime
-from typing import List, Optional
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-from sqlalchemy import (
-    Integer,
-    String,
-    Text,
-    Boolean,
-    DateTime,
-    ForeignKey,
-    Column,
-    func,
-)
-from shared.db.base import Base  # whatever your Base is
-# from .author import Author  # make sure imports resolve
-# from ..app.blog.calendars.model import Calendar
-
-class Tag(Base):
-    __tablename__ = "tags"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
-
-    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
-    name: Mapped[str] = mapped_column(String(255), nullable=False)
-
-    description: Mapped[Optional[str]] = mapped_column(Text())
-    visibility: Mapped[str] = mapped_column(String(32), default="public", nullable=False)
-    feature_image: Mapped[Optional[str]] = mapped_column(Text())
-
-    meta_title: Mapped[Optional[str]] = mapped_column(String(300))
-    meta_description: Mapped[Optional[str]] = mapped_column(Text())
-
-    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-
-    # NEW: posts relationship is now direct Post objects via PostTag
-    posts: Mapped[List["Post"]] = relationship(
-        "Post",
-        secondary="post_tags",
-        primaryjoin="Tag.id==post_tags.c.tag_id",
-        secondaryjoin="Post.id==post_tags.c.post_id",
-        back_populates="tags",
-        order_by="PostTag.sort_order",
-    )
-
-
-class Post(Base):
-    __tablename__ = "posts"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
-    uuid: Mapped[str] = mapped_column(String(64), unique=True, nullable=False, server_default=func.gen_random_uuid())
-    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
-
-    title: Mapped[str] = mapped_column(String(500), nullable=False)
-
-    html: Mapped[Optional[str]] = mapped_column(Text())
-    plaintext: Mapped[Optional[str]] = mapped_column(Text())
-    mobiledoc: Mapped[Optional[str]] = mapped_column(Text())
-    lexical: Mapped[Optional[str]] = mapped_column(Text())
-
-    feature_image: Mapped[Optional[str]] = mapped_column(Text())
-    feature_image_alt: Mapped[Optional[str]] = mapped_column(Text())
-    feature_image_caption: Mapped[Optional[str]] = mapped_column(Text())
-
-    excerpt: Mapped[Optional[str]] = mapped_column(Text())
-    custom_excerpt: Mapped[Optional[str]] = mapped_column(Text())
-
-    visibility: Mapped[str] = mapped_column(String(32), default="public", nullable=False)
-    status: Mapped[str] = mapped_column(String(32), default="draft", nullable=False)
-    featured: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
-    is_page: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
-    email_only: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
-
-    canonical_url: Mapped[Optional[str]] = mapped_column(Text())
-    meta_title: Mapped[Optional[str]] = mapped_column(String(500))
-    meta_description: Mapped[Optional[str]] = mapped_column(Text())
-    og_image: Mapped[Optional[str]] = mapped_column(Text())
-    og_title: Mapped[Optional[str]] = mapped_column(String(500))
-    og_description: Mapped[Optional[str]] = mapped_column(Text())
-    twitter_image: Mapped[Optional[str]] = mapped_column(Text())
-    twitter_title: Mapped[Optional[str]] = mapped_column(String(500))
-    twitter_description: Mapped[Optional[str]] = mapped_column(Text())
-    custom_template: Mapped[Optional[str]] = mapped_column(String(191))
-
-    reading_time: Mapped[Optional[int]] = mapped_column(Integer())
-    comment_id: Mapped[Optional[str]] = mapped_column(String(191))
-
-    published_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
-    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
-    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-
-    user_id: Mapped[Optional[int]] = mapped_column(
-        Integer, index=True
-    )
-    publish_requested: Mapped[bool] = mapped_column(Boolean(), default=False, server_default="false", nullable=False)
-
-    primary_author_id: Mapped[Optional[int]] = mapped_column(
-        Integer, ForeignKey("authors.id", ondelete="SET NULL")
-    )
-    primary_tag_id: Mapped[Optional[int]] = mapped_column(
-        Integer, ForeignKey("tags.id", ondelete="SET NULL")
-    )
-
-    primary_author: Mapped[Optional["Author"]] = relationship(
-        "Author", foreign_keys=[primary_author_id]
-    )
-    primary_tag: Mapped[Optional[Tag]] = relationship(
-        "Tag", foreign_keys=[primary_tag_id]
-    )
-
-    # AUTHORS RELATIONSHIP (many-to-many via post_authors)
-    authors: Mapped[List["Author"]] = relationship(
-        "Author",
-        secondary="post_authors",
-        primaryjoin="Post.id==post_authors.c.post_id",
-        secondaryjoin="Author.id==post_authors.c.author_id",
-        back_populates="posts",
-        order_by="PostAuthor.sort_order",
-    )
-
-    # TAGS RELATIONSHIP (many-to-many via post_tags)
-    tags: Mapped[List[Tag]] = relationship(
-        "Tag",
-        secondary="post_tags",
-        primaryjoin="Post.id==post_tags.c.post_id",
-        secondaryjoin="Tag.id==post_tags.c.tag_id",
-        back_populates="posts",
-        order_by="PostTag.sort_order",
-    )
-
-class Author(Base):
-    __tablename__ = "authors"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
-
-    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
-    name: Mapped[str] = mapped_column(String(255), nullable=False)
-    email: Mapped[Optional[str]] = mapped_column(String(255))
-
-    profile_image: Mapped[Optional[str]] = mapped_column(Text())
-    cover_image: Mapped[Optional[str]] = mapped_column(Text())
-    bio: Mapped[Optional[str]] = mapped_column(Text())
-    website: Mapped[Optional[str]] = mapped_column(Text())
-    location: Mapped[Optional[str]] = mapped_column(Text())
-    facebook: Mapped[Optional[str]] = mapped_column(Text())
-    twitter: Mapped[Optional[str]] = mapped_column(Text())
-
-    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-
-    # backref to posts via post_authors
-    posts: Mapped[List[Post]] = relationship(
-        "Post",
-        secondary="post_authors",
-        primaryjoin="Author.id==post_authors.c.author_id",
-        secondaryjoin="Post.id==post_authors.c.post_id",
-        back_populates="authors",
-        order_by="PostAuthor.sort_order",
-    )
-
-class PostAuthor(Base):
-    __tablename__ = "post_authors"
-
-    post_id: Mapped[int] = mapped_column(
-        ForeignKey("posts.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    author_id: Mapped[int] = mapped_column(
-        ForeignKey("authors.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
-
-
-class PostTag(Base):
-    __tablename__ = "post_tags"
-
-    post_id: Mapped[int] = mapped_column(
-        ForeignKey("posts.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    tag_id: Mapped[int] = mapped_column(
-        ForeignKey("tags.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
-
-
-class PostUser(Base):
-    """Multi-author M2M: links posts to users (cross-DB, no FK on user_id)."""
-    __tablename__ = "post_users"
-
-    post_id: Mapped[int] = mapped_column(
-        ForeignKey("posts.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    user_id: Mapped[int] = mapped_column(
-        Integer, primary_key=True, index=True,
-    )
-    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
-
-

shared/services/blog_impl.py

@@ -1,65 +0,0 @@
-"""SQL-backed BlogService implementation.
-
-Queries ``shared.models.ghost_content.Post`` — only this module may read
-blog-domain tables on behalf of other domains.
-"""
-from __future__ import annotations
-
-from sqlalchemy import select, func
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from shared.models.ghost_content import Post
-from shared.contracts.dtos import PostDTO
-
-
-def _post_to_dto(post: Post) -> PostDTO:
-    return PostDTO(
-        id=post.id,
-        slug=post.slug,
-        title=post.title,
-        status=post.status,
-        visibility=post.visibility,
-        is_page=post.is_page,
-        feature_image=post.feature_image,
-        html=post.html,
-        excerpt=post.excerpt,
-        custom_excerpt=post.custom_excerpt,
-        published_at=post.published_at,
-    )
-
-
-class SqlBlogService:
-    async def get_post_by_slug(self, session: AsyncSession, slug: str) -> PostDTO | None:
-        post = (
-            await session.execute(select(Post).where(Post.slug == slug))
-        ).scalar_one_or_none()
-        return _post_to_dto(post) if post else None
-
-    async def get_post_by_id(self, session: AsyncSession, id: int) -> PostDTO | None:
-        post = (
-            await session.execute(select(Post).where(Post.id == id))
-        ).scalar_one_or_none()
-        return _post_to_dto(post) if post else None
-
-    async def get_posts_by_ids(self, session: AsyncSession, ids: list[int]) -> list[PostDTO]:
-        if not ids:
-            return []
-        result = await session.execute(select(Post).where(Post.id.in_(ids)))
-        return [_post_to_dto(p) for p in result.scalars().all()]
-
-    async def search_posts(
-        self, session: AsyncSession, query: str, page: int = 1, per_page: int = 10,
-    ) -> tuple[list[PostDTO], int]:
-        """Search posts by title with pagination. Not part of the Protocol
-        (admin-only use in events), but provided for convenience."""
-        if query:
-            count_stmt = select(func.count(Post.id)).where(Post.title.ilike(f"%{query}%"))
-            posts_stmt = select(Post).where(Post.title.ilike(f"%{query}%")).order_by(Post.title)
-        else:
-            count_stmt = select(func.count(Post.id))
-            posts_stmt = select(Post).order_by(Post.published_at.desc().nullslast())
-
-        total = (await session.execute(count_stmt)).scalar() or 0
-        offset = (page - 1) * per_page
-        result = await session.execute(posts_stmt.limit(per_page).offset(offset))
-        return [_post_to_dto(p) for p in result.scalars().all()], total

shared/services/entry_associations.py

@@ -4,16 +4,12 @@ Only uses HTTP-based fetch_data/call_action, no direct DB access.
 """
 from __future__ import annotations
 
-from sqlalchemy.ext.asyncio import AsyncSession
-
 from shared.infrastructure.actions import call_action, ActionError
 from shared.infrastructure.data_client import fetch_data
 from shared.contracts.dtos import CalendarEntryDTO, dto_from_dict
-from shared.services.registry import services
 
 
 async def toggle_entry_association(
-    session: AsyncSession,
     post_id: int,
     entry_id: int
 ) -> tuple[bool, str | None]:
@@ -21,7 +17,7 @@ async def toggle_entry_association(
     Toggle association between a post and calendar entry.
     Returns (is_now_associated, error_message).
     """
-    post = await services.blog.get_post_by_id(session, post_id)
+    post = await fetch_data("blog", "post-by-id", params={"id": post_id}, required=False)
     if not post:
         return False, "Post not found"
 
@@ -35,7 +31,6 @@ async def toggle_entry_association(
 
 
 async def get_post_entry_ids(
-    session: AsyncSession,
     post_id: int
 ) -> set[int]:
     """
@@ -49,7 +44,6 @@ async def get_post_entry_ids(
 
 
 async def get_associated_entries(
-    session: AsyncSession,
     post_id: int,
     page: int = 1,
     per_page: int = 10

shared/services/registry.py

@@ -8,15 +8,14 @@ Usage::
     from shared.services.registry import services
 
     # Register at app startup (own domain only)
-    services.blog = SqlBlogService()
+    services.calendar = SqlCalendarService()
 
     # Use locally within the owning app
-    post = await services.blog.get_post_by_slug(session, slug)
+    cals = await services.calendar.calendars_for_container(session, "page", page_id)
 """
 from __future__ import annotations
 
 from shared.contracts.protocols import (
-    BlogService,
     CalendarService,
     MarketService,
     CartService,
@@ -33,23 +32,11 @@ class _ServiceRegistry:
     """
 
     def __init__(self) -> None:
-        self._blog: BlogService | None = None
         self._calendar: CalendarService | None = None
         self._market: MarketService | None = None
         self._cart: CartService | None = None
         self._federation: FederationService | None = None
 
-    # -- blog -----------------------------------------------------------------
-    @property
-    def blog(self) -> BlogService:
-        if self._blog is None:
-            raise RuntimeError("BlogService not registered")
-        return self._blog
-
-    @blog.setter
-    def blog(self, impl: BlogService) -> None:
-        self._blog = impl
-
     # -- calendar -------------------------------------------------------------
     @property
     def calendar(self) -> CalendarService: