sboulahtit/orion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: fix all architecture validator findings (202 → 0)

Browse Source 
Eliminate all 103 errors and 96 warnings from the architecture validator:

Phase 1 - Validator rules & YAML:
- Add NAM-001/NAM-002 exceptions for module-scoped router/service files
- Fix API-004 to detect # public comments on decorator lines
- Add module-specific exception bases to EXC-004 valid_bases
- Exclude storefront files from AUTH-004 store context check
- Add SVC-006 exceptions for loyalty service atomic commits
- Fix _get_rule() to search naming_rules and auth_rules categories
- Use plain # CODE comments instead of # noqa: CODE for custom rules

Phase 2 - Billing module (5 route files):
- Move _resolve_store_to_merchant to subscription_service
- Move tier/feature queries to feature_service, admin_subscription_service
- Extract 22 inline Pydantic schemas to billing/schemas/billing.py
- Replace all HTTPException with domain exceptions

Phase 3 - Loyalty module (4 routes + points_service):
- Add 7 domain exceptions (Apple auth, enrollment, device registration)
- Add service methods to card_service, program_service, apple_wallet_service
- Move all db.query() from routes to service layer
- Fix SVC-001: replace HTTPException in points_service with domain exception

Phase 4 - Remaining modules:
- tenancy: move store stats queries to admin_service
- cms: move platform resolution to content_page_service, add NoPlatformSubscriptionException
- messaging: move user/customer lookups to messaging_service
- Add ConfigDict(from_attributes=True) to ContentPageResponse

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Samir Boulahtit
2026-02-13 18:49:24 +01:00
parent 9173448645
commit 7c43d6f4a2
48 changed files with 1613 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/modules/billing/services/admin_subscription_service.py
View File

@@ -269,6 +269,23 @@ class AdminSubscriptionService:
"pages": ceil(total / per_page) if total > 0 else 0,
}
# =========================================================================
# Platform Helpers
# =========================================================================
def get_platform_names_map(self, db: Session) -> dict[int, str]:
"""Get mapping of platform_id -> platform_name."""
from app.modules.tenancy.models import Platform
return {p.id: p.name for p in db.query(Platform).all()}
def get_platform_name(self, db: Session, platform_id: int) -> str | None:
"""Get platform name by ID."""
from app.modules.tenancy.models import Platform
p = db.query(Platform).filter(Platform.id == platform_id).first()
return p.name if p else None
# =========================================================================
# Statistics
# =========================================================================

82
app/modules/billing/services/feature_service.py
View File

@@ -34,6 +34,7 @@ from app.modules.billing.models import (
MerchantSubscription,
SubscriptionTier,
)
from app.modules.billing.models.tier_feature_limit import TierFeatureLimit
from app.modules.contracts.features import FeatureType
logger = logging.getLogger(__name__)
@@ -434,6 +435,87 @@ class FeatureService:
return summaries
# =========================================================================
# Tier Feature Limit Management
# =========================================================================
def get_tier_feature_limits(self, db: Session, tier_code: str) -> list:
"""Get feature limits for a tier."""
from app.modules.billing.services import admin_subscription_service
tier = admin_subscription_service.get_tier_by_code(db, tier_code)
return (
db.query(TierFeatureLimit)
.filter(TierFeatureLimit.tier_id == tier.id)
.order_by(TierFeatureLimit.feature_code)
.all()
)
def upsert_tier_feature_limits(self, db: Session, tier_code: str, entries: list[dict]) -> list:
"""Replace feature limits for a tier. Returns list of new TierFeatureLimit objects."""
from app.modules.billing.services import admin_subscription_service
tier = admin_subscription_service.get_tier_by_code(db, tier_code)
db.query(TierFeatureLimit).filter(TierFeatureLimit.tier_id == tier.id).delete()
new_rows = []
for entry in entries:
if not entry.get("enabled", True):
continue
row = TierFeatureLimit(
tier_id=tier.id,
feature_code=entry["feature_code"],
limit_value=entry.get("limit_value"),
)
db.add(row)
new_rows.append(row)
return new_rows
# =========================================================================
# Merchant Feature Override Management
# =========================================================================
def get_merchant_overrides(self, db: Session, merchant_id: int) -> list:
"""Get feature overrides for a merchant."""
return (
db.query(MerchantFeatureOverride)
.filter(MerchantFeatureOverride.merchant_id == merchant_id)
.order_by(MerchantFeatureOverride.feature_code)
.all()
)
def upsert_merchant_overrides(
self, db: Session, merchant_id: int, platform_id: int, entries: list[dict]
) -> list:
"""Upsert feature overrides for a merchant."""
results = []
for entry in entries:
existing = (
db.query(MerchantFeatureOverride)
.filter(
MerchantFeatureOverride.merchant_id == merchant_id,
MerchantFeatureOverride.platform_id == platform_id,
MerchantFeatureOverride.feature_code == entry["feature_code"],
)
.first()
)
if existing:
existing.limit_value = entry.get("limit_value")
existing.is_enabled = entry.get("is_enabled", True)
existing.reason = entry.get("reason")
results.append(existing)
else:
row = MerchantFeatureOverride(
merchant_id=merchant_id,
platform_id=platform_id,
feature_code=entry["feature_code"],
limit_value=entry.get("limit_value"),
is_enabled=entry.get("is_enabled", True),
reason=entry.get("reason"),
)
db.add(row)
results.append(row)
return results
# =========================================================================
# Cache Management
# =========================================================================

36
app/modules/billing/services/subscription_service.py
View File

@@ -28,6 +28,7 @@ from datetime import UTC, datetime, timedelta
from sqlalchemy.orm import Session, joinedload
from app.exceptions import ResourceNotFoundException
from app.modules.billing.exceptions import (
SubscriptionNotFoundException, # Re-exported for backward compatibility
)
@@ -44,6 +45,41 @@ logger = logging.getLogger(__name__)
class SubscriptionService:
"""Service for merchant-level subscription management."""
# =========================================================================
# Store Resolution
# =========================================================================
def resolve_store_to_merchant(self, db: Session, store_id: int) -> tuple[int, int]:
"""Resolve store_id to (merchant_id, platform_id).
Raises:
ResourceNotFoundException: If store not found or has no platform
"""
from app.modules.tenancy.models import Store, StorePlatform
store = db.query(Store).filter(Store.id == store_id).first()
if not store or not store.merchant_id:
raise ResourceNotFoundException("Store", str(store_id))
sp = db.query(StorePlatform.platform_id).filter(
StorePlatform.store_id == store_id
).first()
if not sp:
raise ResourceNotFoundException("StorePlatform", f"store_id={store_id}")
return store.merchant_id, sp[0]
def get_store_code(self, db: Session, store_id: int) -> str:
"""Get the store_code for a given store_id.
Raises:
ResourceNotFoundException: If store not found
"""
from app.modules.tenancy.models import Store
store = db.query(Store).filter(Store.id == store_id).first()
if not store:
raise ResourceNotFoundException("Store", str(store_id))
return store.store_code
# =========================================================================
# Tier Information
# =========================================================================