From 8d159baad796c89f7f15ebebbee50c8836fef5d0 Mon Sep 17 00:00:00 2001
From: Grail Finder <wohilas@gmail.com>
Date: Wed, 2 Jul 2025 16:29:52 +0300
Subject: [PATCH] Feat: session table and interface

---
 Makefile                             |   3 +++
 gralias.db                           | Bin 40960 -> 45056 bytes
 handlers/timer.go                    |   3 ---
 migrations/001_initial_schema.up.sql |  11 ++++++++++-
 models/auth.go                       |  27 ++++++++++++++++-----------
 repos/session.go                     |   9 +++++++++
 6 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 repos/session.go

diff --git a/Makefile b/Makefile
index 73b07ec..628d008 100644
--- a/Makefile
+++ b/Makefile
@@ -39,3 +39,6 @@ migrate-up:
 
 migrate-down:
 	migrate -database 'sqlite3://gralias.db' -path migrations down
+
+install-migrate:
+	go install -tags 'sqlite3' github.com/golang-migrate/migrate/v4/cmd/migrate@latest
diff --git a/gralias.db b/gralias.db
index 2c8a5e126cac04fa208aa862a2e54cae385847e0..a48b6782685be7da4cb514842c7b659230a844f8 100644
GIT binary patch
delta 994
zcmZ`&O^ee&7*4tylS!Hu_bY1XI(5N_w6(Y*c+##L%R+3*k_A1*Y&(WvI?;U8o35@^
z_T<N?HxcycY3aqA`$q)*3F1*@jkWC-HW?TO-shR;ecxx^+1kr&eapO%k1`ZR3Gp5+
z?qzAY$WWE;j+kGhcxH*pzsaA@+PR;?6u%2>?)H(_%+l_okJA?(W1f`?1-f@Gv^HH7
zpfGf>9gI%l>bhDpRA|&zG!+h`<O?`YJWhV-TG);(8$m<8VZeqS?+s0ZtLnAdhGswo
zVWq^wc=?{!G4EPIkj5PH!pO&F=yVWVYZz)>T|X>(v08%Va$HKw%iuOS31n`Rm|OxH
zzpVpSl4bg7L>9PrbB6^Kh4i@!5d|O|RH~5g-27@1`F{gA>TDw4j63jJjuoPIY9nL@
zoSCfXI(WdbQn5&H*U5A6X#(O^P-h3wlbhrj|9&|=y^p%ca^tKkx~{3U#+XSgVU9F~
znFCo%Ai!b<7W9sjKLQd5e&NV<|2;5qvuBe{d7C|z41CU(Cgrd2Jut;el0@&^BW2Ny
zU5DhASV_LTCl+SM)sFqHlCR=oV*HnQ;&K9iI7X;#w!8?3$WI@TDyifaz*uAG5HsKQ
zFiP}Kb^_CnFplRw5kD5=UN=seWd2%+td4o#!>I!?@dI23-$~{5f8=J1{psfKJk9s%
K=Dz;n7W@mYwhpoY

delta 668
zcmZuvOK;Oa7_?J0>$T&U@Up5@Bmsm#B#~3cwB*985ki7SDyh^1!g8C%F*xhQv4c1u
zD*8Ag$|sIIuk@B15>o#He*idEJr(5#z>?HR5sY>(GvCgPc6aSZY;8C8GM$QZ94E3J
z0d42?Oq?rjU67Si92OFs@>)43pGgj+f%HLqiZ_KsKXv2<5})@lQqyUE^9H<)zkwPm
z!ZtbqpV2hzqx0}Jk%5X(z@dQDT#jEipe=lYvv?lo(2&`Xp@ZL@%!^qDpY(|3l1BD=
zt#-S5Z2>ysamXYm;hrdiFTTQs$zj+=31o@DcdWpHFb(e|3}2+vFp%<W>Wa92X9B6J
z%5Ob^PQrx!M0siCA2gk=8H7GHU8m&)*;@<s>dornNc7r-l7{(rW?WryLt?IaAq|Kh
zDX=R~J&T&Nlgv13K4M!=i<k|Ml5v`qXooAVv-%J1hm<<h9_L+)+M#8WY`wZ%Ka68V
zSRk{XkIIY$X6^M@!@~<4kpZz<=3|eJ8F($TZFRdtuKzQ6EEngM9ZuO{&-zihzsMgo
z?y9md1Qt>;L6#e(W<bl2Y@I#`^h+eX+<d6bXfsAZn=NRiY{{q?b8HpMT6u1^Z0Pz$
mO|NL0?OTpZD4+lH!FXklQ}$TKH)TqlF!298<vxG)SM4|JVzm1J

diff --git a/handlers/timer.go b/handlers/timer.go
index ed95a19..d16cd9e 100644
--- a/handlers/timer.go
+++ b/handlers/timer.go
@@ -21,15 +21,12 @@ var (
 func StartTurnTimer(roomID string, duration time.Duration) {
 	mu.Lock()
 	defer mu.Unlock()
-
 	if _, exists := timers[roomID]; exists {
 		return // Timer already running
 	}
-
 	ticker := time.NewTicker(1 * time.Second)
 	done := make(chan bool)
 	timers[roomID] = &roomTimer{ticker: ticker, done: done}
-
 	go func() {
 		for {
 			select {
diff --git a/migrations/001_initial_schema.up.sql b/migrations/001_initial_schema.up.sql
index d4080bc..a8d5ac1 100644
--- a/migrations/001_initial_schema.up.sql
+++ b/migrations/001_initial_schema.up.sql
@@ -20,7 +20,7 @@ CREATE TABLE rooms (
 CREATE TABLE players (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     room_id TEXT, -- nullable
-    username TEXT NOT NULL,
+    username TEXT NOT NULL UNIQUE,
     team TEXT NOT NULL DEFAULT '', -- 'red' or 'blue'
     role TEXT NOT NULL DEFAULT '', -- 'guesser' or 'mime'
     is_bot BOOLEAN NOT NULL DEFAULT FALSE,
@@ -67,3 +67,12 @@ CREATE TABLE settings (
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (room_id) REFERENCES rooms(id)
 );
+
+CREATE TABLE sessions(
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    lifetime INTEGER NOT NULL DEFAULT 3600,
+    cookie_token TEXT NOT NULL DEFAULT '', -- encoded value
+    username TEXT NOT NULL,
+    FOREIGN KEY (username) REFERENCES players(username)
+);
diff --git a/models/auth.go b/models/auth.go
index 5dadf8a..0b6d83b 100644
--- a/models/auth.go
+++ b/models/auth.go
@@ -6,20 +6,25 @@ import (
 
 // each session contains the username of the user and the time at which it expires
 type Session struct {
-	Username    string
-	CurrentRoom string
-	Expiry      time.Time
+	ID uint32
+	// CurrentRoom string
+	// Expiry      time.Time
+	UpdatedAt   time.Time
+	Lifetime    uint32 // minutes
+	CookieToken string
+	Username    string // username is playerid
 }
 
 // we'll use this method later to determine if the session has expired
 func (s Session) IsExpired() bool {
-	return s.Expiry.Before(time.Now())
+	return time.Now().After(s.UpdatedAt.Add(time.Minute * time.Duration(s.Lifetime)))
+	// return s.Expiry.Before(time.Now())
 }
 
-func ListUsernames(ss map[string]*Session) []string {
-	resp := make([]string, 0, len(ss))
-	for _, s := range ss {
-		resp = append(resp, s.Username)
-	}
-	return resp
-}
+// func ListUsernames(ss map[string]*Session) []string {
+// 	resp := make([]string, 0, len(ss))
+// 	for _, s := range ss {
+// 		resp = append(resp, s.Username)
+// 	}
+// 	return resp
+// }
diff --git a/repos/session.go b/repos/session.go
new file mode 100644
index 0000000..f814da6
--- /dev/null
+++ b/repos/session.go
@@ -0,0 +1,9 @@
+package repos
+
+import "gralias/models"
+
+type SessionsRepo interface {
+	SessionByToken(token string) (*models.Session, error)
+	SessionCreate(req *models.Session) error
+	SessionUpdateLifetime(minutes uint32) error
+}