dkforest

commit 900cb9e0cf4401216c13280e45903b76f79f1aa7
parent 291b399bb2ec5a2b9041e1933e20a5ab0670e566
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 16:01:12 -0500

admin

Diffstat:
M
pkg/database/tablePokerTables.go
 | 
6
++++++
M
pkg/web/handlers/admin.go
 | 
7
++++++-

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/pkg/database/tablePokerTables.go b/pkg/database/tablePokerTables.go
@@ -90,6 +90,12 @@ func (d *DkfDB) GetPokerTableAccount(userID UserID, pokerTableID int64) (out Pok
 	return
 }
 
+func (d *DkfDB) GetPokerTableAccountSums() (sumAmounts, sumBets PokerChip, err error) {
+	var tmp struct{ SumAmounts, SumBets PokerChip }
+	err = d.db.Raw(`SELECT SUM(amount) AS sum_accounts, SUM(amount_bet) AS sum_bets FROM poker_table_accounts`).Scan(&tmp).Error
+	return tmp.SumAmounts, tmp.SumBets, err
+}
+
 func (d *DkfDB) PokerTableAccountBet(userID UserID, pokerTableID int64, bet PokerChip) (err error) {
 	err = d.db.Exec(`UPDATE poker_table_accounts SET amount = amount - ?, amount_bet = amount_bet + ? WHERE user_id = ? AND poker_table_id = ?`,
 		bet, bet, userID, pokerTableID).Error
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -490,7 +490,12 @@ func AdminPokerTransactionsHandler(c echo.Context) error {
 	data.SumIn, _ = db.GetPokerXmrTransactionsSumIn()
 	data.SumOut, _ = db.GetPokerXmrTransactionsSumOut()
 	sumXmrBalance, _ := db.GetUsersXmrBalance()
-	data.Discrepancy = (int64(data.SumIn) - int64(data.SumOut)) - int64(sumXmrBalance+data.PokerCasino.Rake.ToPiconero())
+	sumTableAccounts, sumTableBets, _ := db.GetPokerTableAccountSums()
+	data.Discrepancy = (int64(data.SumIn) - int64(data.SumOut)) -
+		int64(sumXmrBalance) -
+		int64(data.PokerCasino.Rake.ToPiconero()) -
+		int64(sumTableAccounts.ToPiconero()) -
+		int64(sumTableBets.ToPiconero())
 	data.DiscrepancyPiconero = database.Piconero(uint64(math.Abs(float64(data.Discrepancy))))
 
 	if err := db.DB().