cal/major-domo-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from calcorum/bug/miltransactions

Browse Source 
Bug/miltransactions
This commit is contained in:
Cal Corum 2025-10-21 20:31:42 -05:00 committed by GitHub
commit e3e1674842
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/transactions/dropadd.py
View File

@ -147,9 +147,9 @@ class DropAddCommands(commands.Cog):
# Player belongs to another team if:
# 1. They have a team assigned AND
# 2. That team is not Free Agency (abbrev != 'FA') AND
# 3. That team is not the user's team
# 3. That team is not in the same organization as the user's team
if (player.team.abbrev != 'FA' and
player.team.id != builder.team.id):
not builder.team.is_same_organization(player.team)):
self.logger.warning(f"Player {player.name} belongs to {player.team.abbrev}, cannot add to {builder.team.abbrev} transaction")
return False, f"{player.name} belongs to {player.team.abbrev} and cannot be added to your transaction"

21
commands/transactions/ilmove.py
View File

@ -45,13 +45,14 @@ class ILMoveCommands(commands.Cog):
)
@app_commands.describe(
player="Player name; begin typing for autocomplete",
destination="Where to move the player: Major League, Minor League, or Injured List"
destination="Where to move the player: Major League, Minor League, Injured List, or Free Agency"
)
@app_commands.autocomplete(player=player_autocomplete)
@app_commands.choices(destination=[
app_commands.Choice(name="Major League", value="ml"),
app_commands.Choice(name="Minor League", value="mil"),
app_commands.Choice(name="Injured List", value="il")
app_commands.Choice(name="Injured List", value="il"),
app_commands.Choice(name="Free Agency", value="fa")
])
@logged_command("/ilmove")
async def ilmove(
@ -124,7 +125,7 @@ class ILMoveCommands(commands.Cog):
Args:
builder: TransactionBuilder instance
player_name: Name of player to move
destination_str: Destination string (ml, mil, il)
destination_str: Destination string (ml, mil, il, fa)
Returns:
Tuple of (success: bool, error_message: str)
@ -162,6 +163,7 @@ class ILMoveCommands(commands.Cog):
"ml": RosterType.MAJOR_LEAGUE,
"mil": RosterType.MINOR_LEAGUE,
"il": RosterType.INJURED_LIST,
"fa": RosterType.FREE_AGENCY,
}
to_roster = destination_map.get(destination_str.lower())
@ -202,13 +204,24 @@ class ILMoveCommands(commands.Cog):
if from_roster is None:
return False, f"{player.name} is not on your roster"
# Determine destination team (Free Agency if releasing player)
if to_roster == RosterType.FREE_AGENCY:
config = get_config()
fa_team = await team_service.get_team(config.free_agent_team_id)
if not fa_team:
self.logger.error(f"Could not load Free Agency team (ID: {config.free_agent_team_id})")
return False, "Could not load Free Agency team. Please try again."
to_team = fa_team
else:
to_team = builder.team
# Create move
move = TransactionMove(
player=player,
from_roster=from_roster,
to_roster=to_roster,
from_team=builder.team,
to_team=builder.team
to_team=to_team
)
success, error_message = builder.add_move(move)