From ffeb985cabafc3f09c3e9b11723f14bfefdc2f5f Mon Sep 17 00:00:00 2001
From: Trevor Slocum <trevor@rocket9labs.com>
Date: Mon, 27 Nov 2023 16:40:40 -0800
Subject: [PATCH] Record points and win type

---
 cmd/bgammon-server/database.go | 10 ++++++----
 cmd/bgammon-server/server.go   | 12 +++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cmd/bgammon-server/database.go b/cmd/bgammon-server/database.go
index 80b0dd7..a08c311 100644
--- a/cmd/bgammon-server/database.go
+++ b/cmd/bgammon-server/database.go
@@ -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
 }
 
diff --git a/cmd/bgammon-server/server.go b/cmd/bgammon-server/server.go
index eb8f799..7b59e43 100644
--- a/cmd/bgammon-server/server.go
+++ b/cmd/bgammon-server/server.go
@@ -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)