Feat: nullable roomid

handlers/actions.go

@@ -135,14 +135,22 @@ func getFullInfoByCtx(ctx context.Context) (*models.FullInfo, error) {
 		return nil, err
 	}
 	resp.State = state
-	if state.RoomID == "" {
+	if state.RoomID == nil {
 		return resp, nil
 	}
 	// room, err := getRoomByID(state.RoomID)
-	room, err := repo.RoomGetByID(ctx, state.RoomID)
+	room, err := repo.RoomGetByID(ctx, *state.RoomID)
 	if err != nil {
+		// room was deleted; remove it from player;
 		log.Warn("failed to find room despite knowing room_id;",
 			"room_id", state.RoomID)
+		state.Team = models.UserTeamNone
+		state.Role = models.UserRoleNone
+		if err := repo.PlayerExitRoom(ctx, state.Username); err != nil {
+			log.Warn("failed to exit room",
+				"room_id", state.RoomID, "username", state.Username)
+			return resp, err
+		}
 		return nil, err
 	}
 	resp.Room = room
@@ -292,11 +300,14 @@ func recoverBots() {
 
 func recoverBot(bm models.Player) error {
 	// check if room still exists
-	if _, err := repo.RoomGetByID(context.Background(), bm.RoomID); err != nil {
-		return fmt.Errorf("no such room: %s; err: %w", bm.RoomID, err)
+	if bm.RoomID == nil {
+		return errors.New("bot has no room id")
+	}
+	if _, err := repo.RoomGetByID(context.Background(), *bm.RoomID); err != nil {
+		return fmt.Errorf("no such room: %s; err: %w", *bm.RoomID, err)
 	}
 	log.Debug("recovering bot", "bot", bm)
-	_, err := llmapi.NewBot(string(bm.Role), string(bm.Team), bm.Username, bm.RoomID, cfg, true)
+	_, err := llmapi.NewBot(string(bm.Role), string(bm.Team), bm.Username, *bm.RoomID, cfg, true)
 	if err != nil {
 		return err
 	}

handlers/auth.go

@@ -110,8 +110,11 @@ func HandleFrontLogin(w http.ResponseWriter, r *http.Request) {
 		// room.PlayerList = append(room.PlayerList, fi.State.Username)
 		fi.Room = room
 		fi.List = nil
-		fi.State.RoomID = room.ID
-		repo.PlayerSetRoomID(r.Context(), fi.State.Username, room.ID)
+		fi.State.RoomID = &room.ID
+		if err := repo.PlayerSetRoomID(r.Context(), fi.State.Username, room.ID); err != nil {
+			abortWithError(w, err.Error())
+			return
+		}
 		// repo.RoomUpdate()
 		// save full info instead
 		// if err := saveFullInfo(r.Context(), fi); err != nil {
@@ -191,6 +194,7 @@ func makeCookie(username string, remote string) (*http.Cookie, error) {
 	return cookie, nil
 }
 
+//nolint: unused
 func cacheGetSession(key string) (*models.Session, error) {
 	userSessionB, err := cache.MemCache.Get(key)
 	if err != nil {

handlers/game.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"gralias/models"
@@ -32,21 +31,22 @@ func HandleCreateRoom(w http.ResponseWriter, r *http.Request) {
 		abortWithError(w, msg)
 		return
 	}
-	ctx := context.WithValue(r.Context(), "current_room", room.ID)
-	fi, err := getFullInfoByCtx(ctx)
+	fi, err := getFullInfoByCtx(r.Context())
 	if err != nil {
 		msg := "failed to get full info from ctx"
 		log.Error(msg, "error", err)
 		abortWithError(w, msg)
 		return
 	}
-	fi.State.RoomID = room.ID
+	fi.State.RoomID = &room.ID
 	fi.Room = room
 	if err := repo.RoomCreate(r.Context(), room); err != nil {
+		log.Error("failed to create a room", "error", err)
 		abortWithError(w, err.Error())
 		return
 	}
 	if err := repo.PlayerSetRoomID(r.Context(), fi.State.Username, room.ID); err != nil {
+		log.Error("failed to set room id", "error", err)
 		abortWithError(w, err.Error())
 		return
 	}
@@ -223,7 +223,7 @@ func HandleJoinRoom(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// room.PlayerList = append(room.PlayerList, fi.State.Username)
-	fi.State.RoomID = room.ID
+	fi.State.RoomID = &room.ID
 	fi.Room = room
 	fi.List = nil
 	if err := saveFullInfo(r.Context(), fi); err != nil {

handlers/timer.go

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"context"
-	"fmt"
 	"gralias/models"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -46,7 +46,7 @@ func StartTurnTimer(roomID string, duration time.Duration) {
 					if err := repo.RoomUpdate(context.Background(), room); err != nil {
 						log.Error("failed to save room", "error", err)
 					}
-					notify(models.NotifyTurnTimerPrefix+room.ID, fmt.Sprintf("%d", room.Settings.TurnSecondsLeft))
+					notify(models.NotifyTurnTimerPrefix+room.ID, strconv.FormatUint(uint64(room.Settings.TurnSecondsLeft), 10))
 					notifyBotIfNeeded(room)
 					StopTurnTimer(roomID)
 					return

llmapi/main.go

@@ -49,6 +49,7 @@ func convertToSliceOfStrings(value any) ([]string, error) {
 	}
 }
 
+//nolint: unused
 func (b *Bot) checkGuesses(tempMap map[string]any, room *models.Room) error {
 	guesses, err := convertToSliceOfStrings(tempMap["guesses"])
 	if err != nil {
@@ -539,5 +540,5 @@ func (b *Bot) CallLLM(prompt string) ([]byte, error) {
 		return body, nil
 	}
 	// This line should not be reached because each error path returns in the loop.
-	return nil, fmt.Errorf("unknown error in retry loop")
+	return nil, errors.New("unknown error in retry loop")
 }

models/main.go

@@ -104,7 +104,7 @@ type Action struct {
 
 type Player struct {
 	ID       uint32   `json:"id" db:"id"`
-	RoomID   string   `json:"room_id" db:"room_id"`
+	RoomID   *string  `json:"room_id" db:"room_id"`
 	Username string   `json:"username" db:"username"`
 	Team     UserTeam `json:"team" db:"team"`
 	Role     UserRole `json:"role" db:"role"`
@@ -386,12 +386,12 @@ type WordCard struct {
 
 // table: settings
 type GameSettings struct {
-	ID              uint32 `json:"id" db:"id"`
-	RoomID          string `db:"room_id"`
-	Language        string `json:"language" example:"en" form:"language" db:"language"`
-	RoomPass        string `json:"room_pass" db:"room_pass"`
-	TurnSecondsLeft uint32 `db:"-"`
-	RoundTime       uint32 `json:"round_time" db:"turn_time"`
+	ID              uint32    `json:"id" db:"id"`
+	RoomID          string    `db:"room_id"`
+	Language        string    `json:"language" example:"en" form:"language" db:"language"`
+	RoomPass        string    `json:"room_pass" db:"room_pass"`
+	TurnSecondsLeft uint32    `db:"-"`
+	RoundTime       uint32    `json:"round_time" db:"turn_time"`
 	CreatedAt       time.Time `db:"created_at"`
 }
 

repos/players.go

@@ -64,7 +64,7 @@ func (p *RepoProvider) PlayerSetRoomID(ctx context.Context, username, roomID str
 
 func (p *RepoProvider) PlayerExitRoom(ctx context.Context, username string) error {
 	db := getDB(ctx, p.DB)
-	_, err := db.ExecContext(ctx, "UPDATE players SET room_id = null WHERE username = ?", username)
+	_, err := db.ExecContext(ctx, "UPDATE players SET room_id='', team='', role='' WHERE username = ?", username)
 	return err
 }
 

repos/players_test.go

@@ -38,8 +38,9 @@ func TestPlayersRepo_AddPlayer(t *testing.T) {
 
 	repo := &RepoProvider{DB: db}
 
+	roomID := "test_room_player_1"
 	player := &models.Player{
-		RoomID:   "test_room_player_1",
+		RoomID:   &roomID,
 		Username: "test_player_1",
 		Team:     "blue",
 		Role:     "player",
@@ -61,8 +62,9 @@ func TestPlayersRepo_GetPlayer(t *testing.T) {
 
 	repo := &RepoProvider{DB: db}
 
+	roomID := "test_room_player_2"
 	player := &models.Player{
-		RoomID:   "test_room_player_2",
+		RoomID:   &roomID,
 		Username: "test_player_2",
 		Team:     "red",
 		Role:     "player",
@@ -84,8 +86,9 @@ func TestPlayersRepo_DeletePlayer(t *testing.T) {
 
 	repo := &RepoProvider{DB: db}
 
+	roomID := "test_room_player_3"
 	player := &models.Player{
-		RoomID:   "test_room_player_3",
+		RoomID:   &roomID,
 		Username: "test_player_3",
 		Team:     "blue",
 		Role:     "player",
@@ -95,7 +98,7 @@ func TestPlayersRepo_DeletePlayer(t *testing.T) {
 	_, err := db.Exec(`INSERT INTO players (room_id, username, team, role, is_bot) VALUES (?, ?, ?, ?, ?)`, player.RoomID, player.Username, player.Team, player.Role, player.IsBot)
 	assert.NoError(t, err)
 
-	err = repo.PlayerDelete(context.Background(), player.RoomID, player.Username)
+	err = repo.PlayerDelete(context.Background(), *player.RoomID, player.Username)
 	assert.NoError(t, err)
 
 	var count int