giles
1f36987f77
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 2m5s
The inter-service data layer (fetch_data/call_action) was the least structured part of the codebase — Python _handlers dicts with ad-hoc param extraction scattered across 16 route files. This replaces them with declarative .sx query/action definitions that make the entire inter-service protocol self-describing and greppable. Infrastructure: - defquery/defaction special forms in the sx evaluator - Query/action registry with load, lookup, and schema introspection - Query executor using async_eval with I/O primitives - Blueprint factories (create_data_blueprint/create_action_blueprint) with sx-first dispatch and Python fallback - /internal/schema endpoint on every service - parse-datetime and split-ids primitives for type coercion Service extractions: - LikesService (toggle, is_liked, liked_slugs, liked_ids) - PageConfigService (ensure, get_by_container, get_by_id, get_batch, update) - RelationsService (wraps module-level functions) - AccountDataService (user_by_email, newsletters) - CartItemsService, MarketDataService (raw SQLAlchemy lookups) 50 of 54 handlers converted to sx, 4 Python fallbacks remain (ghost-sync/push-member, clear-cart-for-order, create-order). Net: -1,383 lines Python, +251 lines modified. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
87 lines
3.1 KiB
Python
87 lines
3.1 KiB
Python
"""Blog app service registration."""
|
|
from __future__ import annotations
|
|
|
|
from sqlalchemy import select, func
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from shared.contracts.dtos import PostDTO
|
|
|
|
from models.content import Post
|
|
|
|
|
|
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,
|
|
sx_content=post.sx_content,
|
|
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]:
|
|
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
|
|
|
|
|
|
# Module-level singleton — import this in blog code.
|
|
blog_service = SqlBlogService()
|
|
|
|
|
|
def register_domain_services() -> None:
|
|
"""Register services for the blog app.
|
|
|
|
Blog owns: Post, Tag, Author, PostAuthor, PostTag.
|
|
Cross-app calls go over HTTP via call_action() / fetch_data().
|
|
"""
|
|
from shared.services.registry import services
|
|
services.register("blog", blog_service)
|
|
|
|
from shared.services.page_config_impl import SqlPageConfigService
|
|
services.register("page_config", SqlPageConfigService())
|
|
|
|
# Federation needed for AP shared infrastructure (activitypub blueprint)
|
|
if not services.has("federation"):
|
|
from shared.services.federation_impl import SqlFederationService
|
|
services.federation = SqlFederationService()
|
|
|
|
from .blog_page import BlogPageService
|
|
services.register("blog_page", BlogPageService())
|