From f5b8dd384afb059aabc24af3539f30928c7f7da9 Mon Sep 17 00:00:00 2001
From: lonkaars <l.leblansch@gmail.com>
Date: Wed, 10 Mar 2021 14:57:09 +0100
Subject: w/d/l calculations should be working now

---
 api/user/games.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'api/user')

diff --git a/api/user/games.py b/api/user/games.py
index 43bd59e..6073af2 100644
--- a/api/user/games.py
+++ b/api/user/games.py
@@ -29,7 +29,7 @@ def game_info(game_id, user_id = None):
     return {
         "id": game[0],
         "parent": game[1],
-        "moves": [int(column) for move in str(game[2]).split(",")],
+        "moves": [int(move) for move in str(game[2]).split(",")],
         "opponent": game[3] if is_player_1 else game[4],
         "outcome": outcome,
         "created": game[6],
@@ -44,21 +44,28 @@ def game_info(game_id, user_id = None):
 
 def sum_games(user_id): #! SANITIZE USER_ID FIRST
     wld_querys = [' '.join([
+        "select count(game_id)",
+        "from games",
+        "where",
+        f"player_{x[0]}_id = \"{user_id}\" and",
+        f"outcome = \"{x[1]}\"",
+    ]) for x in [(1, "w"), (1, "l"), (2, "w"), (2, "l")]]
+    wld_querys.insert(0, ' '.join([
         "select count(game_id)",
         "from games",
         "where",
         f"(player_1_id = \"{user_id}\" or player_2_id = \"{user_id}\") and",
-        f"outcome = \"{x}\"",
-    ]) for x in ["w", "l", "d"]]
+        "outcome = \"d\"",
+    ]))
 
     big_query = "select " + ", ".join([f"({query})" for query in wld_querys])
 
     results = cursor.execute(big_query).fetchone()
 
     return {
-            "win": results[0],
-            "lose": results[1],
-            "draw": results[2],
+            "draw": results[0],
+            "win": results[1] + results[4],
+            "lose": results[2] + results[3],
             "games": reduce(lambda a, b: a + b, results)
     }
 
-- 
cgit v1.2.3