Fix internal dashboard weekday query for Postgres
This commit is contained in:
2 files changed
+6
-4
No files matched your search
@@ -206,18 +206,19 @@ def _top_leagues(limit: int = 8):
|
|||||||
|
|
||||||
|
|
||||||
def _sessions_by_weekday() -> dict:
|
def _sessions_by_weekday() -> dict:
|
||||||
from sqlalchemy import func as f
|
from sqlalchemy import extract
|
||||||
|
|
||||||
rows = (
|
rows = (
|
||||||
db.session.query(
|
db.session.query(
|
||||||
f.strftime("%w", PokerSession.session_date).label("dow"),
|
extract("dow", PokerSession.session_date).label("dow"),
|
||||||
f.count(PokerSession.id).label("cnt"),
|
db.func.count(PokerSession.id).label("cnt"),
|
||||||
)
|
)
|
||||||
.group_by("dow")
|
.group_by("dow")
|
||||||
.all()
|
.all()
|
||||||
)
|
)
|
||||||
counts = {str(i): 0 for i in range(7)}
|
counts = {str(i): 0 for i in range(7)}
|
||||||
for row in rows:
|
for row in rows:
|
||||||
counts[str(row.dow)] = row.cnt
|
counts[str(int(row.dow))] = row.cnt
|
||||||
return {
|
return {
|
||||||
"labels": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
|
"labels": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
|
||||||
"data": [counts[str(i)] for i in range(7)],
|
"data": [counts[str(i)] for i in range(7)],
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ class InternalAdminAccessTests(unittest.TestCase):
|
|||||||
self.assertIn(b"Active users", response.data)
|
self.assertIn(b"Active users", response.data)
|
||||||
self.assertIn(b"Activity breakdown", response.data)
|
self.assertIn(b"Activity breakdown", response.data)
|
||||||
self.assertIn(b"Ledger events", response.data)
|
self.assertIn(b"Ledger events", response.data)
|
||||||
|
self.assertIn(b"Sessions by day of week", response.data)
|
||||||
self.assertIn(b"Totals at a glance", response.data)
|
self.assertIn(b"Totals at a glance", response.data)
|
||||||
|
|
||||||
def test_admin_can_search_users(self):
|
def test_admin_can_search_users(self):
|
||||||
|
|||||||
Reference in new issue
Block a user