tslocum/bgammon
tslocum/bgammon
2
0
Fork 0
Code Issues 11 Pull requests Projects Releases Wiki Activity

Record points and win type

Browse source
This commit is contained in:
Trevor Slocum 2023-11-27 16:40:40 -08:00
parent 3c37ea5927
commit ffeb985cab
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/bgammon-server/database.go
View file

@ -15,9 +15,11 @@ CREATE TABLE game (
acey integer NOT NULL,
started bigint NOT NULL,
ended bigint NOT NULL,
winner integer NOT NULL,
player1 text NOT NULL,
player2 text NOT NULL
player2 text NOT NULL,
points integer NOT NULL,
winner integer NOT NULL,
wintype integer NOT NULL
);
`
@ -70,7 +72,7 @@ func initDB(db *pgx.Conn) {
log.Println("Initialized database schema")
}
func recordGameResult(conn *pgx.Conn, g bgammon.Game) error {
func recordGameResult(conn *pgx.Conn, g *bgammon.Game, winType int) error {
if g.Started.IsZero() || g.Ended.IsZero() || g.Winner == 0 {
return nil
}
@ -85,7 +87,7 @@ func recordGameResult(conn *pgx.Conn, g bgammon.Game) error {
if g.Acey {
acey = 1
}
_, err = tx.Exec(context.Background(), "INSERT INTO game (acey, started, ended, winner, player1, player2) VALUES ($1, $2, $3, $4, $5, $6)", acey, g.Started.Unix(), g.Ended.Unix(), g.Winner, g.Player1.Name, g.Player2.Name)
_, err = tx.Exec(context.Background(), "INSERT INTO game (acey, started, ended, player1, player2, points, winner, wintype) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", acey, g.Started.Unix(), g.Ended.Unix(), g.Player1.Name, g.Player2.Name, g.Points, g.Winner, winType)
return err
}

12
cmd/bgammon-server/server.go
View file

@ -865,7 +865,10 @@ COMMANDS:
}
if s.db != nil {
recordGameResult(s.db, *clientGame.Game)
err := recordGameResult(s.db, clientGame.Game, 4)
if err != nil {
log.Fatalf("failed to record game result: %s", err)
}
}
}
clientGame.eachClient(func(client *serverClient) {
@ -1049,7 +1052,10 @@ COMMANDS:
}
if s.db != nil {
recordGameResult(s.db, *clientGame.Game)
err := recordGameResult(s.db, clientGame.Game, winPoints)
if err != nil {
log.Fatalf("failed to record game result: %s", err)
}
}
}
@ -1291,7 +1297,7 @@ COMMANDS:
clientGame.Turn = 1
clientGame.Roll1 = 5
clientGame.Roll2 = 6
clientGame.Board = []int{1, 3, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, 2, -12, 0, 0}
clientGame.Board = []int{1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2, 0, 0, 0}
clientGame.eachClient(func(client *serverClient) {
clientGame.sendBoard(client)