From 562202b38df354652db7dfdc388c43dbb737bbda Mon Sep 17 00:00:00 2001 From: "Outrun Colors, LLC" Date: Sun, 29 May 2022 01:06:39 -0500 Subject: [PATCH] Reorganize route logic --- files/helpers/lottery.py | 6 +++--- files/routes/lottery.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/files/helpers/lottery.py b/files/helpers/lottery.py index 01fa09f6d..e67192bb3 100644 --- a/files/helpers/lottery.py +++ b/files/helpers/lottery.py @@ -82,11 +82,11 @@ def start_new_lottery_session(g): def purchase_lottery_ticket(g, v): if (v.coins < LOTTERY_TICKET_COST): - return False, f'Lottery tickets cost {LOTTERY_TICKET_COST} dramacoins each.', None + return False, f'Lottery tickets cost {LOTTERY_TICKET_COST} dramacoins each.' most_recent_lottery = get_active_lottery(g) if (most_recent_lottery is None): - return False, "There is no active lottery.", None + return False, "There is no active lottery." v.coins -= LOTTERY_TICKET_COST v.currently_held_lottery_tickets += 1 @@ -104,4 +104,4 @@ def purchase_lottery_ticket(g, v): g.db.commit() - return True, 'Successfully purchased a lottery ticket!', most_recent_lottery.stats + return True, 'Successfully purchased a lottery ticket!' diff --git a/files/routes/lottery.py b/files/routes/lottery.py index 6775143b2..7e07d5e9d 100644 --- a/files/routes/lottery.py +++ b/files/routes/lottery.py @@ -30,12 +30,13 @@ def lottery_start(v): @limiter.limit("1/second;30/minute;200/hour;1000/day") @auth_required def lottery_buy(v): - success, message, lottery_stats = purchase_lottery_ticket(g, v) + success, message = purchase_lottery_ticket(g, v) + lottery, participants = get_active_lottery_stats(g) if success: - return {"message": message, "stats": {"user": v.lottery_stats, "lottery": lottery_stats}} + return {"message": message, "stats": {"user": v.lottery_stats, "lottery": lottery, "participants": participants}} else: - return {"error": message, "stats": {"user": v.lottery_stats, "lottery": lottery_stats}} + return {"error": message, "stats": {"user": v.lottery_stats, "lottery": lottery, "participants": participants}} @app.get("/lottery/active")