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>
38 lines
1.1 KiB
Python
38 lines
1.1 KiB
Python
"""Extra cart query methods not in the CartService protocol.
|
|
|
|
cart-items returns raw CartItem data without going through CartSummaryDTO.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from shared.models.market import CartItem
|
|
|
|
|
|
class SqlCartItemsService:
|
|
|
|
async def cart_items(
|
|
self, session: AsyncSession, *,
|
|
user_id: int | None = None, session_id: str | None = None,
|
|
) -> list[dict[str, Any]]:
|
|
filters = [CartItem.deleted_at.is_(None)]
|
|
if user_id is not None:
|
|
filters.append(CartItem.user_id == user_id)
|
|
elif session_id is not None:
|
|
filters.append(CartItem.session_id == session_id)
|
|
else:
|
|
return []
|
|
|
|
result = await session.execute(select(CartItem).where(*filters))
|
|
return [
|
|
{
|
|
"product_id": item.product_id,
|
|
"product_slug": item.product_slug,
|
|
"quantity": item.quantity,
|
|
}
|
|
for item in result.scalars().all()
|
|
]
|