refactor: fix all architecture validator findings (202 → 0)
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:
@@ -9,18 +9,14 @@ Platform endpoints for:
|
||||
"""
|
||||
|
||||
import logging
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter, Depends, Header, HTTPException, Path, Response
|
||||
from fastapi import APIRouter, Depends, Header, Path, Response
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.modules.loyalty.exceptions import (
|
||||
LoyaltyException,
|
||||
)
|
||||
from app.modules.loyalty.models import LoyaltyCard
|
||||
from app.modules.loyalty.services import (
|
||||
apple_wallet_service,
|
||||
card_service,
|
||||
program_service,
|
||||
)
|
||||
|
||||
@@ -41,23 +37,11 @@ def get_program_by_store_code(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Get loyalty program info by store code (for enrollment page)."""
|
||||
from app.modules.tenancy.models import Store
|
||||
|
||||
# Find store by code (store_code or subdomain)
|
||||
store = (
|
||||
db.query(Store)
|
||||
.filter(
|
||||
(Store.store_code == store_code) | (Store.subdomain == store_code)
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not store:
|
||||
raise HTTPException(status_code=404, detail="Store not found")
|
||||
store = program_service.get_store_by_code(db, store_code)
|
||||
|
||||
# Get program
|
||||
program = program_service.get_active_program_by_store(db, store.id)
|
||||
if not program:
|
||||
raise HTTPException(status_code=404, detail="No active loyalty program")
|
||||
# Get program (raises LoyaltyProgramNotFoundException if not found)
|
||||
program = program_service.require_active_program_by_store(db, store.id)
|
||||
|
||||
return {
|
||||
"store_name": store.name,
|
||||
@@ -88,21 +72,10 @@ def download_apple_pass(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Download Apple Wallet pass for a card."""
|
||||
# Find card by serial number
|
||||
card = (
|
||||
db.query(LoyaltyCard)
|
||||
.filter(LoyaltyCard.apple_serial_number == serial_number)
|
||||
.first()
|
||||
)
|
||||
# Find card by serial number (raises LoyaltyCardNotFoundException if not found)
|
||||
card = card_service.require_card_by_serial_number(db, serial_number)
|
||||
|
||||
if not card:
|
||||
raise HTTPException(status_code=404, detail="Pass not found")
|
||||
|
||||
try:
|
||||
pass_data = apple_wallet_service.generate_pass(db, card)
|
||||
except LoyaltyException as e:
|
||||
logger.error(f"Failed to generate Apple pass for card {card.id}: {e}")
|
||||
raise HTTPException(status_code=500, detail="Failed to generate pass")
|
||||
pass_data = apple_wallet_service.generate_pass_safe(db, card)
|
||||
|
||||
return Response(
|
||||
content=pass_data,
|
||||
@@ -132,34 +105,17 @@ def register_device(
|
||||
|
||||
Called by Apple when user adds pass to wallet.
|
||||
"""
|
||||
# Validate authorization token
|
||||
auth_token = None
|
||||
if authorization and authorization.startswith("ApplePass "):
|
||||
auth_token = authorization.split(" ", 1)[1]
|
||||
# Find card (raises LoyaltyCardNotFoundException if not found)
|
||||
card = card_service.require_card_by_serial_number(db, serial_number)
|
||||
|
||||
# Find card
|
||||
card = (
|
||||
db.query(LoyaltyCard)
|
||||
.filter(LoyaltyCard.apple_serial_number == serial_number)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not card:
|
||||
raise HTTPException(status_code=404)
|
||||
|
||||
# Verify auth token
|
||||
if not auth_token or auth_token != card.apple_auth_token:
|
||||
raise HTTPException(status_code=401)
|
||||
# Verify auth token (raises InvalidAppleAuthTokenException if invalid)
|
||||
apple_wallet_service.verify_auth_token(card, authorization)
|
||||
|
||||
# Get push token from request body
|
||||
# Note: In real implementation, parse the JSON body for pushToken
|
||||
# For now, use device_id as a placeholder
|
||||
try:
|
||||
apple_wallet_service.register_device(db, card, device_id, device_id)
|
||||
return Response(status_code=201)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to register device: {e}")
|
||||
raise HTTPException(status_code=500)
|
||||
apple_wallet_service.register_device_safe(db, card, device_id, device_id)
|
||||
return Response(status_code=201)
|
||||
|
||||
|
||||
@platform_router.delete("/apple/v1/devices/{device_id}/registrations/{pass_type_id}/{serial_number}")
|
||||
@@ -175,31 +131,14 @@ def unregister_device(
|
||||
|
||||
Called by Apple when user removes pass from wallet.
|
||||
"""
|
||||
# Validate authorization token
|
||||
auth_token = None
|
||||
if authorization and authorization.startswith("ApplePass "):
|
||||
auth_token = authorization.split(" ", 1)[1]
|
||||
# Find card (raises LoyaltyCardNotFoundException if not found)
|
||||
card = card_service.require_card_by_serial_number(db, serial_number)
|
||||
|
||||
# Find card
|
||||
card = (
|
||||
db.query(LoyaltyCard)
|
||||
.filter(LoyaltyCard.apple_serial_number == serial_number)
|
||||
.first()
|
||||
)
|
||||
# Verify auth token (raises InvalidAppleAuthTokenException if invalid)
|
||||
apple_wallet_service.verify_auth_token(card, authorization)
|
||||
|
||||
if not card:
|
||||
raise HTTPException(status_code=404)
|
||||
|
||||
# Verify auth token
|
||||
if not auth_token or auth_token != card.apple_auth_token:
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
try:
|
||||
apple_wallet_service.unregister_device(db, card, device_id)
|
||||
return Response(status_code=200)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to unregister device: {e}")
|
||||
raise HTTPException(status_code=500)
|
||||
apple_wallet_service.unregister_device_safe(db, card, device_id)
|
||||
return Response(status_code=200)
|
||||
|
||||
|
||||
@platform_router.get("/apple/v1/devices/{device_id}/registrations/{pass_type_id}")
|
||||
@@ -214,32 +153,11 @@ def get_serial_numbers(
|
||||
|
||||
Called by Apple to check for updated passes.
|
||||
"""
|
||||
from app.modules.loyalty.models import AppleDeviceRegistration
|
||||
|
||||
# Find all cards registered to this device
|
||||
registrations = (
|
||||
db.query(AppleDeviceRegistration)
|
||||
.filter(AppleDeviceRegistration.device_library_identifier == device_id)
|
||||
.all()
|
||||
# Get cards registered to this device, optionally filtered by update time
|
||||
cards = apple_wallet_service.get_updated_cards_for_device(
|
||||
db, device_id, updated_since=passesUpdatedSince
|
||||
)
|
||||
|
||||
if not registrations:
|
||||
return Response(status_code=204)
|
||||
|
||||
# Get cards that have been updated since the given timestamp
|
||||
card_ids = [r.card_id for r in registrations]
|
||||
|
||||
query = db.query(LoyaltyCard).filter(LoyaltyCard.id.in_(card_ids))
|
||||
|
||||
if passesUpdatedSince:
|
||||
try:
|
||||
since = datetime.fromisoformat(passesUpdatedSince.replace("Z", "+00:00"))
|
||||
query = query.filter(LoyaltyCard.updated_at > since)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
cards = query.all()
|
||||
|
||||
if not cards:
|
||||
return Response(status_code=204)
|
||||
|
||||
@@ -265,30 +183,13 @@ def get_latest_pass(
|
||||
|
||||
Called by Apple to fetch updated pass data.
|
||||
"""
|
||||
# Validate authorization token
|
||||
auth_token = None
|
||||
if authorization and authorization.startswith("ApplePass "):
|
||||
auth_token = authorization.split(" ", 1)[1]
|
||||
# Find card (raises LoyaltyCardNotFoundException if not found)
|
||||
card = card_service.require_card_by_serial_number(db, serial_number)
|
||||
|
||||
# Find card
|
||||
card = (
|
||||
db.query(LoyaltyCard)
|
||||
.filter(LoyaltyCard.apple_serial_number == serial_number)
|
||||
.first()
|
||||
)
|
||||
# Verify auth token (raises InvalidAppleAuthTokenException if invalid)
|
||||
apple_wallet_service.verify_auth_token(card, authorization)
|
||||
|
||||
if not card:
|
||||
raise HTTPException(status_code=404)
|
||||
|
||||
# Verify auth token
|
||||
if not auth_token or auth_token != card.apple_auth_token:
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
try:
|
||||
pass_data = apple_wallet_service.generate_pass(db, card)
|
||||
except LoyaltyException as e:
|
||||
logger.error(f"Failed to generate Apple pass for card {card.id}: {e}")
|
||||
raise HTTPException(status_code=500, detail="Failed to generate pass")
|
||||
pass_data = apple_wallet_service.generate_pass_safe(db, card)
|
||||
|
||||
return Response(
|
||||
content=pass_data,
|
||||
|
||||
Reference in New Issue
Block a user