Improve code style

FAForever · Jul 11, 2024 · c0d1ac0 · c0d1ac0
1 parent 3c031b7
commit c0d1ac0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/server/matchmaker/matchmaker_queue.py b/server/matchmaker/matchmaker_queue.py
@@ -278,10 +278,17 @@ def to_dict(self):
         """
         Return a fuzzy representation of the searches currently in the queue
         """
+
+        granularity = 25
+        # Average rating is based on displayed rating, while the 1v1 queue uses mean rating for matching.
         if self.team_size == 1:
-            ratings = {round(search.ratings[0].mean / 25) * 25 for search in self._queue.keys()}
+            active_rating_groups = {
+                round(search.ratings[0].mean / granularity) * granularity for search in self._queue.keys()
+            }
         else:
-            ratings = {round(search.average_rating / 25) * 25 for search in self._queue.keys()}
+            active_rating_groups = {
+                round(search.average_rating / granularity) * granularity for search in self._queue.keys()
+            }
         return {
             "queue_name": self.name,
             "queue_pop_time": datetime.fromtimestamp(
@@ -292,12 +299,13 @@ def to_dict(self):
                 ndigits=2
             ),
             "num_players": self.num_players,
-            "ratings": sorted(ratings),
-            # DEPRECATED
+            "active_rating_groups": sorted(active_rating_groups),
+            # TODO: Remove deprecated keys
+            # DEPRECATED, the client is supposed to use active_rating_groups instead
             "boundary_80s": [search.boundary_80 for search in self._queue.keys()],
-            # DEPRECATED
+            # DEPRECATED, the client is supposed to use active_rating_groups instead
             "boundary_75s": [search.boundary_75 for search in self._queue.keys()],
-            # DEPRECATED TODO: Remove, the client should query the API for this
+            # DEPRECATED, the client should query the API for this
             "team_size": self.team_size,
         }
 

diff --git a/tests/integration_tests/test_matchmaker.py b/tests/integration_tests/test_matchmaker.py
@@ -450,7 +450,7 @@ async def test_matchmaker_info_message(lobby_server, mocker):
         assert queue["queue_pop_time_delta"] == math.ceil(
             config.QUEUE_POP_TIME_MAX / 2
         )
-        assert queue["ratings"] == []
+        assert queue["active_rating_groups"] == []
         assert queue["boundary_80s"] == []
         assert queue["boundary_75s"] == []
 
@@ -485,7 +485,7 @@ async def test_command_matchmaker_info(lobby_server, mocker):
         assert queue["queue_pop_time_delta"] == math.ceil(
             config.QUEUE_POP_TIME_MAX / 2
         )
-        assert queue["ratings"] == []
+        assert queue["active_rating_groups"] == []
         assert queue["boundary_80s"] == []
         assert queue["boundary_75s"] == []
 
@@ -514,10 +514,10 @@ async def read_update_msg():
             queue_message = next(
                 q for q in msg["queues"] if q["queue_name"] == "ladder1v1"
             )
-            if not queue_message["ratings"]:
+            if not queue_message["active_rating_groups"]:
                 continue
 
-            assert len(queue_message["ratings"]) == 1
+            assert len(queue_message["active_rating_groups"]) == 1
 
             return
 
@@ -532,7 +532,7 @@ async def read_update_msg():
     msg = await read_until_command(proto, "matchmaker_info")
 
     queue_message = next(q for q in msg["queues"] if q["queue_name"] == "ladder1v1")
-    assert len(queue_message["ratings"]) == 0
+    assert len(queue_message["active_rating_groups"]) == 0
 
 
 @fast_forward(10)

diff --git a/tests/integration_tests/test_teammatchmaker.py b/tests/integration_tests/test_teammatchmaker.py
@@ -84,7 +84,7 @@ async def test_info_message(lobby_server):
     assert msg["queues"]
     for queue in msg["queues"]:
         boundaries = queue["boundary_80s"]
-        ratings = queue["ratings"]
+        ratings = queue["active_rating_groups"]
 
         if queue["queue_name"] == "tmm2v2":
             assert boundaries == [[300, 700]]

diff --git a/tests/unit_tests/test_lobbyconnection.py b/tests/unit_tests/test_lobbyconnection.py
@@ -1039,7 +1039,7 @@ async def test_command_matchmaker_info(
                 "queue_pop_time_delta": 1,
                 "team_size": 3,
                 "num_players": 6,
-                "ratings": [125, 1125, 1700],
+                "active_rating_groups": [125, 1125, 1700],
                 "boundary_80s": [(1800, 2200), (400, 800), (800, 1200)],
                 "boundary_75s": [(1900, 2100), (500, 700), (900, 1100)]
             }