Decouple cart: use shared.models for all cross-app imports
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 50s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 50s
- Replace all imports from blog.models, market.models, events.models and bare models.* with shared.models equivalents - Convert cart/models/order.py and page_config.py to re-export stubs - Update shared + glue submodule pointers Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -10,10 +10,10 @@ from quart import Blueprint, g, request, jsonify
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from market.models.market import CartItem
|
||||
from market.models.market_place import MarketPlace
|
||||
from events.models.calendars import CalendarEntry, Calendar
|
||||
from blog.models.ghost_content import Post
|
||||
from shared.models.market import CartItem
|
||||
from shared.models.market_place import MarketPlace
|
||||
from shared.models.calendars import CalendarEntry, Calendar
|
||||
from shared.models.ghost_content import Post
|
||||
from shared.browser.app.csrf import csrf_exempt
|
||||
from shared.infrastructure.cart_identity import current_cart_identity
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@ from __future__ import annotations
|
||||
from quart import Blueprint, g, request, render_template, redirect, url_for, make_response
|
||||
from sqlalchemy import select
|
||||
|
||||
from models.order import Order
|
||||
from blog.models.ghost_content import Post
|
||||
from market.models.market_place import MarketPlace
|
||||
from shared.models.order import Order
|
||||
from shared.models.ghost_content import Post
|
||||
from shared.models.market_place import MarketPlace
|
||||
from glue.services.order_lifecycle import get_entries_for_order
|
||||
from .services import (
|
||||
current_cart_identity,
|
||||
|
||||
@@ -3,7 +3,7 @@ from __future__ import annotations
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from events.models.calendars import CalendarEntry
|
||||
from shared.models.calendars import CalendarEntry
|
||||
from .identity import current_cart_identity
|
||||
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@ from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from market.models.market import Product, CartItem
|
||||
from models.order import Order, OrderItem
|
||||
from events.models.calendars import CalendarEntry, Calendar
|
||||
from models.page_config import PageConfig
|
||||
from market.models.market_place import MarketPlace
|
||||
from shared.models.market import Product, CartItem
|
||||
from shared.models.order import Order, OrderItem
|
||||
from shared.models.calendars import CalendarEntry, Calendar
|
||||
from shared.models.page_config import PageConfig
|
||||
from shared.models.market_place import MarketPlace
|
||||
from shared.config import config
|
||||
from shared.events import emit_event
|
||||
from glue.services.order_lifecycle import claim_entries_for_order
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from sqlalchemy import update, func, select
|
||||
|
||||
from market.models.market import CartItem
|
||||
from market.models.market_place import MarketPlace
|
||||
from models.order import Order
|
||||
from shared.models.market import CartItem
|
||||
from shared.models.market_place import MarketPlace
|
||||
from shared.models.order import Order
|
||||
|
||||
|
||||
async def clear_cart_for_order(session, order: Order, *, page_post_id: int | None = None) -> None:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from market.models.market import CartItem
|
||||
from shared.models.market import CartItem
|
||||
from .identity import current_cart_identity
|
||||
|
||||
async def get_cart(session):
|
||||
|
||||
@@ -12,11 +12,11 @@ from collections import defaultdict
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from market.models.market import CartItem
|
||||
from market.models.market_place import MarketPlace
|
||||
from events.models.calendars import CalendarEntry, Calendar
|
||||
from blog.models.ghost_content import Post
|
||||
from models.page_config import PageConfig
|
||||
from shared.models.market import CartItem
|
||||
from shared.models.market_place import MarketPlace
|
||||
from shared.models.calendars import CalendarEntry, Calendar
|
||||
from shared.models.ghost_content import Post
|
||||
from shared.models.page_config import PageConfig
|
||||
from .identity import current_cart_identity
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user