Fix and improve leaderboard table and graph

server/db/db_types.go

@@ -0,0 +1,35 @@
+package db
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"time"
+)
+
+type DateTime time.Time
+
+// Time converts a DateTime to a time.Time.
+func (d DateTime) Time() time.Time {
+	return time.Time(d)
+}
+
+func (d *DateTime) Scan(src any) error {
+	switch src := src.(type) {
+	case time.Time:
+		*d = DateTime(src)
+		return nil
+	case string:
+		t, err := time.Parse("2006-01-02 15:04:05", src)
+		if err != nil {
+			return fmt.Errorf("parsing time: %w", err)
+		}
+		*d = DateTime(t)
+		return nil
+	default:
+		return fmt.Errorf("unsupported type: %T", src)
+	}
+}
+
+func (d DateTime) Value() (driver.Value, error) {
+	return time.Time(d), nil
+}

server/db/sql_queries.sql

@@ -21,7 +21,9 @@ SELECT * FROM team_submit_attempts WHERE team_name = ? AND problem_id = ?
 	ORDER BY submitted_at ASC;
 
 -- name: ListAllCorrectSubmissions :many
-SELECT * FROM team_submit_attempts WHERE correct = TRUE
+SELECT *
+	FROM team_submit_attempts
+	WHERE correct = TRUE
 	ORDER BY submitted_at ASC;
 
 -- name: CountIncorrectSubmissions :one
@@ -42,30 +44,33 @@ DELETE FROM team_points WHERE team_name = ? AND reason = ? RETURNING *;
 -- name: RemovePointsByTime :one
 DELETE FROM team_points WHERE team_name = ? AND added_at = ? RETURNING *;
 
--- name: TeamPoints :many
-SELECT
-		teams.team_name,
-		team_points.reason,
-		SUM(team_points.points) AS points
+-- name: TeamPointsTotal :many
+SELECT team_name, SUM(points) AS points
 	FROM team_points
-	RIGHT JOIN teams ON teams.team_name = team_points.team_name
-	GROUP BY teams.team_name, team_points.reason
-	ORDER BY COALESCE(SUM(team_points.points), 0) DESC;
+	GROUP BY team_name
+	ORDER BY COALESCE(SUM(points), 0) DESC;
 
--- name: TeamPointsHistory :many
-SELECT
-		team_name,
-		added_at,
-		SUM(points) AS points
+-- name: TeamPointsEach :many
+SELECT team_name, reason, points
 	FROM team_points
-	GROUP BY team_name, added_at
+	GROUP BY team_name, reason;
+
+-- name: TeamPointsHistory :many
+SELECT *
+	FROM (
+		SELECT team_name, added_at, points FROM team_points
+		UNION ALL
+		SELECT team_name, MIN(joined_at) AS added_at, 0 AS points
+			FROM team_members
+			GROUP BY team_name
+	) AS history
 	ORDER BY added_at ASC;
 
 -- name: ListTeams :many
 SELECT team_name, created_at, accepting_members FROM teams;
 
 -- name: ListTeamAndMembers :many
-SELECT * FROM team_members ORDER BY joined_at ASC;
+SELECT team_name, user_name FROM team_members ORDER BY joined_at ASC;
 
 -- name: FindTeamWithInviteCode :one
 SELECT team_name, created_at, accepting_members FROM teams WHERE invite_code = ? AND accepting_members = TRUE;