8897b7fa5e
- Add @logged_command decorator in utils/decorators.py to eliminate try/catch/finally boilerplate - Migrate all Discord commands to use new decorator pattern: * commands/league/info.py - /league command * commands/players/info.py - /player command * commands/teams/info.py - /team and /teams commands * commands/teams/roster.py - /roster command - Fix PyLance type issues by making model IDs required for database entities - Update Player and Team models to require id field since they come from database - Fix test cases to provide required id values - Add comprehensive test coverage for decorator functionality - Add migration guide for applying decorator to additional commands - Reduce codebase by ~100 lines of repetitive logging boilerplate 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
108 lines
4.3 KiB
Python
108 lines
4.3 KiB
Python
"""
|
|
Player model for SBA players
|
|
|
|
Represents a player with team relationships and position information.
|
|
"""
|
|
from typing import Optional, List
|
|
from pydantic import Field
|
|
|
|
from models.base import SBABaseModel
|
|
from models.team import Team
|
|
|
|
|
|
class Player(SBABaseModel):
|
|
"""Player model representing an SBA player."""
|
|
|
|
# Override base model to make id required for database entities
|
|
id: int = Field(..., description="Player ID from database")
|
|
|
|
name: str = Field(..., description="Player full name")
|
|
wara: float = Field(..., description="Wins Above Replacement Average")
|
|
season: int = Field(..., description="Season number")
|
|
|
|
# Team relationship
|
|
team_id: int = Field(..., description="Team ID this player belongs to")
|
|
team: Optional[Team] = Field(None, description="Team object (populated when needed)")
|
|
|
|
# Images and media
|
|
image: str = Field(..., description="Primary player image URL")
|
|
image2: Optional[str] = Field(None, description="Secondary player image URL")
|
|
vanity_card: Optional[str] = Field(None, description="Custom vanity card URL")
|
|
headshot: Optional[str] = Field(None, description="Player headshot URL")
|
|
|
|
# Positions (up to 8 positions)
|
|
pos_1: str = Field(..., description="Primary position")
|
|
pos_2: Optional[str] = None
|
|
pos_3: Optional[str] = None
|
|
pos_4: Optional[str] = None
|
|
pos_5: Optional[str] = None
|
|
pos_6: Optional[str] = None
|
|
pos_7: Optional[str] = None
|
|
pos_8: Optional[str] = None
|
|
|
|
# Injury and status information
|
|
pitcher_injury: Optional[int] = Field(None, description="Pitcher injury rating")
|
|
injury_rating: Optional[str] = Field(None, description="General injury rating")
|
|
il_return: Optional[str] = Field(None, description="Injured list return date")
|
|
demotion_week: Optional[int] = Field(None, description="Week of demotion")
|
|
|
|
# Game tracking
|
|
last_game: Optional[str] = Field(None, description="Last game played")
|
|
last_game2: Optional[str] = Field(None, description="Second to last game played")
|
|
|
|
# External identifiers
|
|
strat_code: Optional[str] = Field(None, description="Strat-o-matic code")
|
|
bbref_id: Optional[str] = Field(None, description="Baseball Reference ID")
|
|
sbaplayer_id: Optional[int] = Field(None, description="SBA player ID")
|
|
|
|
@property
|
|
def positions(self) -> List[str]:
|
|
"""Return list of all positions this player can play."""
|
|
positions = []
|
|
for i in range(1, 9):
|
|
pos = getattr(self, f'pos_{i}', None)
|
|
if pos:
|
|
positions.append(pos)
|
|
return positions
|
|
|
|
@property
|
|
def primary_position(self) -> str:
|
|
"""Return the player's primary position."""
|
|
return self.pos_1
|
|
|
|
@classmethod
|
|
def from_api_data(cls, data: dict) -> 'Player':
|
|
"""
|
|
Create Player instance from API data, handling nested team structure.
|
|
|
|
The API returns team data as a nested object, but our model expects
|
|
both team_id (int) and team (optional Team object).
|
|
"""
|
|
# Make a copy to avoid modifying original data
|
|
player_data = data.copy()
|
|
|
|
# Handle nested team structure
|
|
if 'team' in player_data and isinstance(player_data['team'], dict):
|
|
team_data = player_data['team']
|
|
# Extract team_id from nested team object
|
|
player_data['team_id'] = team_data.get('id')
|
|
# Keep team object for optional population
|
|
if team_data.get('id'):
|
|
from models.team import Team
|
|
player_data['team'] = Team.from_api_data(team_data)
|
|
|
|
# Handle nested sbaplayer_id structure (API sometimes returns object instead of int)
|
|
if 'sbaplayer_id' in player_data and isinstance(player_data['sbaplayer_id'], dict):
|
|
sba_data = player_data['sbaplayer_id']
|
|
# Extract ID from nested object, or set to None if no valid ID
|
|
player_data['sbaplayer_id'] = sba_data.get('id') if sba_data.get('id') else None
|
|
|
|
return super().from_api_data(player_data)
|
|
|
|
@property
|
|
def is_pitcher(self) -> bool:
|
|
"""Check if player is a pitcher."""
|
|
return self.pos_1 in ['SP', 'RP', 'P']
|
|
|
|
def __str__(self):
|
|
return f"{self.name} ({self.primary_position})" |