fix(lint): auto-fix ruff violations and tune lint rules
- Auto-fixed 4,496 lint issues (import sorting, modern syntax, etc.) - Added ignore rules for patterns intentional in this codebase: E402 (late imports), E712 (SQLAlchemy filters), B904 (raise from), SIM108/SIM105/SIM117 (readability preferences) - Added per-file ignores for tests and scripts - Excluded broken scripts/rename_terminology.py (has curly quotes) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,38 +6,38 @@ Provides loyalty program management, card operations, stamp/points
|
||||
handling, and wallet integration.
|
||||
"""
|
||||
|
||||
from app.modules.loyalty.services.program_service import (
|
||||
ProgramService,
|
||||
program_service,
|
||||
from app.modules.loyalty.services.apple_wallet_service import (
|
||||
AppleWalletService,
|
||||
apple_wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.card_service import (
|
||||
CardService,
|
||||
card_service,
|
||||
)
|
||||
from app.modules.loyalty.services.stamp_service import (
|
||||
StampService,
|
||||
stamp_service,
|
||||
)
|
||||
from app.modules.loyalty.services.points_service import (
|
||||
PointsService,
|
||||
points_service,
|
||||
from app.modules.loyalty.services.google_wallet_service import (
|
||||
GoogleWalletService,
|
||||
google_wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.pin_service import (
|
||||
PinService,
|
||||
pin_service,
|
||||
)
|
||||
from app.modules.loyalty.services.points_service import (
|
||||
PointsService,
|
||||
points_service,
|
||||
)
|
||||
from app.modules.loyalty.services.program_service import (
|
||||
ProgramService,
|
||||
program_service,
|
||||
)
|
||||
from app.modules.loyalty.services.stamp_service import (
|
||||
StampService,
|
||||
stamp_service,
|
||||
)
|
||||
from app.modules.loyalty.services.wallet_service import (
|
||||
WalletService,
|
||||
wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.google_wallet_service import (
|
||||
GoogleWalletService,
|
||||
google_wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.apple_wallet_service import (
|
||||
AppleWalletService,
|
||||
apple_wallet_service,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"ProgramService",
|
||||
|
||||
@@ -22,7 +22,11 @@ from app.modules.loyalty.exceptions import (
|
||||
AppleWalletNotConfiguredException,
|
||||
WalletIntegrationException,
|
||||
)
|
||||
from app.modules.loyalty.models import AppleDeviceRegistration, LoyaltyCard, LoyaltyProgram
|
||||
from app.modules.loyalty.models import (
|
||||
AppleDeviceRegistration,
|
||||
LoyaltyCard,
|
||||
LoyaltyProgram,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ Handles Google Wallet integration including:
|
||||
- Generating "Add to Wallet" URLs
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
from typing import Any
|
||||
|
||||
@@ -135,17 +134,16 @@ class GoogleWalletService:
|
||||
|
||||
logger.info(f"Created Google Wallet class {class_id} for program {program.id}")
|
||||
return class_id
|
||||
elif response.status_code == 409:
|
||||
if response.status_code == 409:
|
||||
# Class already exists
|
||||
program.google_class_id = class_id
|
||||
db.commit()
|
||||
return class_id
|
||||
else:
|
||||
error = response.json() if response.text else {}
|
||||
raise WalletIntegrationException(
|
||||
"google",
|
||||
f"Failed to create class: {response.status_code} - {error}",
|
||||
)
|
||||
error = response.json() if response.text else {}
|
||||
raise WalletIntegrationException(
|
||||
"google",
|
||||
f"Failed to create class: {response.status_code} - {error}",
|
||||
)
|
||||
except WalletIntegrationException:
|
||||
raise
|
||||
except Exception as e:
|
||||
@@ -223,17 +221,16 @@ class GoogleWalletService:
|
||||
|
||||
logger.info(f"Created Google Wallet object {object_id} for card {card.id}")
|
||||
return object_id
|
||||
elif response.status_code == 409:
|
||||
if response.status_code == 409:
|
||||
# Object already exists
|
||||
card.google_object_id = object_id
|
||||
db.commit()
|
||||
return object_id
|
||||
else:
|
||||
error = response.json() if response.text else {}
|
||||
raise WalletIntegrationException(
|
||||
"google",
|
||||
f"Failed to create object: {response.status_code} - {error}",
|
||||
)
|
||||
error = response.json() if response.text else {}
|
||||
raise WalletIntegrationException(
|
||||
"google",
|
||||
f"Failed to create object: {response.status_code} - {error}",
|
||||
)
|
||||
except WalletIntegrationException:
|
||||
raise
|
||||
except Exception as e:
|
||||
@@ -330,9 +327,10 @@ class GoogleWalletService:
|
||||
|
||||
# Generate JWT for save link
|
||||
try:
|
||||
import jwt
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import jwt
|
||||
|
||||
credentials = self._get_credentials()
|
||||
|
||||
claims = {
|
||||
|
||||
@@ -14,7 +14,6 @@ Handles PIN operations including:
|
||||
"""
|
||||
|
||||
import logging
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
@@ -218,7 +217,6 @@ class PinService:
|
||||
def delete_pin(self, db: Session, pin_id: int) -> None:
|
||||
"""Delete a staff PIN."""
|
||||
pin = self.require_pin(db, pin_id)
|
||||
program_id = pin.program_id
|
||||
store_id = pin.store_id
|
||||
|
||||
db.delete(pin)
|
||||
|
||||
@@ -27,7 +27,7 @@ from app.modules.loyalty.exceptions import (
|
||||
LoyaltyProgramInactiveException,
|
||||
StaffPinRequiredException,
|
||||
)
|
||||
from app.modules.loyalty.models import LoyaltyCard, LoyaltyTransaction, TransactionType
|
||||
from app.modules.loyalty.models import LoyaltyTransaction, TransactionType
|
||||
from app.modules.loyalty.services.card_service import card_service
|
||||
from app.modules.loyalty.services.pin_service import pin_service
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ from app.modules.loyalty.exceptions import (
|
||||
)
|
||||
from app.modules.loyalty.models import (
|
||||
LoyaltyProgram,
|
||||
LoyaltyType,
|
||||
MerchantLoyaltySettings,
|
||||
)
|
||||
from app.modules.loyalty.schemas.program import (
|
||||
@@ -512,7 +511,7 @@ class ProgramService:
|
||||
"id": program.id,
|
||||
"display_name": program.display_name,
|
||||
"card_name": program.card_name,
|
||||
"loyalty_type": program.loyalty_type.value if hasattr(program.loyalty_type, 'value') else str(program.loyalty_type),
|
||||
"loyalty_type": program.loyalty_type.value if hasattr(program.loyalty_type, "value") else str(program.loyalty_type),
|
||||
"points_per_euro": program.points_per_euro,
|
||||
"welcome_bonus_points": program.welcome_bonus_points,
|
||||
"minimum_redemption_points": program.minimum_redemption_points,
|
||||
|
||||
@@ -19,16 +19,15 @@ from datetime import UTC, datetime, timedelta
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.modules.loyalty.config import config
|
||||
from app.modules.loyalty.exceptions import (
|
||||
DailyStampLimitException,
|
||||
InsufficientStampsException,
|
||||
LoyaltyCardInactiveException,
|
||||
LoyaltyProgramInactiveException,
|
||||
StampCooldownException,
|
||||
StaffPinRequiredException,
|
||||
StampCooldownException,
|
||||
)
|
||||
from app.modules.loyalty.models import LoyaltyCard, LoyaltyTransaction, TransactionType
|
||||
from app.modules.loyalty.models import LoyaltyTransaction, TransactionType
|
||||
from app.modules.loyalty.services.card_service import card_service
|
||||
from app.modules.loyalty.services.pin_service import pin_service
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import logging
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.modules.loyalty.models import LoyaltyCard, LoyaltyProgram
|
||||
from app.modules.loyalty.models import LoyaltyCard
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -33,8 +33,12 @@ class WalletService:
|
||||
Returns:
|
||||
Dict with google_wallet_url and apple_wallet_url
|
||||
"""
|
||||
from app.modules.loyalty.services.apple_wallet_service import apple_wallet_service
|
||||
from app.modules.loyalty.services.google_wallet_service import google_wallet_service
|
||||
from app.modules.loyalty.services.apple_wallet_service import (
|
||||
apple_wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.google_wallet_service import (
|
||||
google_wallet_service,
|
||||
)
|
||||
|
||||
urls = {
|
||||
"google_wallet_url": None,
|
||||
@@ -72,15 +76,18 @@ class WalletService:
|
||||
Returns:
|
||||
Dict with success status for each wallet
|
||||
"""
|
||||
from app.modules.loyalty.services.apple_wallet_service import apple_wallet_service
|
||||
from app.modules.loyalty.services.google_wallet_service import google_wallet_service
|
||||
from app.modules.loyalty.services.apple_wallet_service import (
|
||||
apple_wallet_service,
|
||||
)
|
||||
from app.modules.loyalty.services.google_wallet_service import (
|
||||
google_wallet_service,
|
||||
)
|
||||
|
||||
results = {
|
||||
"google_wallet": False,
|
||||
"apple_wallet": False,
|
||||
}
|
||||
|
||||
program = card.program
|
||||
|
||||
# Sync to Google Wallet
|
||||
if card.google_object_id:
|
||||
@@ -113,7 +120,9 @@ class WalletService:
|
||||
Returns:
|
||||
Dict with success status for each wallet
|
||||
"""
|
||||
from app.modules.loyalty.services.google_wallet_service import google_wallet_service
|
||||
from app.modules.loyalty.services.google_wallet_service import (
|
||||
google_wallet_service,
|
||||
)
|
||||
|
||||
results = {
|
||||
"google_wallet": False,
|
||||
|
||||
Reference in New Issue
Block a user