Fix duplicate key error for coop_leaderboard

server/gameconnection.py

@@ -336,17 +336,18 @@ async def handle_operation_complete(
 
             # Each player in a co-op game will send the OperationComplete
             # message but we only need to perform this insert once
-            if not self.game.leaderboard_saved:
-                await conn.execute(
-                    coop_leaderboard.insert().values(
-                        mission=mission,
-                        gameuid=self.game.id,
-                        secondary=secondary,
-                        time=delta,
-                        player_count=len(self.game.players),
+            async with self.game.leaderboard_lock:
+                if not self.game.leaderboard_saved:
+                    await conn.execute(
+                        coop_leaderboard.insert().values(
+                            mission=mission,
+                            gameuid=self.game.id,
+                            secondary=secondary,
+                            time=delta,
+                            player_count=len(self.game.players),
+                        )
                     )
-                )
-                self.game.leaderboard_saved = True
+                    self.game.leaderboard_saved = True
 
     async def handle_json_stats(self, stats: str):
         try:

server/games/coop.py

@@ -1,3 +1,5 @@
+import asyncio
+
 from .game import Game
 from .typedefs import FA, GameType, InitMode, ValidityState, Victory
 
@@ -19,6 +21,7 @@ def __init__(self, *args, **kwargs):
             "Difficulty": 3,
             "Expansion": "true"
         })
+        self.leaderboard_lock = asyncio.Lock()
         self.leaderboard_saved = False
 
     async def validate_game_mode_settings(self):

tests/conftest.py

@@ -160,7 +160,7 @@ def opt(val):
         user=user,
         password=pw or "",
         port=port,
-        db=name
+        db=name,
     )
 
 
@@ -183,7 +183,7 @@ def opt(val):
             user=user,
             password=pw or "",
             port=port,
-            db=name
+            db=name,
         )
         await db.connect()
 
@@ -211,7 +211,7 @@ async def game(database, players):
 
 
 GAME_UID = 1
-COOP_GAME_UID = 1
+COOP_GAME_UID = 2
 
 
 @pytest.fixture

tests/unit_tests/test_gameconnection.py

@@ -527,9 +527,7 @@ async def test_handle_action_TeamkillHappened(
 
 
 async def test_handle_action_TeamkillHappened_AI(
-    game: Game,
     game_connection: GameConnection,
-    database
 ):
     # Should fail with a sql constraint error if this isn't handled correctly
     game_connection.abort = mock.AsyncMock()
@@ -675,13 +673,12 @@ async def test_handle_action_OperationComplete_duplicate(
         )
 
     with caplog.at_level(logging.ERROR):
-        await game_connection.handle_action(
-            "OperationComplete", [1, 1, time_taken]
-        )
-        caplog.clear()
-        await game_connection.handle_action(
-            "OperationComplete", [1, 1, time_taken]
-        )
+        await asyncio.gather(*(
+            game_connection.handle_action(
+                "OperationComplete", [1, 1, time_taken]
+            )
+            for _ in range(10)
+        ))
 
         assert not any(
             record.exc_info