visual overhaul + accounting corrections
This commit is contained in:
SowinskiBraeden committed
1 parent
77198e5b47
commit
70e62342ee
17 files changed
+1268
-389
No files matched your search
+177
-7
@@ -1,6 +1,15 @@
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from stats import build_session_summaries
|
||||
import app as app_module
|
||||
from stats import (
|
||||
build_leaderboard,
|
||||
build_session_summaries,
|
||||
player_session_series,
|
||||
session_sort_key,
|
||||
)
|
||||
from storage import load_events, write_events
|
||||
|
||||
|
||||
def cents(amount: float) -> int:
|
||||
@@ -40,7 +49,7 @@ class AccountingTests(unittest.TestCase):
|
||||
[
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 20, 2),
|
||||
event("s1", "2026-01-01", "A", "paid", 20, 3),
|
||||
event("s1", "2026-01-01", "A", "paid_out", 20, 3),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -56,7 +65,7 @@ class AccountingTests(unittest.TestCase):
|
||||
[
|
||||
event("s1", "2026-01-01", "A", "front", 5, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 8, 2),
|
||||
event("s1", "2026-01-01", "A", "paid", 3, 3),
|
||||
event("s1", "2026-01-01", "A", "paid_out", 3, 3),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -80,6 +89,7 @@ class AccountingTests(unittest.TestCase):
|
||||
self.assertEqual(entry.gross_payout_cents, cents(19.50))
|
||||
self.assertEqual(entry.current_due_to_player_cents, cents(9.50))
|
||||
self.assertEqual(session.total_paid_out_cents, 0)
|
||||
self.assertEqual(entry.payout_status, "partial")
|
||||
|
||||
def test_rollover_in_is_invested_without_new_cash_in(self):
|
||||
rows = [
|
||||
@@ -98,20 +108,180 @@ class AccountingTests(unittest.TestCase):
|
||||
self.assertEqual(dest_entry.invested_cents, cents(10))
|
||||
self.assertEqual(dest.total_cash_in_cents, 0)
|
||||
|
||||
def test_payout_carry_in_does_not_count_as_investment_or_cash(self):
|
||||
rows = [
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "payout_carry_in", 0.60, 2),
|
||||
event("s1", "2026-01-01", "A", "cashout", 6.55, 3),
|
||||
event("s1", "2026-01-01", "A", "paid_out", 6.55, 4),
|
||||
]
|
||||
session, entry = self.entry_for(rows)
|
||||
player = build_leaderboard([session])[0]
|
||||
|
||||
self.assertEqual(entry.payout_carry_in_cents, cents(0.60))
|
||||
self.assertEqual(entry.invested_cents, cents(10))
|
||||
self.assertEqual(entry.net_cents, cents(-3.45))
|
||||
self.assertEqual(entry.current_due_to_player_cents, cents(0.60))
|
||||
self.assertEqual(session.total_cash_in_cents, cents(10))
|
||||
self.assertEqual(player.total_payout_carry_in_cents, cents(0.60))
|
||||
|
||||
def test_debt_repayment_and_writeoff_resolve_front_without_inflating_cash(self):
|
||||
session, entry = self.entry_for(
|
||||
[
|
||||
event("s1", "2026-01-01", "A", "front", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 0, 2),
|
||||
event("s1", "2026-01-01", "A", "front_collected", 6, 3),
|
||||
event("s1", "2026-01-01", "A", "front_writeoff", 4, 4),
|
||||
event("s1", "2026-01-01", "A", "debt_repayment", 6, 3),
|
||||
event("s1", "2026-01-01", "A", "writeoff", 4, 4),
|
||||
]
|
||||
)
|
||||
|
||||
self.assertEqual(entry.player_owes_gross_cents, cents(10))
|
||||
self.assertEqual(entry.gross_due_to_house_cents, cents(10))
|
||||
self.assertEqual(entry.current_due_to_house_cents, 0)
|
||||
self.assertEqual(session.total_cash_in_cents, cents(6))
|
||||
self.assertEqual(session.total_front_writeoff_cents, cents(4))
|
||||
self.assertEqual(session.total_writeoff_cents, cents(4))
|
||||
|
||||
def test_banker_book_position_separates_cash_and_open_items(self):
|
||||
rows = [
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 25, 2),
|
||||
event("s1", "2026-01-01", "A", "paid_out", 5, 3),
|
||||
event("s1", "2026-01-01", "A", "rollover_out", 10, 4),
|
||||
event("s1", "2026-01-01", "B", "front", 20, 5),
|
||||
event("s1", "2026-01-01", "B", "cashout", 0, 6),
|
||||
event("s1", "2026-01-01", "B", "debt_repayment", 8, 7),
|
||||
event("s1", "2026-01-01", "B", "writeoff", 2, 8),
|
||||
]
|
||||
sessions = build_session_summaries(rows)
|
||||
session = next(s for s in sessions if s.session_id == "s1")
|
||||
|
||||
self.assertEqual(session.total_invested_cents, cents(30))
|
||||
self.assertEqual(session.total_cash_out_cents, cents(25))
|
||||
self.assertEqual(session.total_real_cash_in_cents, cents(18))
|
||||
self.assertEqual(session.total_real_cash_out_cents, cents(5))
|
||||
self.assertEqual(session.total_current_due_to_player_cents, cents(10))
|
||||
self.assertEqual(session.total_current_due_to_house_cents, cents(10))
|
||||
self.assertEqual(session.total_net_book_position_cents, cents(13))
|
||||
|
||||
def test_player_stats_track_house_owes_player_separately_from_cash_paid(self):
|
||||
rows = [
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 25, 2),
|
||||
event("s1", "2026-01-01", "A", "paid_out", 5, 3),
|
||||
]
|
||||
player = build_leaderboard(build_session_summaries(rows))[0]
|
||||
|
||||
self.assertEqual(player.total_cash_out_cents, cents(25))
|
||||
self.assertEqual(player.total_gross_payout_cents, cents(25))
|
||||
self.assertEqual(player.total_paid_out_cents, cents(5))
|
||||
self.assertEqual(player.current_due_to_player_cents, cents(20))
|
||||
self.assertEqual(player.total_real_cash_out_cents, cents(5))
|
||||
|
||||
def test_rollover_out_can_settle_without_being_marked_paid(self):
|
||||
rows = [
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 1),
|
||||
event("s1", "2026-01-01", "A", "cashout", 20, 2),
|
||||
event("s1", "2026-01-01", "A", "rollover_out", 20, 3),
|
||||
]
|
||||
entry = build_session_summaries(rows)[0].entries[0]
|
||||
|
||||
self.assertEqual(entry.current_due_to_player_cents, 0)
|
||||
self.assertEqual(entry.paid_out_cents, 0)
|
||||
self.assertEqual(entry.payout_status, "settled")
|
||||
|
||||
def test_admin_can_apply_pending_payout_carry_in_to_open_session(self):
|
||||
rows = [
|
||||
event("s1", "2026-01-01", "", "session_open", 0, 1),
|
||||
event("s1", "2026-01-01", "A", "buyin", 10, 2),
|
||||
event("s1", "2026-01-01", "A", "cashout", 20, 3),
|
||||
event("s1", "2026-01-01", "A", "rollover_out", 5, 4),
|
||||
event("s1", "2026-01-01", "", "session_close", 0, 5),
|
||||
event("s2", "2026-01-02", "", "session_open", 0, 6),
|
||||
event("s2", "2026-01-02", "A", "buyin", 10, 7),
|
||||
]
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmpdir:
|
||||
data_path = Path(tmpdir) / "entries.csv"
|
||||
write_events(data_path, rows)
|
||||
original_path = app_module.DATA_PATH
|
||||
app_module.DATA_PATH = data_path
|
||||
|
||||
try:
|
||||
sessions = build_session_summaries(load_events(data_path))
|
||||
self.assertEqual(
|
||||
app_module.pending_payout_carry_items(sessions),
|
||||
[{"player_name": "A", "amount_cents": cents(5)}],
|
||||
)
|
||||
|
||||
with app_module.app.test_client() as client:
|
||||
with client.session_transaction() as flask_session:
|
||||
flask_session["is_admin"] = True
|
||||
|
||||
response = client.post(
|
||||
"/admin/apply-payout-carry-in",
|
||||
data={"session_id": "s2", "player_name": "A"},
|
||||
)
|
||||
finally:
|
||||
app_module.DATA_PATH = original_path
|
||||
|
||||
self.assertEqual(response.status_code, 302)
|
||||
updated_sessions = build_session_summaries(load_events(data_path))
|
||||
target = next(s for s in updated_sessions if s.session_id == "s2")
|
||||
target_entry = target.entries[0]
|
||||
self.assertEqual(target_entry.payout_carry_in_cents, cents(5))
|
||||
self.assertEqual(target_entry.invested_cents, cents(10))
|
||||
self.assertEqual(target_entry.current_due_to_player_cents, cents(5))
|
||||
|
||||
def test_same_day_sessions_sort_by_session_sequence(self):
|
||||
rows = [
|
||||
event("2026-03-21-02", "2026-03-21", "A", "buyin", 10, 1),
|
||||
event("2026-03-21-02", "2026-03-21", "A", "cashout", 11, 2),
|
||||
event("2026-03-21-01", "2026-03-21", "A", "buyin", 10, 3),
|
||||
event("2026-03-21-01", "2026-03-21", "A", "cashout", 9, 4),
|
||||
]
|
||||
sessions = build_session_summaries(rows)
|
||||
ordered = sorted(sessions, key=session_sort_key)
|
||||
|
||||
self.assertEqual([s.session_id for s in ordered], ["2026-03-21-01", "2026-03-21-02"])
|
||||
self.assertEqual(
|
||||
player_session_series(sessions, "A")["labels"],
|
||||
["Mar 21, 2026 · S1", "Mar 21, 2026 · S2"],
|
||||
)
|
||||
|
||||
def test_admin_prunes_only_empty_marker_sessions(self):
|
||||
rows = [
|
||||
event("empty-1", "2026-01-01", "", "session_open", 0, 1),
|
||||
event("empty-1", "2026-01-01", "", "session_close", 0, 2),
|
||||
event("played-1", "2026-01-02", "", "session_open", 0, 3),
|
||||
event("played-1", "2026-01-02", "A", "buyin", 10, 4),
|
||||
event("played-1", "2026-01-02", "A", "cashout", 15, 5),
|
||||
event("played-1", "2026-01-02", "", "session_close", 0, 6),
|
||||
]
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmpdir:
|
||||
data_path = Path(tmpdir) / "entries.csv"
|
||||
write_events(data_path, rows)
|
||||
original_path = app_module.DATA_PATH
|
||||
app_module.DATA_PATH = data_path
|
||||
|
||||
try:
|
||||
with app_module.app.test_client() as client:
|
||||
with client.session_transaction() as flask_session:
|
||||
flask_session["is_admin"] = True
|
||||
|
||||
response = client.post("/admin/prune-empty-sessions")
|
||||
finally:
|
||||
app_module.DATA_PATH = original_path
|
||||
|
||||
self.assertEqual(response.status_code, 302)
|
||||
remaining = load_events(data_path)
|
||||
self.assertEqual(
|
||||
{row["session_id"] for row in remaining},
|
||||
{"played-1"},
|
||||
)
|
||||
self.assertEqual(
|
||||
[row["event_type"] for row in remaining],
|
||||
["session_open", "buyin", "cashout", "session_close"],
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in new issue
Block a user