Hanabi/hanabi-league
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle existing values in DB insertion

Browse source
This commit is contained in:
Maximilian Keßler 2023-11-22 23:50:20 +01:00
parent 20ec64ef04
commit 93283c27f6
Signed by: max
GPG key ID: BCC5A619923C0BA5
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database.py
View file

@ -7,7 +7,7 @@ import requests
import unidecode import unidecode
import constants import constants
from config import read_db_config, read_config from config import config_manager
from log_setup import logger from log_setup import logger
@ -16,7 +16,7 @@ class DBConnectionManager:
self._conn = None self._conn = None
def connect(self): def connect(self):
config = read_db_config() config = config_manager.get_db_config()
logger.debug("Establishing database connection with dbname={}, user={}, password={}".format( logger.debug("Establishing database connection with dbname={}, user={}, password={}".format(
config.db_name, config.db_user, config.db_pass config.db_name, config.db_user, config.db_pass
)) ))
@ -79,7 +79,7 @@ def fetch_and_initialize_variants():
return return
variants = json.loads(response.text) variants = json.loads(response.text)
config = read_config() config = config_manager.get_config()
for variant in variants: for variant in variants:
variant_id = variant['id'] variant_id = variant['id']

28
fetch_games.py
View file

@ -33,8 +33,9 @@ class GameInfo:
self.user_ids = user_ids self.user_ids = user_ids
self.normalized_usernames = normalized_usernames self.normalized_usernames = normalized_usernames
def fetch_games_for_player(username: str, latest_game_id: int): def fetch_games_for_player(username: str, latest_game_id: int):
logger.verbose("Fetching games for username {}".format(username)) logger.verbose("Fetching games for username {} more recent than id {}".format(username, latest_game_id))
url = "https://hanab.live/api/v1/history-full/{}?start={}".format(username, latest_game_id + 1) url = "https://hanab.live/api/v1/history-full/{}?start={}".format(username, latest_game_id + 1)
response = session.get(url) response = session.get(url)
if not response.status_code == 200: if not response.status_code == 200:
@ -145,32 +146,31 @@ def store_new_games(games: Dict[int, GameInfo]):
latest_game_ids[normalized_username] = game.game_id latest_game_ids[normalized_username] = game.game_id
# Do the insertions # Do the insertions
# Notice that on conflict we can just do nothing: In that case, we already have the game in the DB for some reason
# (for example, because we forced a download refresh)
psycopg2.extras.execute_values( psycopg2.extras.execute_values(
cur, cur,
"INSERT INTO games (id, num_players, variant_id, seed, score, num_turns) " "INSERT INTO games (id, num_players, variant_id, seed, score, num_turns) "
"VALUES %s", "VALUES %s "
"ON CONFLICT (id) DO NOTHING",
games_vals games_vals
) )
psycopg2.extras.execute_values( psycopg2.extras.execute_values(
cur, cur,
"INSERT INTO game_participants (game_id, user_id) " "INSERT INTO game_participants (game_id, user_id) "
"VALUES %s", "VALUES %s "
"ON CONFLICT (game_id, user_id) DO NOTHING",
game_participants_vals game_participants_vals
) )
# Here, we want to update on insertion conflict
psycopg2.extras.execute_values( psycopg2.extras.execute_values(
cur, cur,
"INSERT INTO downloads (normalized_username, latest_game_id) " "INSERT INTO downloads (normalized_username, latest_game_id) "
"VALUES %s", "VALUES %s "
"ON CONFLICT (normalized_username) "
"DO UPDATE SET (normalized_username, latest_game_id) = (EXCLUDED.normalized_username, EXCLUDED.latest_game_id)",
latest_game_ids.items() latest_game_ids.items()
) )
# We only commit after performing all insertions. This guarantees that the download table is always in sync
# with the actual games stored in the database.
conn.commit() conn.commit()
"""
cur.execute("INSERT INTO games (id, num_players, variant_id, seed, score, num_turns) "
"VALUES %s""
)
game_participant_args = b", ".join(game_participants_vals)
cur.execute("INSERT INTO game_participants (game_id, user_id, seat) "
"VALUES {}".format(game_participants_vals))
conn.commit()
"""