fix(game): Not subtracting from pending bounty when game ends due to …

…inactivity before wagers are collected

src/service/bounty_service.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import traceback
 from math import ceil
 
 from peewee import Case, fn
@@ -281,12 +282,10 @@ async def add_or_remove_bounty(user: User, amount: int = None, context: ContextT
                 user.pending_bounty += (amount if pending_belly_amount is None else pending_belly_amount)
 
             if user.bounty < 0 and previous_bounty >= 0:
-                try:
-                    raise ValueError(f'User {user.id} has negative bounty: {user.bounty} after removing '
-                                     f'{amount} bounty in event '
-                                     f'{update.to_dict() if update is not None else "None"}')
-                except ValueError as ve:
-                    logging.exception(ve)
+                logging.exception(f'User {user.id} has negative bounty: {user.bounty} after removing '
+                                  f'{amount} bounty in event '
+                                  f'{update.to_dict() if update is not None else "None"}'
+                                  f'\n{traceback.print_stack()}')
 
             if should_save:
                 user.save()
@@ -296,13 +295,11 @@ async def add_or_remove_bounty(user: User, amount: int = None, context: ContextT
             user.pending_bounty -= (amount if pending_belly_amount is None else pending_belly_amount)
 
             if user.pending_bounty < 0 and previous_pending_bounty >= 0:
-                try:
-                    raise ValueError(f'User {user.id} has negative pending bounty: {user.pending_bounty}'
-                                     f'(previous was {previous_pending_bounty} after removing'
-                                     f' {amount} pending bounty in event '
-                                     f'{update.to_dict() if update is not None else "None"}')
-                except ValueError as ve:
-                    logging.exception(ve)
+                logging.exception(f'User {user.id} has negative pending bounty: {user.pending_bounty}'
+                                  f'(previous was {previous_pending_bounty} after removing'
+                                  f' {amount} pending bounty in event '
+                                  f'{update.to_dict() if update is not None else "None"}'
+                                  f'\n{traceback.print_stack()}')
 
             if should_save:
                 user.save()

src/service/game_service.py

@@ -64,6 +64,7 @@ async def end_game(game: Game, game_outcome: GameOutcome, is_forced_end: bool =
     challenger: User = game.challenger
     opponent: User = game.opponent
     half_wager: int = game.wager / 2
+    previous_status: GameStatus = game.get_status()
 
     bounty_for_challenger = bounty_for_opponent = 0
     pending_bounty_for_challenger = pending_bounty_for_opponent = game.wager / 2
@@ -81,13 +82,14 @@ async def end_game(game: Game, game_outcome: GameOutcome, is_forced_end: bool =
         bounty_for_opponent = half_wager
         game.status = GameStatus.FORCED_END if is_forced_end else GameStatus.DRAW
 
-    await add_or_remove_bounty(challenger, bounty_for_challenger,
-                               pending_belly_amount=pending_bounty_for_challenger, update=update,
-                               tax_event_type=IncomeTaxEventType.GAME, event_id=game.id)
+    if not previous_status.no_wager_was_collected():
+        await add_or_remove_bounty(challenger, bounty_for_challenger,
+                                   pending_belly_amount=pending_bounty_for_challenger, update=update,
+                                   tax_event_type=IncomeTaxEventType.GAME, event_id=game.id)
 
-    if opponent is not None:
-        await add_or_remove_bounty(opponent, bounty_for_opponent, pending_belly_amount=pending_bounty_for_opponent,
-                                   update=update, tax_event_type=IncomeTaxEventType.GAME, event_id=game.id)
+        if opponent is not None:
+            await add_or_remove_bounty(opponent, bounty_for_opponent, pending_belly_amount=pending_bounty_for_opponent,
+                                       update=update, tax_event_type=IncomeTaxEventType.GAME, event_id=game.id)
 
     # Refresh
     game.challenger = challenger