diff --git a/repositories/player_repository.py b/repositories/player_repository.py index 1880c67..6c0059f 100644 --- a/repositories/player_repository.py +++ b/repositories/player_repository.py @@ -186,8 +186,7 @@ def mark_match_parse_error(external_id: str, error_text: str) -> None: def get_player_id_by_name_and_team(full_name: str, team_id: int) -> int | None: query = """ - SELECT id, - position + SELECT id FROM players WHERE team_id = %s AND LOWER(full_name) = LOWER(%s) @@ -199,14 +198,15 @@ def get_player_id_by_name_and_team(full_name: str, team_id: int) -> int | None: with conn.cursor() as cur: cur.execute(query, (team_id, full_name.strip())) row = cur.fetchone() - return row if row else None + return row[0] if row else None finally: conn.close() def get_player_id_by_external_id(external_id: str) -> int | None: query = """ - SELECT id + SELECT id, + position FROM players WHERE external_id = %s LIMIT 1; @@ -217,7 +217,7 @@ def get_player_id_by_external_id(external_id: str) -> int | None: with conn.cursor() as cur: cur.execute(query, (str(external_id).strip(),)) row = cur.fetchone() - return row[0] if row else None + return row if row else None finally: conn.close() diff --git a/services/game_service.py b/services/game_service.py index 6ff9929..11a2c97 100644 --- a/services/game_service.py +++ b/services/game_service.py @@ -41,12 +41,14 @@ def sync_match_page( player_position = None if player.get("player_external_id"): - player_id = get_player_id_by_external_id(player["player_external_id"]) + player_id, player_position = get_player_id_by_external_id(player["player_external_id"]) if player_id is None: - player_id, player_position = get_player_id_by_name_and_team( + player_id = get_player_id_by_name_and_team( player["player_name"], home_team_id ) + print(player_id, player_position) + lineup_rows.append( { @@ -68,13 +70,12 @@ def sync_match_page( player_position = None if player.get("player_external_id"): - player_id = get_player_id_by_external_id(player["player_external_id"]) + player_id, player_position = get_player_id_by_external_id(player["player_external_id"]) if player_id is None: - player_id, player_position = get_player_id_by_name_and_team( + player_id = get_player_id_by_name_and_team( player["player_name"], away_team_id ) - print(player_id, player_position) lineup_rows.append( { @@ -96,10 +97,10 @@ def sync_match_page( player_position = None if player.get("player_external_id"): - player_id = get_player_id_by_external_id(player["player_external_id"]) + player_id, player_position = get_player_id_by_external_id(player["player_external_id"]) if player_id is None: - player_id, player_position = get_player_id_by_name_and_team( + player_id = get_player_id_by_name_and_team( player["player_name"], home_team_id ) @@ -123,10 +124,10 @@ def sync_match_page( player_position = None if player.get("player_external_id"): - player_id = get_player_id_by_external_id(player["player_external_id"]) + player_id, player_position = get_player_id_by_external_id(player["player_external_id"]) if player_id is None: - player_id, player_position = get_player_id_by_name_and_team( + player_id = get_player_id_by_name_and_team( player["player_name"], away_team_id )