bradsbrown/wordlinator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

atomicity fixes

Browse Source
This commit is contained in:
Brad Brown
2022-06-21 18:30:54 -05:00
parent 3d17b6ef75
commit 0090862359
1 changed files with 135 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
wordlinator/db/pg.py
View File

@@ -85,140 +85,155 @@ class WordleDb:
return list(User.select()) return list(User.select())
def get_users_by_round(self, round_no=None, round_id=None): def get_users_by_round(self, round_no=None, round_id=None):
query = ( with db.atomic():
User.select(User, Player.user_id, Game.game) query = (
.join(Player, on=(Player.user_id == User.user_id)) User.select(User, Player.user_id, Game.game)
.join(Game, on=(Game.game_id == Player.game_id)) .join(Player, on=(Player.user_id == User.user_id))
) .join(Game, on=(Game.game_id == Player.game_id))
if round_no: )
query = query.filter(Game.game == round_no) if round_no:
elif round_id: query = query.filter(Game.game == round_no)
query = query.filter(Game.game_id == round_id) elif round_id:
return list(query) query = query.filter(Game.game_id == round_id)
return list(query)
def get_user_id(self, username): def get_user_id(self, username):
user = self.get_user(username) with db.atomic():
return user.twitter_id if user else None user = self.get_user(username)
return user.twitter_id if user else None
def add_user(self, username, user_id, check_twitter=True): def add_user(self, username, user_id, check_twitter=True):
return User.create( with db.atomic():
username=username, twitter_id=user_id, check_twitter=check_twitter return User.create(
) username=username, twitter_id=user_id, check_twitter=check_twitter
)
def get_rounds(self): def get_rounds(self):
return list(sorted(Game.select(), key=lambda d: d.start_date)) with db.atomic():
return list(sorted(Game.select(), key=lambda d: d.start_date))
def get_or_create_round(self, round_no, start_date=None): def get_or_create_round(self, round_no, start_date=None):
try: with db.atomic():
return Game.get(Game.game == round_no) try:
except peewee.DoesNotExist: return Game.get(Game.game == round_no)
start_date = ( except peewee.DoesNotExist:
start_date or wordlinator.utils.WORDLE_GOLF_ROUND_DATES[round_no - 1] start_date = (
) start_date
return Game.create(game=round_no, start_date=start_date) or wordlinator.utils.WORDLE_GOLF_ROUND_DATES[round_no - 1]
)
return Game.create(game=round_no, start_date=start_date)
def get_or_create_hole(self, round_no, hole_no): def get_or_create_hole(self, round_no, hole_no):
round = self.get_or_create_round(round_no) with db.atomic():
round = self.get_or_create_round(round_no)
try: try:
return Hole.get(Hole.hole == hole_no, Hole.game_id == round.game_id) return Hole.get(Hole.hole == hole_no, Hole.game_id == round.game_id)
except peewee.DoesNotExist: except peewee.DoesNotExist:
return Hole.create(hole=hole_no, game_id=round.game_id) return Hole.create(hole=hole_no, game_id=round.game_id)
def get_holes(self, round_no, ensure_all=False): def get_holes(self, round_no, ensure_all=False):
round = self.get_or_create_round(round_no) with db.atomic():
if ensure_all: round = self.get_or_create_round(round_no)
self.create_round_holes(round_no) if ensure_all:
return list(Hole.select().filter(game_id=round.game_id)) self.create_round_holes(round_no)
return list(Hole.select().filter(game_id=round.game_id))
def create_round_holes(self, round_no): def create_round_holes(self, round_no):
for hole_no in range(1, 19): with db.atomic():
self.get_or_create_hole(round_no, hole_no) for hole_no in range(1, 19):
self.get_or_create_hole(round_no, hole_no)
def get_or_create_player_round(self, user_id, game_id): def get_or_create_player_round(self, user_id, game_id):
try: with db.atomic():
return Player.get(Player.user_id == user_id, Player.game_id == game_id) try:
except peewee.DoesNotExist: return Player.get(Player.user_id == user_id, Player.game_id == game_id)
return Player.create(user_id=user_id, game_id=game_id) except peewee.DoesNotExist:
return Player.create(user_id=user_id, game_id=game_id)
def add_user_to_round(self, username, round_no): def add_user_to_round(self, username, round_no):
user = self.get_user(username) with db.atomic():
if not user: user = self.get_user(username)
raise ValueError(f"No user found with username {username}") if not user:
round = self.get_or_create_round(round_no) raise ValueError(f"No user found with username {username}")
return self.get_or_create_player_round(user.user_id, round.game_id) round = self.get_or_create_round(round_no)
return self.get_or_create_player_round(user.user_id, round.game_id)
def remove_user_from_round(self, username, round_no): def remove_user_from_round(self, username, round_no):
user = self.get_user(username) with db.atomic():
if not user: user = self.get_user(username)
raise ValueError(f"No user found with username {username}") if not user:
round = self.get_or_create_round(round_no) raise ValueError(f"No user found with username {username}")
try: round = self.get_or_create_round(round_no)
player = Player.get(user_id=user.user_id, game_id=round.game_id) try:
player.delete_instance() player = Player.get(user_id=user.user_id, game_id=round.game_id)
except peewee.DoesNotExist: player.delete_instance()
return except peewee.DoesNotExist:
return
def copy_players_from_round(self, from_round_no, to_round_no): def copy_players_from_round(self, from_round_no, to_round_no):
to_round = self.get_or_create_round(to_round_no) with db.atomic():
to_round = self.get_or_create_round(to_round_no)
for user in self.get_users_by_round(from_round_no): for user in self.get_users_by_round(from_round_no):
self.get_or_create_player_round(user.user_id, to_round.game_id) self.get_or_create_player_round(user.user_id, to_round.game_id)
def add_score(self, username, game, hole, score): def add_score(self, username, game, hole, score):
if not score: with db.atomic():
return if not score:
return
user = self.get_user(username) user = self.get_user(username)
if not user: if not user:
raise ValueError(f'No Such User "{username}"') raise ValueError(f'No Such User "{username}"')
hole = self.get_or_create_hole(game, hole) hole = self.get_or_create_hole(game, hole)
try: try:
score_obj = Score.get( score_obj = Score.get(
Score.user_id == user.user_id, Score.user_id == user.user_id,
Score.game_id == hole.game_id, Score.game_id == hole.game_id,
Score.hole_id == hole.hole_id, Score.hole_id == hole.hole_id,
) )
score_obj.score = score score_obj.score = score
score_obj.save() score_obj.save()
return score_obj return score_obj
except peewee.DoesNotExist: except peewee.DoesNotExist:
return Score.create( return Score.create(
score=score, score=score,
user_id=user.user_id, user_id=user.user_id,
game_id=hole.game_id, game_id=hole.game_id,
hole_id=hole.hole_id, hole_id=hole.hole_id,
) )
def get_scores(self, round_no=None, round_id=None): def get_scores(self, round_no=None, round_id=None):
if round_no: with db.atomic():
round = self.get_or_create_round(round_no) if round_no:
elif round_id: round = self.get_or_create_round(round_no)
round = Game.get_by_id(round_id) elif round_id:
else: round = Game.get_by_id(round_id)
raise ValueError("Must provide Round Number or Round ID") else:
res = ( raise ValueError("Must provide Round Number or Round ID")
Score.select( res = (
Score, Score.select(
Hole.hole, Score,
User.username, Hole.hole,
Player.game_id, User.username,
Player.game_id,
)
.join(Player, on=(Score.user_id == Player.user_id))
.switch(Score)
.join(Hole, on=(Score.hole_id == Hole.hole_id))
.switch(Score)
.join(User, on=(Score.user_id == User.user_id))
.filter(Player.game_id == round.game_id)
.filter(Score.game_id == round.game_id)
) )
.join(Player, on=(Score.user_id == Player.user_id)) return list(res) if res else []
.switch(Score)
.join(Hole, on=(Score.hole_id == Hole.hole_id))
.switch(Score)
.join(User, on=(Score.user_id == User.user_id))
.filter(Player.game_id == round.game_id)
.filter(Score.game_id == round.game_id)
)
return list(res)
def bulk_insert_scores(self, scores: typing.List[typing.Dict]): def bulk_insert_scores(self, scores: typing.List[typing.Dict]):
with db.atomic(): with db.atomic() as txn:
for batch in peewee.chunked(scores, 50): for batch in peewee.chunked(scores, 50):
Score.insert_many(batch).execute() Score.insert_many(batch).execute(txn)
def bulk_update_scores(self, scores: typing.List[Score]): def bulk_update_scores(self, scores: typing.List[Score]):
with db.atomic(): with db.atomic():
@@ -226,24 +241,25 @@ class WordleDb:
score.save() score.save()
def get_users_without_score(self, round_no, hole_no, tweetable=True): def get_users_without_score(self, round_no, hole_no, tweetable=True):
hole = self.get_or_create_hole(round_no, hole_no) with db.atomic() as txn:
# Find users who *have* played in this round, hole = self.get_or_create_hole(round_no, hole_no)
# but have no score on the current hole # Find users who *have* played in this round,
query_str = """SELECT u.username, player.game_id # but have no score on the current hole
FROM user_tbl u query_str = """SELECT u.username, player.game_id
JOIN player ON player.user_id = u.user_id FROM user_tbl u
WHERE ( JOIN player ON player.user_id = u.user_id
player.game_id = {} WHERE (
) AND NOT EXISTS ( player.game_id = {}
SELECT FROM score WHERE score.user_id = u.user_id AND score.hole_id = {} ) AND NOT EXISTS (
) SELECT FROM score WHERE score.user_id = u.user_id AND score.hole_id = {}
""".format( )
hole.game_id, hole.hole_id """.format(
) hole.game_id, hole.hole_id
)
if tweetable: if tweetable:
# Restrict to users who post scores on twitter # Restrict to users who post scores on twitter
query_str += " AND u.check_twitter = true" query_str += " AND u.check_twitter = true"
res = db.execute_sql(query_str) res = txn.execute_sql(query_str)
return [r[0] for r in res] return [r[0] for r in res]