Compare commits
No commits in common. "main" and "2026.3.12" have entirely different histories.
@ -4,7 +4,6 @@ Custom Commands Service for Discord Bot v2.0
|
||||
Modern async service layer for managing custom commands with full type safety.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import math
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import Optional, List, Any, Tuple
|
||||
@ -120,8 +119,8 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
content_length=len(content),
|
||||
)
|
||||
|
||||
# Return command with creator info (use POST response directly)
|
||||
return result.model_copy(update={"creator": creator})
|
||||
# Return full command with creator info
|
||||
return await self.get_command_by_name(name)
|
||||
|
||||
async def get_command_by_name(self, name: str) -> CustomCommand:
|
||||
"""
|
||||
@ -218,8 +217,7 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
new_content_length=len(new_content),
|
||||
)
|
||||
|
||||
# Return updated command with creator info (use PUT response directly)
|
||||
return result.model_copy(update={"creator": command.creator})
|
||||
return await self.get_command_by_name(name)
|
||||
|
||||
async def delete_command(
|
||||
self, name: str, deleter_discord_id: int, force: bool = False
|
||||
@ -468,28 +466,21 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
|
||||
commands_data = await self.get_items_with_params(params)
|
||||
|
||||
creators = await asyncio.gather(
|
||||
*[
|
||||
self.get_creator_by_id(cmd_data.creator_id)
|
||||
for cmd_data in commands_data
|
||||
],
|
||||
return_exceptions=True,
|
||||
)
|
||||
|
||||
commands = []
|
||||
for cmd_data, creator in zip(commands_data, creators):
|
||||
if isinstance(creator, BotException):
|
||||
for cmd_data in commands_data:
|
||||
try:
|
||||
creator = await self.get_creator_by_id(cmd_data.creator_id)
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
except BotException as e:
|
||||
# Handle missing creator gracefully
|
||||
self.logger.warning(
|
||||
"Skipping popular command with missing creator",
|
||||
command_id=cmd_data.id,
|
||||
command_name=cmd_data.name,
|
||||
creator_id=cmd_data.creator_id,
|
||||
error=str(creator),
|
||||
error=str(e),
|
||||
)
|
||||
continue
|
||||
if isinstance(creator, BaseException):
|
||||
raise creator
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
|
||||
return commands
|
||||
|
||||
@ -545,9 +536,7 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
# Update username if it changed
|
||||
if creator.username != username or creator.display_name != display_name:
|
||||
await self._update_creator_info(creator.id, username, display_name)
|
||||
creator = creator.model_copy(
|
||||
update={"username": username, "display_name": display_name}
|
||||
)
|
||||
creator = await self.get_creator_by_discord_id(discord_id)
|
||||
return creator
|
||||
except BotException:
|
||||
# Creator doesn't exist, create new one
|
||||
@ -568,8 +557,7 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
if not result:
|
||||
raise BotException("Failed to create command creator")
|
||||
|
||||
# Return created creator directly from POST response
|
||||
return CustomCommandCreator(**result)
|
||||
return await self.get_creator_by_discord_id(discord_id)
|
||||
|
||||
async def get_creator_by_discord_id(self, discord_id: int) -> CustomCommandCreator:
|
||||
"""Get creator by Discord ID.
|
||||
@ -622,34 +610,31 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
|
||||
async def get_statistics(self) -> CustomCommandStats:
|
||||
"""Get comprehensive statistics about custom commands."""
|
||||
week_ago = datetime.now(UTC) - timedelta(days=7)
|
||||
# Get basic counts
|
||||
total_commands = await self._get_search_count([])
|
||||
active_commands = await self._get_search_count([("is_active", True)])
|
||||
total_creators = await self._get_creator_count()
|
||||
|
||||
(
|
||||
total_commands,
|
||||
active_commands,
|
||||
total_creators,
|
||||
all_commands,
|
||||
popular_commands,
|
||||
most_active_creator,
|
||||
recent_count,
|
||||
warning_count,
|
||||
deletion_count,
|
||||
) = await asyncio.gather(
|
||||
self._get_search_count([]),
|
||||
self._get_search_count([("is_active", True)]),
|
||||
self._get_creator_count(),
|
||||
self.get_items_with_params([("is_active", True)]),
|
||||
self.get_popular_commands(limit=1),
|
||||
self._get_most_active_creator(),
|
||||
self._get_search_count(
|
||||
[("created_at__gte", week_ago.isoformat()), ("is_active", True)]
|
||||
),
|
||||
self._get_commands_needing_warning_count(),
|
||||
self._get_commands_eligible_for_deletion_count(),
|
||||
# Get total uses
|
||||
all_commands = await self.get_items_with_params([("is_active", True)])
|
||||
total_uses = sum(cmd.use_count for cmd in all_commands)
|
||||
|
||||
# Get most popular command
|
||||
popular_commands = await self.get_popular_commands(limit=1)
|
||||
most_popular = popular_commands[0] if popular_commands else None
|
||||
|
||||
# Get most active creator
|
||||
most_active_creator = await self._get_most_active_creator()
|
||||
|
||||
# Get recent commands count
|
||||
week_ago = datetime.now(UTC) - timedelta(days=7)
|
||||
recent_count = await self._get_search_count(
|
||||
[("created_at__gte", week_ago.isoformat()), ("is_active", True)]
|
||||
)
|
||||
|
||||
total_uses = sum(cmd.use_count for cmd in all_commands)
|
||||
most_popular = popular_commands[0] if popular_commands else None
|
||||
# Get cleanup statistics
|
||||
warning_count = await self._get_commands_needing_warning_count()
|
||||
deletion_count = await self._get_commands_eligible_for_deletion_count()
|
||||
|
||||
return CustomCommandStats(
|
||||
total_commands=total_commands,
|
||||
@ -677,28 +662,21 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
|
||||
commands_data = await self.get_items_with_params(params)
|
||||
|
||||
creators = await asyncio.gather(
|
||||
*[
|
||||
self.get_creator_by_id(cmd_data.creator_id)
|
||||
for cmd_data in commands_data
|
||||
],
|
||||
return_exceptions=True,
|
||||
)
|
||||
|
||||
commands = []
|
||||
for cmd_data, creator in zip(commands_data, creators):
|
||||
if isinstance(creator, BotException):
|
||||
for cmd_data in commands_data:
|
||||
try:
|
||||
creator = await self.get_creator_by_id(cmd_data.creator_id)
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
except BotException as e:
|
||||
# Handle missing creator gracefully
|
||||
self.logger.warning(
|
||||
"Skipping command with missing creator",
|
||||
command_id=cmd_data.id,
|
||||
command_name=cmd_data.name,
|
||||
creator_id=cmd_data.creator_id,
|
||||
error=str(creator),
|
||||
error=str(e),
|
||||
)
|
||||
continue
|
||||
if isinstance(creator, BaseException):
|
||||
raise creator
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
|
||||
return commands
|
||||
|
||||
@ -710,28 +688,21 @@ class CustomCommandsService(BaseService[CustomCommand]):
|
||||
|
||||
commands_data = await self.get_items_with_params(params)
|
||||
|
||||
creators = await asyncio.gather(
|
||||
*[
|
||||
self.get_creator_by_id(cmd_data.creator_id)
|
||||
for cmd_data in commands_data
|
||||
],
|
||||
return_exceptions=True,
|
||||
)
|
||||
|
||||
commands = []
|
||||
for cmd_data, creator in zip(commands_data, creators):
|
||||
if isinstance(creator, BotException):
|
||||
for cmd_data in commands_data:
|
||||
try:
|
||||
creator = await self.get_creator_by_id(cmd_data.creator_id)
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
except BotException as e:
|
||||
# Handle missing creator gracefully
|
||||
self.logger.warning(
|
||||
"Skipping command with missing creator",
|
||||
command_id=cmd_data.id,
|
||||
command_name=cmd_data.name,
|
||||
creator_id=cmd_data.creator_id,
|
||||
error=str(creator),
|
||||
error=str(e),
|
||||
)
|
||||
continue
|
||||
if isinstance(creator, BaseException):
|
||||
raise creator
|
||||
commands.append(CustomCommand(**cmd_data.model_dump(), creator=creator))
|
||||
|
||||
return commands
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@ Decision Service
|
||||
Manages pitching decision operations for game submission.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
from typing import List, Dict, Any, Optional, Tuple
|
||||
|
||||
from utils.logging import get_contextual_logger
|
||||
@ -125,19 +124,22 @@ class DecisionService:
|
||||
if int(decision.get("b_save", 0)) == 1:
|
||||
bsv_ids.append(pitcher_id)
|
||||
|
||||
# Second pass: Fetch all Player objects in parallel
|
||||
# Order: [wp_id, lp_id, sv_id, *hold_ids, *bsv_ids]; None IDs resolve immediately
|
||||
ordered_ids = [wp_id, lp_id, sv_id] + hold_ids + bsv_ids
|
||||
results = await asyncio.gather(
|
||||
*[
|
||||
player_service.get_player(pid) if pid else asyncio.sleep(0, result=None)
|
||||
for pid in ordered_ids
|
||||
]
|
||||
)
|
||||
# Second pass: Fetch Player objects
|
||||
wp = await player_service.get_player(wp_id) if wp_id else None
|
||||
lp = await player_service.get_player(lp_id) if lp_id else None
|
||||
sv = await player_service.get_player(sv_id) if sv_id else None
|
||||
|
||||
wp, lp, sv = results[0], results[1], results[2]
|
||||
holders = [p for p in results[3 : 3 + len(hold_ids)] if p]
|
||||
blown_saves = [p for p in results[3 + len(hold_ids) :] if p]
|
||||
holders = []
|
||||
for hold_id in hold_ids:
|
||||
holder = await player_service.get_player(hold_id)
|
||||
if holder:
|
||||
holders.append(holder)
|
||||
|
||||
blown_saves = []
|
||||
for bsv_id in bsv_ids:
|
||||
bsv = await player_service.get_player(bsv_id)
|
||||
if bsv:
|
||||
blown_saves.append(bsv)
|
||||
|
||||
return wp, lp, sv, holders, blown_saves
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@ Modern async service layer for managing help commands with full type safety.
|
||||
Allows admins and help editors to create custom help topics for league documentation,
|
||||
resources, FAQs, links, and guides.
|
||||
"""
|
||||
|
||||
from typing import Optional, List
|
||||
from utils.logging import get_contextual_logger
|
||||
|
||||
@ -13,7 +12,7 @@ from models.help_command import (
|
||||
HelpCommand,
|
||||
HelpCommandSearchFilters,
|
||||
HelpCommandSearchResult,
|
||||
HelpCommandStats,
|
||||
HelpCommandStats
|
||||
)
|
||||
from services.base_service import BaseService
|
||||
from exceptions import BotException
|
||||
@ -21,19 +20,16 @@ from exceptions import BotException
|
||||
|
||||
class HelpCommandNotFoundError(BotException):
|
||||
"""Raised when a help command is not found."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
class HelpCommandExistsError(BotException):
|
||||
"""Raised when trying to create a help command that already exists."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
class HelpCommandPermissionError(BotException):
|
||||
"""Raised when user lacks permission for help command operation."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
@ -41,8 +37,8 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
"""Service for managing help commands."""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__(HelpCommand, "help_commands")
|
||||
self.logger = get_contextual_logger(f"{__name__}.HelpCommandsService")
|
||||
super().__init__(HelpCommand, 'help_commands')
|
||||
self.logger = get_contextual_logger(f'{__name__}.HelpCommandsService')
|
||||
self.logger.info("HelpCommandsService initialized")
|
||||
|
||||
# === Command CRUD Operations ===
|
||||
@ -54,7 +50,7 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
content: str,
|
||||
creator_discord_id: str,
|
||||
category: Optional[str] = None,
|
||||
display_order: int = 0,
|
||||
display_order: int = 0
|
||||
) -> HelpCommand:
|
||||
"""
|
||||
Create a new help command.
|
||||
@ -84,16 +80,14 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
|
||||
# Create help command data
|
||||
help_data = {
|
||||
"name": name.lower().strip(),
|
||||
"title": title.strip(),
|
||||
"content": content.strip(),
|
||||
"category": category.lower().strip() if category else None,
|
||||
"created_by_discord_id": str(
|
||||
creator_discord_id
|
||||
), # Convert to string for safe storage
|
||||
"display_order": display_order,
|
||||
"is_active": True,
|
||||
"view_count": 0,
|
||||
'name': name.lower().strip(),
|
||||
'title': title.strip(),
|
||||
'content': content.strip(),
|
||||
'category': category.lower().strip() if category else None,
|
||||
'created_by_discord_id': str(creator_discord_id), # Convert to string for safe storage
|
||||
'display_order': display_order,
|
||||
'is_active': True,
|
||||
'view_count': 0
|
||||
}
|
||||
|
||||
# Create via API
|
||||
@ -101,18 +95,18 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
if not result:
|
||||
raise BotException("Failed to create help command")
|
||||
|
||||
self.logger.info(
|
||||
"Help command created",
|
||||
help_name=name,
|
||||
creator_id=creator_discord_id,
|
||||
category=category,
|
||||
)
|
||||
self.logger.info("Help command created",
|
||||
help_name=name,
|
||||
creator_id=creator_discord_id,
|
||||
category=category)
|
||||
|
||||
# Return help command directly from POST response
|
||||
return result
|
||||
# Return full help command
|
||||
return await self.get_help_by_name(name)
|
||||
|
||||
async def get_help_by_name(
|
||||
self, name: str, include_inactive: bool = False
|
||||
self,
|
||||
name: str,
|
||||
include_inactive: bool = False
|
||||
) -> HelpCommand:
|
||||
"""
|
||||
Get a help command by name.
|
||||
@ -132,12 +126,8 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
try:
|
||||
# Use the dedicated by_name endpoint for exact lookup
|
||||
client = await self.get_client()
|
||||
params = (
|
||||
[("include_inactive", include_inactive)] if include_inactive else []
|
||||
)
|
||||
data = await client.get(
|
||||
f"help_commands/by_name/{normalized_name}", params=params
|
||||
)
|
||||
params = [('include_inactive', include_inactive)] if include_inactive else []
|
||||
data = await client.get(f'help_commands/by_name/{normalized_name}', params=params)
|
||||
|
||||
if not data:
|
||||
raise HelpCommandNotFoundError(f"Help topic '{name}' not found")
|
||||
@ -149,9 +139,9 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
if "404" in str(e) or "not found" in str(e).lower():
|
||||
raise HelpCommandNotFoundError(f"Help topic '{name}' not found")
|
||||
else:
|
||||
self.logger.error(
|
||||
"Failed to get help command by name", help_name=name, error=e
|
||||
)
|
||||
self.logger.error("Failed to get help command by name",
|
||||
help_name=name,
|
||||
error=e)
|
||||
raise BotException(f"Failed to retrieve help topic '{name}': {e}")
|
||||
|
||||
async def update_help(
|
||||
@ -161,7 +151,7 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
new_content: Optional[str] = None,
|
||||
updater_discord_id: Optional[str] = None,
|
||||
new_category: Optional[str] = None,
|
||||
new_display_order: Optional[int] = None,
|
||||
new_display_order: Optional[int] = None
|
||||
) -> HelpCommand:
|
||||
"""
|
||||
Update an existing help command.
|
||||
@ -186,42 +176,35 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
update_data = {}
|
||||
|
||||
if new_title is not None:
|
||||
update_data["title"] = new_title.strip()
|
||||
update_data['title'] = new_title.strip()
|
||||
|
||||
if new_content is not None:
|
||||
update_data["content"] = new_content.strip()
|
||||
update_data['content'] = new_content.strip()
|
||||
|
||||
if new_category is not None:
|
||||
update_data["category"] = (
|
||||
new_category.lower().strip() if new_category else None
|
||||
)
|
||||
update_data['category'] = new_category.lower().strip() if new_category else None
|
||||
|
||||
if new_display_order is not None:
|
||||
update_data["display_order"] = new_display_order
|
||||
update_data['display_order'] = new_display_order
|
||||
|
||||
if updater_discord_id is not None:
|
||||
update_data["last_modified_by"] = str(
|
||||
updater_discord_id
|
||||
) # Convert to string for safe storage
|
||||
update_data['last_modified_by'] = str(updater_discord_id) # Convert to string for safe storage
|
||||
|
||||
if not update_data:
|
||||
raise BotException("No fields to update")
|
||||
|
||||
# Update via API
|
||||
client = await self.get_client()
|
||||
result = await client.put(f"help_commands/{help_cmd.id}", update_data)
|
||||
result = await client.put(f'help_commands/{help_cmd.id}', update_data)
|
||||
if not result:
|
||||
raise BotException("Failed to update help command")
|
||||
|
||||
self.logger.info(
|
||||
"Help command updated",
|
||||
help_name=name,
|
||||
updater_id=updater_discord_id,
|
||||
fields_updated=list(update_data.keys()),
|
||||
)
|
||||
self.logger.info("Help command updated",
|
||||
help_name=name,
|
||||
updater_id=updater_discord_id,
|
||||
fields_updated=list(update_data.keys()))
|
||||
|
||||
# Return updated help command directly from PUT response
|
||||
return self.model_class.from_api_data(result)
|
||||
return await self.get_help_by_name(name)
|
||||
|
||||
async def delete_help(self, name: str) -> bool:
|
||||
"""
|
||||
@ -240,11 +223,11 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
|
||||
# Soft delete via API
|
||||
client = await self.get_client()
|
||||
await client.delete(f"help_commands/{help_cmd.id}")
|
||||
await client.delete(f'help_commands/{help_cmd.id}')
|
||||
|
||||
self.logger.info(
|
||||
"Help command soft deleted", help_name=name, help_id=help_cmd.id
|
||||
)
|
||||
self.logger.info("Help command soft deleted",
|
||||
help_name=name,
|
||||
help_id=help_cmd.id)
|
||||
|
||||
return True
|
||||
|
||||
@ -269,11 +252,13 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
|
||||
# Restore via API
|
||||
client = await self.get_client()
|
||||
result = await client.patch(f"help_commands/{help_cmd.id}/restore")
|
||||
result = await client.patch(f'help_commands/{help_cmd.id}/restore')
|
||||
if not result:
|
||||
raise BotException("Failed to restore help command")
|
||||
|
||||
self.logger.info("Help command restored", help_name=name, help_id=help_cmd.id)
|
||||
self.logger.info("Help command restored",
|
||||
help_name=name,
|
||||
help_id=help_cmd.id)
|
||||
|
||||
return self.model_class.from_api_data(result)
|
||||
|
||||
@ -294,9 +279,10 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
|
||||
try:
|
||||
client = await self.get_client()
|
||||
await client.patch(f"help_commands/by_name/{normalized_name}/view")
|
||||
await client.patch(f'help_commands/by_name/{normalized_name}/view')
|
||||
|
||||
self.logger.debug("Help command view count incremented", help_name=name)
|
||||
self.logger.debug("Help command view count incremented",
|
||||
help_name=name)
|
||||
|
||||
# Return updated command
|
||||
return await self.get_help_by_name(name)
|
||||
@ -305,15 +291,16 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
if "404" in str(e) or "not found" in str(e).lower():
|
||||
raise HelpCommandNotFoundError(f"Help topic '{name}' not found")
|
||||
else:
|
||||
self.logger.error(
|
||||
"Failed to increment view count", help_name=name, error=e
|
||||
)
|
||||
self.logger.error("Failed to increment view count",
|
||||
help_name=name,
|
||||
error=e)
|
||||
raise BotException(f"Failed to increment view count for '{name}': {e}")
|
||||
|
||||
# === Search and Listing ===
|
||||
|
||||
async def search_help_commands(
|
||||
self, filters: HelpCommandSearchFilters
|
||||
self,
|
||||
filters: HelpCommandSearchFilters
|
||||
) -> HelpCommandSearchResult:
|
||||
"""
|
||||
Search for help commands with filtering and pagination.
|
||||
@ -329,23 +316,23 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
|
||||
# Apply filters
|
||||
if filters.name_contains:
|
||||
params.append(("name", filters.name_contains)) # API will do ILIKE search
|
||||
params.append(('name', filters.name_contains)) # API will do ILIKE search
|
||||
|
||||
if filters.category:
|
||||
params.append(("category", filters.category))
|
||||
params.append(('category', filters.category))
|
||||
|
||||
params.append(("is_active", filters.is_active))
|
||||
params.append(('is_active', filters.is_active))
|
||||
|
||||
# Add sorting
|
||||
params.append(("sort", filters.sort_by))
|
||||
params.append(('sort', filters.sort_by))
|
||||
|
||||
# Add pagination
|
||||
params.append(("page", filters.page))
|
||||
params.append(("page_size", filters.page_size))
|
||||
params.append(('page', filters.page))
|
||||
params.append(('page_size', filters.page_size))
|
||||
|
||||
# Execute search via API
|
||||
client = await self.get_client()
|
||||
data = await client.get("help_commands", params=params)
|
||||
data = await client.get('help_commands', params=params)
|
||||
|
||||
if not data:
|
||||
return HelpCommandSearchResult(
|
||||
@ -354,14 +341,14 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
page=filters.page,
|
||||
page_size=filters.page_size,
|
||||
total_pages=0,
|
||||
has_more=False,
|
||||
has_more=False
|
||||
)
|
||||
|
||||
# Extract response data
|
||||
help_commands_data = data.get("help_commands", [])
|
||||
total_count = data.get("total_count", 0)
|
||||
total_pages = data.get("total_pages", 0)
|
||||
has_more = data.get("has_more", False)
|
||||
help_commands_data = data.get('help_commands', [])
|
||||
total_count = data.get('total_count', 0)
|
||||
total_pages = data.get('total_pages', 0)
|
||||
has_more = data.get('has_more', False)
|
||||
|
||||
# Convert to HelpCommand objects
|
||||
help_commands = []
|
||||
@ -369,21 +356,15 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
try:
|
||||
help_commands.append(self.model_class.from_api_data(cmd_data))
|
||||
except Exception as e:
|
||||
self.logger.warning(
|
||||
"Failed to create HelpCommand from API data",
|
||||
help_id=cmd_data.get("id"),
|
||||
error=e,
|
||||
)
|
||||
self.logger.warning("Failed to create HelpCommand from API data",
|
||||
help_id=cmd_data.get('id'),
|
||||
error=e)
|
||||
continue
|
||||
|
||||
self.logger.debug(
|
||||
"Help commands search completed",
|
||||
total_results=total_count,
|
||||
page=filters.page,
|
||||
filters_applied=len(
|
||||
[p for p in params if p[0] not in ["sort", "page", "page_size"]]
|
||||
),
|
||||
)
|
||||
self.logger.debug("Help commands search completed",
|
||||
total_results=total_count,
|
||||
page=filters.page,
|
||||
filters_applied=len([p for p in params if p[0] not in ['sort', 'page', 'page_size']]))
|
||||
|
||||
return HelpCommandSearchResult(
|
||||
help_commands=help_commands,
|
||||
@ -391,11 +372,13 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
page=filters.page,
|
||||
page_size=filters.page_size,
|
||||
total_pages=total_pages,
|
||||
has_more=has_more,
|
||||
has_more=has_more
|
||||
)
|
||||
|
||||
async def get_all_help_topics(
|
||||
self, category: Optional[str] = None, include_inactive: bool = False
|
||||
self,
|
||||
category: Optional[str] = None,
|
||||
include_inactive: bool = False
|
||||
) -> List[HelpCommand]:
|
||||
"""
|
||||
Get all help topics, optionally filtered by category.
|
||||
@ -410,36 +393,37 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
params = []
|
||||
|
||||
if category:
|
||||
params.append(("category", category))
|
||||
params.append(('category', category))
|
||||
|
||||
params.append(("is_active", not include_inactive))
|
||||
params.append(("sort", "display_order"))
|
||||
params.append(("page_size", 100)) # Get all
|
||||
params.append(('is_active', not include_inactive))
|
||||
params.append(('sort', 'display_order'))
|
||||
params.append(('page_size', 100)) # Get all
|
||||
|
||||
client = await self.get_client()
|
||||
data = await client.get("help_commands", params=params)
|
||||
data = await client.get('help_commands', params=params)
|
||||
|
||||
if not data:
|
||||
return []
|
||||
|
||||
help_commands_data = data.get("help_commands", [])
|
||||
help_commands_data = data.get('help_commands', [])
|
||||
|
||||
help_commands = []
|
||||
for cmd_data in help_commands_data:
|
||||
try:
|
||||
help_commands.append(self.model_class.from_api_data(cmd_data))
|
||||
except Exception as e:
|
||||
self.logger.warning(
|
||||
"Failed to create HelpCommand from API data",
|
||||
help_id=cmd_data.get("id"),
|
||||
error=e,
|
||||
)
|
||||
self.logger.warning("Failed to create HelpCommand from API data",
|
||||
help_id=cmd_data.get('id'),
|
||||
error=e)
|
||||
continue
|
||||
|
||||
return help_commands
|
||||
|
||||
async def get_help_names_for_autocomplete(
|
||||
self, partial_name: str = "", limit: int = 25, include_inactive: bool = False
|
||||
self,
|
||||
partial_name: str = "",
|
||||
limit: int = 25,
|
||||
include_inactive: bool = False
|
||||
) -> List[str]:
|
||||
"""
|
||||
Get help command names for Discord autocomplete.
|
||||
@ -455,28 +439,25 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
try:
|
||||
# Use the dedicated autocomplete endpoint
|
||||
client = await self.get_client()
|
||||
params = [("limit", limit)]
|
||||
params = [('limit', limit)]
|
||||
|
||||
if partial_name:
|
||||
params.append(("q", partial_name.lower()))
|
||||
params.append(('q', partial_name.lower()))
|
||||
|
||||
result = await client.get("help_commands/autocomplete", params=params)
|
||||
result = await client.get('help_commands/autocomplete', params=params)
|
||||
|
||||
# The autocomplete endpoint returns results with name, title, category
|
||||
if isinstance(result, dict) and "results" in result:
|
||||
return [item["name"] for item in result["results"]]
|
||||
if isinstance(result, dict) and 'results' in result:
|
||||
return [item['name'] for item in result['results']]
|
||||
else:
|
||||
self.logger.warning(
|
||||
"Unexpected autocomplete response format", response=result
|
||||
)
|
||||
self.logger.warning("Unexpected autocomplete response format",
|
||||
response=result)
|
||||
return []
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(
|
||||
"Failed to get help names for autocomplete",
|
||||
partial_name=partial_name,
|
||||
error=e,
|
||||
)
|
||||
self.logger.error("Failed to get help names for autocomplete",
|
||||
partial_name=partial_name,
|
||||
error=e)
|
||||
# Return empty list on error to not break Discord autocomplete
|
||||
return []
|
||||
|
||||
@ -486,7 +467,7 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
"""Get comprehensive statistics about help commands."""
|
||||
try:
|
||||
client = await self.get_client()
|
||||
data = await client.get("help_commands/stats")
|
||||
data = await client.get('help_commands/stats')
|
||||
|
||||
if not data:
|
||||
return HelpCommandStats(
|
||||
@ -494,25 +475,23 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
active_commands=0,
|
||||
total_views=0,
|
||||
most_viewed_command=None,
|
||||
recent_commands_count=0,
|
||||
recent_commands_count=0
|
||||
)
|
||||
|
||||
# Convert most_viewed_command if present
|
||||
most_viewed = None
|
||||
if data.get("most_viewed_command"):
|
||||
if data.get('most_viewed_command'):
|
||||
try:
|
||||
most_viewed = self.model_class.from_api_data(
|
||||
data["most_viewed_command"]
|
||||
)
|
||||
most_viewed = self.model_class.from_api_data(data['most_viewed_command'])
|
||||
except Exception as e:
|
||||
self.logger.warning("Failed to parse most viewed command", error=e)
|
||||
|
||||
return HelpCommandStats(
|
||||
total_commands=data.get("total_commands", 0),
|
||||
active_commands=data.get("active_commands", 0),
|
||||
total_views=data.get("total_views", 0),
|
||||
total_commands=data.get('total_commands', 0),
|
||||
active_commands=data.get('active_commands', 0),
|
||||
total_views=data.get('total_views', 0),
|
||||
most_viewed_command=most_viewed,
|
||||
recent_commands_count=data.get("recent_commands_count", 0),
|
||||
recent_commands_count=data.get('recent_commands_count', 0)
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
@ -523,7 +502,7 @@ class HelpCommandsService(BaseService[HelpCommand]):
|
||||
active_commands=0,
|
||||
total_views=0,
|
||||
most_viewed_command=None,
|
||||
recent_commands_count=0,
|
||||
recent_commands_count=0
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -277,35 +277,6 @@ class TransactionBuilder:
|
||||
Returns:
|
||||
Tuple of (success: bool, error_message: str). If success is True, error_message is empty.
|
||||
"""
|
||||
# Fetch current state once if needed by FA lock or pending-transaction check
|
||||
is_fa_pickup = (
|
||||
move.from_roster == RosterType.FREE_AGENCY
|
||||
and move.to_roster != RosterType.FREE_AGENCY
|
||||
)
|
||||
needs_current_state = is_fa_pickup or (
|
||||
check_pending_transactions and next_week is None
|
||||
)
|
||||
|
||||
current_week: Optional[int] = None
|
||||
if needs_current_state:
|
||||
try:
|
||||
current_state = await league_service.get_current_state()
|
||||
current_week = current_state.week if current_state else 1
|
||||
except Exception as e:
|
||||
logger.warning(f"Could not get current week: {e}")
|
||||
current_week = 1
|
||||
|
||||
# Block adding players FROM Free Agency after the FA lock deadline
|
||||
if is_fa_pickup and current_week is not None:
|
||||
config = get_config()
|
||||
if current_week >= config.fa_lock_week:
|
||||
error_msg = (
|
||||
f"Free agency is closed (week {current_week}, deadline was week {config.fa_lock_week}). "
|
||||
f"Cannot add {move.player.name} from FA."
|
||||
)
|
||||
logger.warning(error_msg)
|
||||
return False, error_msg
|
||||
|
||||
# Check if player is already in a move in this transaction builder
|
||||
existing_move = self.get_move_for_player(move.player.id)
|
||||
if existing_move:
|
||||
@ -328,15 +299,23 @@ class TransactionBuilder:
|
||||
return False, error_msg
|
||||
|
||||
# Check if player is already in another team's pending transaction for next week
|
||||
# This prevents duplicate claims that would need to be resolved at freeze time
|
||||
# Only applies to /dropadd (scheduled moves), not /ilmove (immediate moves)
|
||||
if check_pending_transactions:
|
||||
if next_week is None:
|
||||
next_week = (current_week + 1) if current_week else 1
|
||||
try:
|
||||
current_state = await league_service.get_current_state()
|
||||
next_week = (current_state.week + 1) if current_state else 1
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
f"Could not get current week for pending transaction check: {e}"
|
||||
)
|
||||
next_week = 1
|
||||
|
||||
(
|
||||
is_pending,
|
||||
claiming_team,
|
||||
) = await transaction_service.is_player_in_pending_transaction(
|
||||
player_id=move.player.id, week=next_week, season=self.season
|
||||
is_pending, claiming_team = (
|
||||
await transaction_service.is_player_in_pending_transaction(
|
||||
player_id=move.player.id, week=next_week, season=self.season
|
||||
)
|
||||
)
|
||||
|
||||
if is_pending:
|
||||
|
||||
@ -3,7 +3,6 @@ Tests for Help Commands Service in Discord Bot v2.0
|
||||
|
||||
Comprehensive tests for help commands CRUD operations and business logic.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import AsyncMock
|
||||
@ -11,13 +10,13 @@ from unittest.mock import AsyncMock
|
||||
from services.help_commands_service import (
|
||||
HelpCommandsService,
|
||||
HelpCommandNotFoundError,
|
||||
HelpCommandExistsError,
|
||||
HelpCommandExistsError
|
||||
)
|
||||
from models.help_command import (
|
||||
HelpCommand,
|
||||
HelpCommandSearchFilters,
|
||||
HelpCommandSearchResult,
|
||||
HelpCommandStats,
|
||||
HelpCommandStats
|
||||
)
|
||||
|
||||
|
||||
@ -27,17 +26,17 @@ def sample_help_command() -> HelpCommand:
|
||||
now = datetime.now(timezone.utc)
|
||||
return HelpCommand(
|
||||
id=1,
|
||||
name="trading-rules",
|
||||
title="Trading Rules & Guidelines",
|
||||
content="Complete trading rules for the league...",
|
||||
category="rules",
|
||||
created_by_discord_id="123456789",
|
||||
name='trading-rules',
|
||||
title='Trading Rules & Guidelines',
|
||||
content='Complete trading rules for the league...',
|
||||
category='rules',
|
||||
created_by_discord_id='123456789',
|
||||
created_at=now,
|
||||
updated_at=None,
|
||||
last_modified_by=None,
|
||||
is_active=True,
|
||||
view_count=100,
|
||||
display_order=10,
|
||||
display_order=10
|
||||
)
|
||||
|
||||
|
||||
@ -65,7 +64,6 @@ class TestHelpCommandsServiceInit:
|
||||
|
||||
# Multiple imports should return the same instance
|
||||
from services.help_commands_service import help_commands_service as service2
|
||||
|
||||
assert help_commands_service is service2
|
||||
|
||||
def test_service_has_required_methods(self):
|
||||
@ -73,22 +71,22 @@ class TestHelpCommandsServiceInit:
|
||||
from services.help_commands_service import help_commands_service
|
||||
|
||||
# Core CRUD operations
|
||||
assert hasattr(help_commands_service, "create_help")
|
||||
assert hasattr(help_commands_service, "get_help_by_name")
|
||||
assert hasattr(help_commands_service, "update_help")
|
||||
assert hasattr(help_commands_service, "delete_help")
|
||||
assert hasattr(help_commands_service, "restore_help")
|
||||
assert hasattr(help_commands_service, 'create_help')
|
||||
assert hasattr(help_commands_service, 'get_help_by_name')
|
||||
assert hasattr(help_commands_service, 'update_help')
|
||||
assert hasattr(help_commands_service, 'delete_help')
|
||||
assert hasattr(help_commands_service, 'restore_help')
|
||||
|
||||
# Search and listing
|
||||
assert hasattr(help_commands_service, "search_help_commands")
|
||||
assert hasattr(help_commands_service, "get_all_help_topics")
|
||||
assert hasattr(help_commands_service, "get_help_names_for_autocomplete")
|
||||
assert hasattr(help_commands_service, 'search_help_commands')
|
||||
assert hasattr(help_commands_service, 'get_all_help_topics')
|
||||
assert hasattr(help_commands_service, 'get_help_names_for_autocomplete')
|
||||
|
||||
# View tracking
|
||||
assert hasattr(help_commands_service, "increment_view_count")
|
||||
assert hasattr(help_commands_service, 'increment_view_count')
|
||||
|
||||
# Statistics
|
||||
assert hasattr(help_commands_service, "get_statistics")
|
||||
assert hasattr(help_commands_service, 'get_statistics')
|
||||
|
||||
|
||||
class TestHelpCommandsServiceCRUD:
|
||||
@ -120,7 +118,7 @@ class TestHelpCommandsServiceCRUD:
|
||||
last_modified_by=None,
|
||||
is_active=True,
|
||||
view_count=0,
|
||||
display_order=data.get("display_order", 0),
|
||||
display_order=data.get("display_order", 0)
|
||||
)
|
||||
return created_help
|
||||
|
||||
@ -132,8 +130,8 @@ class TestHelpCommandsServiceCRUD:
|
||||
name="test-topic",
|
||||
title="Test Topic",
|
||||
content="This is test content for the help topic.",
|
||||
creator_discord_id="123456789",
|
||||
category="info",
|
||||
creator_discord_id='123456789',
|
||||
category="info"
|
||||
)
|
||||
|
||||
assert isinstance(result, HelpCommand)
|
||||
@ -143,48 +141,39 @@ class TestHelpCommandsServiceCRUD:
|
||||
assert result.view_count == 0
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_help_already_exists(
|
||||
self, help_commands_service_instance, sample_help_command
|
||||
):
|
||||
async def test_create_help_already_exists(self, help_commands_service_instance, sample_help_command):
|
||||
"""Test help command creation when topic already exists."""
|
||||
|
||||
# Mock topic already exists
|
||||
async def mock_get_help_by_name(*args, **kwargs):
|
||||
return sample_help_command
|
||||
|
||||
help_commands_service_instance.get_help_by_name = mock_get_help_by_name
|
||||
|
||||
with pytest.raises(
|
||||
HelpCommandExistsError, match="Help topic 'trading-rules' already exists"
|
||||
):
|
||||
with pytest.raises(HelpCommandExistsError, match="Help topic 'trading-rules' already exists"):
|
||||
await help_commands_service_instance.create_help(
|
||||
name="trading-rules",
|
||||
title="Trading Rules",
|
||||
content="Rules content",
|
||||
creator_discord_id="123456789",
|
||||
creator_discord_id='123456789'
|
||||
)
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_help_by_name_success(
|
||||
self, help_commands_service_instance, sample_help_command
|
||||
):
|
||||
async def test_get_help_by_name_success(self, help_commands_service_instance, sample_help_command):
|
||||
"""Test successful help command retrieval."""
|
||||
# Mock the API client to return proper data structure
|
||||
help_data = {
|
||||
"id": sample_help_command.id,
|
||||
"name": sample_help_command.name,
|
||||
"title": sample_help_command.title,
|
||||
"content": sample_help_command.content,
|
||||
"category": sample_help_command.category,
|
||||
"created_by_discord_id": sample_help_command.created_by_discord_id,
|
||||
"created_at": sample_help_command.created_at.isoformat(),
|
||||
"updated_at": sample_help_command.updated_at.isoformat()
|
||||
if sample_help_command.updated_at
|
||||
else None,
|
||||
"last_modified_by": sample_help_command.last_modified_by,
|
||||
"is_active": sample_help_command.is_active,
|
||||
"view_count": sample_help_command.view_count,
|
||||
"display_order": sample_help_command.display_order,
|
||||
'id': sample_help_command.id,
|
||||
'name': sample_help_command.name,
|
||||
'title': sample_help_command.title,
|
||||
'content': sample_help_command.content,
|
||||
'category': sample_help_command.category,
|
||||
'created_by_discord_id': sample_help_command.created_by_discord_id,
|
||||
'created_at': sample_help_command.created_at.isoformat(),
|
||||
'updated_at': sample_help_command.updated_at.isoformat() if sample_help_command.updated_at else None,
|
||||
'last_modified_by': sample_help_command.last_modified_by,
|
||||
'is_active': sample_help_command.is_active,
|
||||
'view_count': sample_help_command.view_count,
|
||||
'display_order': sample_help_command.display_order
|
||||
}
|
||||
|
||||
help_commands_service_instance._client.get.return_value = help_data
|
||||
@ -202,61 +191,66 @@ class TestHelpCommandsServiceCRUD:
|
||||
# Mock the API client to return None (not found)
|
||||
help_commands_service_instance._client.get.return_value = None
|
||||
|
||||
with pytest.raises(
|
||||
HelpCommandNotFoundError, match="Help topic 'nonexistent' not found"
|
||||
):
|
||||
with pytest.raises(HelpCommandNotFoundError, match="Help topic 'nonexistent' not found"):
|
||||
await help_commands_service_instance.get_help_by_name("nonexistent")
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_update_help_success(
|
||||
self, help_commands_service_instance, sample_help_command
|
||||
):
|
||||
async def test_update_help_success(self, help_commands_service_instance, sample_help_command):
|
||||
"""Test successful help command update."""
|
||||
|
||||
# Mock getting the existing help command
|
||||
async def mock_get_help_by_name(name, include_inactive=False):
|
||||
if name == "trading-rules":
|
||||
return sample_help_command
|
||||
raise HelpCommandNotFoundError(f"Help topic '{name}' not found")
|
||||
|
||||
# Mock the API update call returning the updated help command data directly
|
||||
updated_data = {
|
||||
"id": sample_help_command.id,
|
||||
"name": sample_help_command.name,
|
||||
"title": "Updated Trading Rules",
|
||||
"content": "Updated content",
|
||||
"category": sample_help_command.category,
|
||||
"created_by_discord_id": sample_help_command.created_by_discord_id,
|
||||
"created_at": sample_help_command.created_at.isoformat(),
|
||||
"updated_at": datetime.now(timezone.utc).isoformat(),
|
||||
"last_modified_by": "987654321",
|
||||
"is_active": sample_help_command.is_active,
|
||||
"view_count": sample_help_command.view_count,
|
||||
"display_order": sample_help_command.display_order,
|
||||
}
|
||||
|
||||
# Mock the API update call
|
||||
async def mock_put(*args, **kwargs):
|
||||
return updated_data
|
||||
return True
|
||||
|
||||
help_commands_service_instance.get_help_by_name = mock_get_help_by_name
|
||||
help_commands_service_instance._client.put = mock_put
|
||||
|
||||
# Update should call get_help_by_name again at the end, so mock it to return updated version
|
||||
updated_help = HelpCommand(
|
||||
id=sample_help_command.id,
|
||||
name=sample_help_command.name,
|
||||
title="Updated Trading Rules",
|
||||
content="Updated content",
|
||||
category=sample_help_command.category,
|
||||
created_by_discord_id=sample_help_command.created_by_discord_id,
|
||||
created_at=sample_help_command.created_at,
|
||||
updated_at=datetime.now(timezone.utc),
|
||||
last_modified_by='987654321',
|
||||
is_active=sample_help_command.is_active,
|
||||
view_count=sample_help_command.view_count,
|
||||
display_order=sample_help_command.display_order
|
||||
)
|
||||
|
||||
call_count = 0
|
||||
|
||||
async def mock_get_with_counter(name, include_inactive=False):
|
||||
nonlocal call_count
|
||||
call_count += 1
|
||||
if call_count == 1:
|
||||
return sample_help_command
|
||||
else:
|
||||
return updated_help
|
||||
|
||||
help_commands_service_instance.get_help_by_name = mock_get_with_counter
|
||||
|
||||
result = await help_commands_service_instance.update_help(
|
||||
name="trading-rules",
|
||||
new_title="Updated Trading Rules",
|
||||
new_content="Updated content",
|
||||
updater_discord_id="987654321",
|
||||
updater_discord_id='987654321'
|
||||
)
|
||||
|
||||
assert isinstance(result, HelpCommand)
|
||||
assert result.title == "Updated Trading Rules"
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_help_success(
|
||||
self, help_commands_service_instance, sample_help_command
|
||||
):
|
||||
async def test_delete_help_success(self, help_commands_service_instance, sample_help_command):
|
||||
"""Test successful help command deletion (soft delete)."""
|
||||
|
||||
# Mock getting the help command
|
||||
async def mock_get_help_by_name(name, include_inactive=False):
|
||||
return sample_help_command
|
||||
@ -278,12 +272,12 @@ class TestHelpCommandsServiceCRUD:
|
||||
# Mock getting a deleted help command
|
||||
deleted_help = HelpCommand(
|
||||
id=1,
|
||||
name="deleted-topic",
|
||||
title="Deleted Topic",
|
||||
content="Content",
|
||||
created_by_discord_id="123456789",
|
||||
name='deleted-topic',
|
||||
title='Deleted Topic',
|
||||
content='Content',
|
||||
created_by_discord_id='123456789',
|
||||
created_at=datetime.now(timezone.utc),
|
||||
is_active=False,
|
||||
is_active=False
|
||||
)
|
||||
|
||||
async def mock_get_help_by_name(name, include_inactive=False):
|
||||
@ -291,15 +285,15 @@ class TestHelpCommandsServiceCRUD:
|
||||
|
||||
# Mock the API restore call
|
||||
restored_data = {
|
||||
"id": deleted_help.id,
|
||||
"name": deleted_help.name,
|
||||
"title": deleted_help.title,
|
||||
"content": deleted_help.content,
|
||||
"created_by_discord_id": deleted_help.created_by_discord_id,
|
||||
"created_at": deleted_help.created_at.isoformat(),
|
||||
"is_active": True,
|
||||
"view_count": 0,
|
||||
"display_order": 0,
|
||||
'id': deleted_help.id,
|
||||
'name': deleted_help.name,
|
||||
'title': deleted_help.title,
|
||||
'content': deleted_help.content,
|
||||
'created_by_discord_id': deleted_help.created_by_discord_id,
|
||||
'created_at': deleted_help.created_at.isoformat(),
|
||||
'is_active': True,
|
||||
'view_count': 0,
|
||||
'display_order': 0
|
||||
}
|
||||
|
||||
help_commands_service_instance.get_help_by_name = mock_get_help_by_name
|
||||
@ -318,30 +312,33 @@ class TestHelpCommandsServiceSearch:
|
||||
async def test_search_help_commands(self, help_commands_service_instance):
|
||||
"""Test searching for help commands with filters."""
|
||||
filters = HelpCommandSearchFilters(
|
||||
name_contains="trading", category="rules", page=1, page_size=10
|
||||
name_contains='trading',
|
||||
category='rules',
|
||||
page=1,
|
||||
page_size=10
|
||||
)
|
||||
|
||||
# Mock API response
|
||||
api_response = {
|
||||
"help_commands": [
|
||||
'help_commands': [
|
||||
{
|
||||
"id": 1,
|
||||
"name": "trading-rules",
|
||||
"title": "Trading Rules",
|
||||
"content": "Content",
|
||||
"category": "rules",
|
||||
"created_by_discord_id": "123",
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
"is_active": True,
|
||||
"view_count": 100,
|
||||
"display_order": 0,
|
||||
'id': 1,
|
||||
'name': 'trading-rules',
|
||||
'title': 'Trading Rules',
|
||||
'content': 'Content',
|
||||
'category': 'rules',
|
||||
'created_by_discord_id': '123',
|
||||
'created_at': datetime.now(timezone.utc).isoformat(),
|
||||
'is_active': True,
|
||||
'view_count': 100,
|
||||
'display_order': 0
|
||||
}
|
||||
],
|
||||
"total_count": 1,
|
||||
"page": 1,
|
||||
"page_size": 10,
|
||||
"total_pages": 1,
|
||||
"has_more": False,
|
||||
'total_count': 1,
|
||||
'page': 1,
|
||||
'page_size': 10,
|
||||
'total_pages': 1,
|
||||
'has_more': False
|
||||
}
|
||||
|
||||
help_commands_service_instance._client.get.return_value = api_response
|
||||
@ -351,33 +348,33 @@ class TestHelpCommandsServiceSearch:
|
||||
assert isinstance(result, HelpCommandSearchResult)
|
||||
assert len(result.help_commands) == 1
|
||||
assert result.total_count == 1
|
||||
assert result.help_commands[0].name == "trading-rules"
|
||||
assert result.help_commands[0].name == 'trading-rules'
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_all_help_topics(self, help_commands_service_instance):
|
||||
"""Test getting all help topics."""
|
||||
# Mock API response
|
||||
api_response = {
|
||||
"help_commands": [
|
||||
'help_commands': [
|
||||
{
|
||||
"id": i,
|
||||
"name": f"topic-{i}",
|
||||
"title": f"Topic {i}",
|
||||
"content": f"Content {i}",
|
||||
"category": "rules" if i % 2 == 0 else "guides",
|
||||
"created_by_discord_id": "123",
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
"is_active": True,
|
||||
"view_count": i * 10,
|
||||
"display_order": i,
|
||||
'id': i,
|
||||
'name': f'topic-{i}',
|
||||
'title': f'Topic {i}',
|
||||
'content': f'Content {i}',
|
||||
'category': 'rules' if i % 2 == 0 else 'guides',
|
||||
'created_by_discord_id': '123',
|
||||
'created_at': datetime.now(timezone.utc).isoformat(),
|
||||
'is_active': True,
|
||||
'view_count': i * 10,
|
||||
'display_order': i
|
||||
}
|
||||
for i in range(1, 6)
|
||||
],
|
||||
"total_count": 5,
|
||||
"page": 1,
|
||||
"page_size": 100,
|
||||
"total_pages": 1,
|
||||
"has_more": False,
|
||||
'total_count': 5,
|
||||
'page': 1,
|
||||
'page_size': 100,
|
||||
'total_pages': 1,
|
||||
'has_more': False
|
||||
}
|
||||
|
||||
help_commands_service_instance._client.get.return_value = api_response
|
||||
@ -389,45 +386,42 @@ class TestHelpCommandsServiceSearch:
|
||||
assert all(isinstance(cmd, HelpCommand) for cmd in result)
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_help_names_for_autocomplete(
|
||||
self, help_commands_service_instance
|
||||
):
|
||||
async def test_get_help_names_for_autocomplete(self, help_commands_service_instance):
|
||||
"""Test getting help names for autocomplete."""
|
||||
# Mock API response
|
||||
api_response = {
|
||||
"results": [
|
||||
'results': [
|
||||
{
|
||||
"name": "trading-rules",
|
||||
"title": "Trading Rules",
|
||||
"category": "rules",
|
||||
'name': 'trading-rules',
|
||||
'title': 'Trading Rules',
|
||||
'category': 'rules'
|
||||
},
|
||||
{
|
||||
"name": "trading-deadline",
|
||||
"title": "Trading Deadline",
|
||||
"category": "info",
|
||||
},
|
||||
'name': 'trading-deadline',
|
||||
'title': 'Trading Deadline',
|
||||
'category': 'info'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
help_commands_service_instance._client.get.return_value = api_response
|
||||
|
||||
result = await help_commands_service_instance.get_help_names_for_autocomplete(
|
||||
partial_name="trading", limit=25
|
||||
partial_name='trading',
|
||||
limit=25
|
||||
)
|
||||
|
||||
assert isinstance(result, list)
|
||||
assert len(result) == 2
|
||||
assert "trading-rules" in result
|
||||
assert "trading-deadline" in result
|
||||
assert 'trading-rules' in result
|
||||
assert 'trading-deadline' in result
|
||||
|
||||
|
||||
class TestHelpCommandsServiceViewTracking:
|
||||
"""Test view count tracking."""
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_increment_view_count(
|
||||
self, help_commands_service_instance, sample_help_command
|
||||
):
|
||||
async def test_increment_view_count(self, help_commands_service_instance, sample_help_command):
|
||||
"""Test incrementing view count."""
|
||||
# Mock the API patch call
|
||||
help_commands_service_instance._client.patch = AsyncMock()
|
||||
@ -443,7 +437,7 @@ class TestHelpCommandsServiceViewTracking:
|
||||
created_at=sample_help_command.created_at,
|
||||
is_active=sample_help_command.is_active,
|
||||
view_count=sample_help_command.view_count + 1,
|
||||
display_order=sample_help_command.display_order,
|
||||
display_order=sample_help_command.display_order
|
||||
)
|
||||
|
||||
async def mock_get_help_by_name(name, include_inactive=False):
|
||||
@ -451,9 +445,7 @@ class TestHelpCommandsServiceViewTracking:
|
||||
|
||||
help_commands_service_instance.get_help_by_name = mock_get_help_by_name
|
||||
|
||||
result = await help_commands_service_instance.increment_view_count(
|
||||
"trading-rules"
|
||||
)
|
||||
result = await help_commands_service_instance.increment_view_count("trading-rules")
|
||||
|
||||
assert isinstance(result, HelpCommand)
|
||||
assert result.view_count == 101
|
||||
@ -467,21 +459,21 @@ class TestHelpCommandsServiceStatistics:
|
||||
"""Test getting help command statistics."""
|
||||
# Mock API response
|
||||
api_response = {
|
||||
"total_commands": 50,
|
||||
"active_commands": 45,
|
||||
"total_views": 5000,
|
||||
"most_viewed_command": {
|
||||
"id": 1,
|
||||
"name": "popular-topic",
|
||||
"title": "Popular Topic",
|
||||
"content": "Content",
|
||||
"created_by_discord_id": "123",
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
"is_active": True,
|
||||
"view_count": 500,
|
||||
"display_order": 0,
|
||||
'total_commands': 50,
|
||||
'active_commands': 45,
|
||||
'total_views': 5000,
|
||||
'most_viewed_command': {
|
||||
'id': 1,
|
||||
'name': 'popular-topic',
|
||||
'title': 'Popular Topic',
|
||||
'content': 'Content',
|
||||
'created_by_discord_id': '123',
|
||||
'created_at': datetime.now(timezone.utc).isoformat(),
|
||||
'is_active': True,
|
||||
'view_count': 500,
|
||||
'display_order': 0
|
||||
},
|
||||
"recent_commands_count": 5,
|
||||
'recent_commands_count': 5
|
||||
}
|
||||
|
||||
help_commands_service_instance._client.get.return_value = api_response
|
||||
@ -493,7 +485,7 @@ class TestHelpCommandsServiceStatistics:
|
||||
assert result.active_commands == 45
|
||||
assert result.total_views == 5000
|
||||
assert result.most_viewed_command is not None
|
||||
assert result.most_viewed_command.name == "popular-topic"
|
||||
assert result.most_viewed_command.name == 'popular-topic'
|
||||
assert result.recent_commands_count == 5
|
||||
|
||||
|
||||
@ -506,9 +498,7 @@ class TestHelpCommandsServiceErrorHandling:
|
||||
from exceptions import APIException, BotException
|
||||
|
||||
# Mock the API client to raise an APIException
|
||||
help_commands_service_instance._client.get.side_effect = APIException(
|
||||
"Connection error"
|
||||
)
|
||||
help_commands_service_instance._client.get.side_effect = APIException("Connection error")
|
||||
|
||||
with pytest.raises(BotException, match="Failed to retrieve help topic 'test'"):
|
||||
await help_commands_service_instance.get_help_by_name("test")
|
||||
|
||||
@ -115,13 +115,6 @@ class TestTransactionBuilder:
|
||||
svc.get_current_roster.return_value = mock_roster
|
||||
return svc
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def mock_league_service(self):
|
||||
"""Patch league_service for all tests so FA lock check uses week 10 (before deadline)."""
|
||||
with patch("services.transaction_builder.league_service") as mock_ls:
|
||||
mock_ls.get_current_state = AsyncMock(return_value=MagicMock(week=10))
|
||||
yield mock_ls
|
||||
|
||||
@pytest.fixture
|
||||
def builder(self, mock_team, mock_roster_service):
|
||||
"""Create a TransactionBuilder for testing with injected roster service."""
|
||||
@ -159,50 +152,6 @@ class TestTransactionBuilder:
|
||||
assert builder.is_empty is False
|
||||
assert move in builder.moves
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_add_move_from_fa_blocked_after_deadline(self, builder, mock_player):
|
||||
"""Test that adding a player FROM Free Agency is blocked after fa_lock_week."""
|
||||
move = TransactionMove(
|
||||
player=mock_player,
|
||||
from_roster=RosterType.FREE_AGENCY,
|
||||
to_roster=RosterType.MAJOR_LEAGUE,
|
||||
to_team=builder.team,
|
||||
)
|
||||
|
||||
with patch(
|
||||
"services.transaction_builder.league_service"
|
||||
) as mock_league_service:
|
||||
mock_league_service.get_current_state = AsyncMock(
|
||||
return_value=MagicMock(week=15)
|
||||
)
|
||||
|
||||
success, error_message = await builder.add_move(
|
||||
move, check_pending_transactions=False
|
||||
)
|
||||
|
||||
assert success is False
|
||||
assert "Free agency is closed" in error_message
|
||||
assert builder.move_count == 0
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_drop_to_fa_allowed_after_deadline(self, builder, mock_player):
|
||||
"""Test that dropping a player TO Free Agency is still allowed after fa_lock_week."""
|
||||
move = TransactionMove(
|
||||
player=mock_player,
|
||||
from_roster=RosterType.MAJOR_LEAGUE,
|
||||
to_roster=RosterType.FREE_AGENCY,
|
||||
from_team=builder.team,
|
||||
)
|
||||
|
||||
# Drop to FA doesn't trigger the FA lock check (autouse fixture provides week 10)
|
||||
success, error_message = await builder.add_move(
|
||||
move, check_pending_transactions=False
|
||||
)
|
||||
|
||||
assert success is True
|
||||
assert error_message == ""
|
||||
assert builder.move_count == 1
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_add_duplicate_move_fails(self, builder, mock_player):
|
||||
"""Test that adding duplicate moves for same player fails."""
|
||||
@ -860,13 +809,6 @@ class TestPendingTransactionValidation:
|
||||
"""Create a mock player for testing."""
|
||||
return Player(id=12472, name="Test Player", wara=2.5, season=12, pos_1="OF")
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def mock_league_service(self):
|
||||
"""Patch league_service so FA lock check and week resolution use week 10."""
|
||||
with patch("services.transaction_builder.league_service") as mock_ls:
|
||||
mock_ls.get_current_state = AsyncMock(return_value=MagicMock(week=10))
|
||||
yield mock_ls
|
||||
|
||||
@pytest.fixture
|
||||
def builder(self, mock_team):
|
||||
"""Create a TransactionBuilder for testing."""
|
||||
|
||||
@ -344,7 +344,6 @@ class TradeAcceptanceView(discord.ui.View):
|
||||
def __init__(self, builder: TradeBuilder):
|
||||
super().__init__(timeout=3600.0) # 1 hour timeout
|
||||
self.builder = builder
|
||||
self._checked_teams: dict[int, Team] = {}
|
||||
|
||||
async def _get_user_team(self, interaction: discord.Interaction) -> Optional[Team]:
|
||||
"""Get the team owned by the interacting user."""
|
||||
@ -370,7 +369,6 @@ class TradeAcceptanceView(discord.ui.View):
|
||||
)
|
||||
return False
|
||||
|
||||
self._checked_teams[interaction.user.id] = user_team
|
||||
return True
|
||||
|
||||
async def on_timeout(self) -> None:
|
||||
@ -384,7 +382,7 @@ class TradeAcceptanceView(discord.ui.View):
|
||||
self, interaction: discord.Interaction, button: discord.ui.Button
|
||||
):
|
||||
"""Handle accept button click."""
|
||||
user_team = self._checked_teams.get(interaction.user.id)
|
||||
user_team = await self._get_user_team(interaction)
|
||||
if not user_team:
|
||||
return
|
||||
|
||||
@ -419,7 +417,7 @@ class TradeAcceptanceView(discord.ui.View):
|
||||
self, interaction: discord.Interaction, button: discord.ui.Button
|
||||
):
|
||||
"""Handle reject button click - moves trade back to DRAFT."""
|
||||
user_team = self._checked_teams.get(interaction.user.id)
|
||||
user_team = await self._get_user_team(interaction)
|
||||
if not user_team:
|
||||
return
|
||||
|
||||
@ -735,10 +733,10 @@ async def create_trade_embed(builder: TradeBuilder) -> discord.Embed:
|
||||
Returns:
|
||||
Discord embed with current trade state
|
||||
"""
|
||||
validation = await builder.validate_trade()
|
||||
if builder.is_empty:
|
||||
color = EmbedColors.SECONDARY
|
||||
else:
|
||||
validation = await builder.validate_trade()
|
||||
color = EmbedColors.SUCCESS if validation.is_legal else EmbedColors.WARNING
|
||||
|
||||
embed = EmbedTemplate.create_base_embed(
|
||||
@ -793,6 +791,7 @@ async def create_trade_embed(builder: TradeBuilder) -> discord.Embed:
|
||||
inline=False,
|
||||
)
|
||||
|
||||
validation = await builder.validate_trade()
|
||||
if validation.is_legal:
|
||||
status_text = "Trade appears legal"
|
||||
else:
|
||||
|
||||
@ -6,8 +6,6 @@ Handles the Discord embed and button interfaces for the transaction builder.
|
||||
|
||||
import discord
|
||||
|
||||
from utils.logging import get_contextual_logger
|
||||
|
||||
from services.transaction_builder import (
|
||||
TransactionBuilder,
|
||||
clear_transaction_builder,
|
||||
@ -237,7 +235,6 @@ class SubmitConfirmationModal(discord.ui.Modal):
|
||||
super().__init__(title="Confirm Transaction Submission")
|
||||
self.builder = builder
|
||||
self.submission_handler = submission_handler
|
||||
self.logger = get_contextual_logger(f"{__name__}.SubmitConfirmationModal")
|
||||
|
||||
self.confirmation = discord.ui.TextInput(
|
||||
label="Type 'CONFIRM' to submit",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user