sort_card_list moved to utils and refactored

api/routes.py

@@ -3,7 +3,7 @@ from bridzik import Bridzik, Card, Card_colors, Card_values, BridzikException
 import json
 from flask import render_template, url_for, flash, redirect
 from api.forms import GuessForm, PlayForm, AdminForm
-from api.utils  import get_points_sums
+from api.utils  import get_points_sums, sort_card_list
 
 b = Bridzik()
 
@@ -24,7 +24,7 @@ def status(player):
     game_status = b.get_status(player)
     action = None
     form = None
-    player_cards = Card.sort_card_list(b.series[-1].get_last_round().player_cards[player])
+    player_cards = sort_card_list(b.series[-1].get_last_round().player_cards[player])
     game_status['player_cards'] = [str(c) for c in player_cards]
     points_sums = get_points_sums(game_status['standings'])
     if b.is_completed() or b.series[-1].get_last_round().get_active_player() != player:

api/utils.py

@@ -1,3 +1,5 @@
+from bridzik import Card_colors
+
 def get_points_sums(standings: []):
     sums = [0] * 4
     for series in standings:
@@ -5,3 +7,17 @@ def get_points_sums(standings: []):
             for player, points in enumerate(round):
                 sums[player] += points
     return sums
+
+def sort_card_list(input_card_set: []) -> []:
+    color_paritions = [
+        [c for c in input_card_set if c.color == Card_colors['HEARTS']],
+        [c for c in input_card_set if c.color == Card_colors['LEAVES']],
+        [c for c in input_card_set if c.color == Card_colors['ACORNS']],
+        [c for c in input_card_set if c.color == Card_colors['BELLS']]
+
+    ]
+    output_list = []
+    for color_list in color_paritions:
+        color_list.sort(key=lambda a : a.value)
+        output_list.extend(color_list)
+    return output_list