From d1ec8b2b69b1d2e3ce88d8296cb829a8863be958 Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Wed, 15 Dec 2021 21:31:24 +0300
Subject: [PATCH] fix leaderboard by action_id

---
 model/postgres_model.py        | 2 +-
 model/postgres_sql_requests.py | 9 ++++++++-
 web.py                         | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/model/postgres_model.py b/model/postgres_model.py
index ea9eedc..8aba307 100644
--- a/model/postgres_model.py
+++ b/model/postgres_model.py
@@ -178,7 +178,7 @@ class PostgresModel(AbstractModel):
 
         with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
             cursor.execute(
-                postgres_sql_requests.select_last_action_id,
+                postgres_sql_requests.select_leaderboard_by_action_id,
                 {
                     'action_id': action_id
                 }
diff --git a/model/postgres_sql_requests.py b/model/postgres_sql_requests.py
index dd8f54b..f21ed6e 100644
--- a/model/postgres_sql_requests.py
+++ b/model/postgres_sql_requests.py
@@ -97,7 +97,14 @@ limit 1000;
 """
 
 select_leaderboard_by_action_id = """select
-    *
+    name,
+    tag,
+    rank,
+    score,
+    to_char(timestamp, 'YYYY-MM-DD HH24:MI:SS') as timestamp,
+    leaderboard_type,
+    platform,
+    squadron_id
 from squads_stats_states
 where action_id = %(action_id)s
 order by score desc;
diff --git a/web.py b/web.py
index 238d702..0f29835 100644
--- a/web.py
+++ b/web.py
@@ -126,7 +126,7 @@ class SumLeaderboardHistoryHtml:
 class LeaderboardByActionID:
     def on_get(self, req: falcon.request.Request, resp: falcon.response.Response, action_id: int) -> None:
         resp.content_type = falcon.MEDIA_JSON
-        resp.text = json.dumps(model.get_diff_action_id(action_id))
+        resp.text = json.dumps(model.get_leaderboard_by_action_id(action_id))
 
 
 class LeaderboardByActionIDHTML:
@@ -136,7 +136,7 @@ class LeaderboardByActionIDHTML:
             'table_template.html',
             {
                 'target_column_name': 'Tag',
-                'target_new_url': '/squads/now/by-tag/short/'
+                'target_new_url': '/api/leaderboard-state/by-action-id/'
             }
         )