@@ -6,60 +6,46 @@ import (
66 "time"
77 )
88
9-// Account represents a stored game account credential.
109 type Account struct {
11- ID int64
1210 Username string
1311 Password string
14- Empire string
1512 InUse bool
16- ClaimedBy string // mysis_id or empty
1713 LastUsedAt time.Time
1814 CreatedAt time.Time
19- UpdatedAt time.Time
2015 }
2116
22-// CreateAccount stores a new account credential.
23-func (s *Store) CreateAccount(username, password, empire string) (*Account, error) {
17+func (s *Store) CreateAccount(username, password string) (*Account, error) {
2418 now := time.Now().UTC()
2519
26- result, err := s.db.Exec(`
27- INSERT INTO accounts (username, password, empire, in_use, created_at, updated_at)
28- VALUES (?, ?, ?, 0, ?, ?)
29- `, username, password, empire, now, now)
20+ _, err := s.db.Exec(`
21+ INSERT INTO accounts (username, password, in_use, created_at, last_used_at)
22+ VALUES (?, ?, 1, ?, ?)
23+ `, username, password, now, now)
3024 if err != nil {
3125 return nil, fmt.Errorf("insert account: %w", err)
3226 }
3327
34- id, _ := result.LastInsertId()
3528 return &Account{
36- ID: id,
37- Username: username,
38- Password: password,
39- Empire: empire,
40- InUse: false,
41- CreatedAt: now,
42- UpdatedAt: now,
29+ Username: username,
30+ Password: password,
31+ InUse: true,
32+ CreatedAt: now,
33+ LastUsedAt: now,
4334 }, nil
4435 }
4536
46-// GetAccount retrieves an account by username.
4737 func (s *Store) GetAccount(username string) (*Account, error) {
4838 var acc Account
4939 var lastUsedAt sql.NullTime
50- var claimedBy sql.NullString
5140
5241 err := s.db.QueryRow(`
53- SELECT id, username, password, empire, in_use, claimed_by, last_used_at, created_at, updated_at
42+ SELECT username, password, in_use, last_used_at, created_at
5443 FROM accounts WHERE username = ?
55- `, username).Scan(&acc.ID, &acc.Username, &acc.Password, &acc.Empire, &acc.InUse, &claimedBy, &lastUsedAt, &acc.CreatedAt, &acc.UpdatedAt)
44+ `, username).Scan(&acc.Username, &acc.Password, &acc.InUse, &lastUsedAt, &acc.CreatedAt)
5645 if err != nil {
5746 return nil, err
5847 }
5948
60- if claimedBy.Valid {
61- acc.ClaimedBy = claimedBy.String
62- }
6349 if lastUsedAt.Valid {
6450 acc.LastUsedAt = lastUsedAt.Time
6551 }
@@ -67,10 +53,9 @@ func (s *Store) GetAccount(username string) (*Account, error) {
6753 return &acc, nil
6854 }
6955
70-// ListAvailableAccounts returns all unclaimed accounts.
7156 func (s *Store) ListAvailableAccounts() ([]*Account, error) {
7257 rows, err := s.db.Query(`
73- SELECT id, username, password, empire, in_use, claimed_by, last_used_at, created_at, updated_at
58+ SELECT username, password, in_use, last_used_at, created_at
7459 FROM accounts
7560 WHERE in_use = 0
7661 ORDER BY created_at ASC
@@ -84,15 +69,11 @@ func (s *Store) ListAvailableAccounts() ([]*Account, error) {
8469 for rows.Next() {
8570 var acc Account
8671 var lastUsedAt sql.NullTime
87- var claimedBy sql.NullString
8872
89- if err := rows.Scan(&acc.ID, &acc.Username, &acc.Password, &acc.Empire, &acc.InUse, &claimedBy, &lastUsedAt, &acc.CreatedAt, &acc.UpdatedAt); err != nil {
73+ if err := rows.Scan(&acc.Username, &acc.Password, &acc.InUse, &lastUsedAt, &acc.CreatedAt); err != nil {
9074 return nil, fmt.Errorf("scan account: %w", err)
9175 }
9276
93- if claimedBy.Valid {
94- acc.ClaimedBy = claimedBy.String
95- }
9677 if lastUsedAt.Valid {
9778 acc.LastUsedAt = lastUsedAt.Time
9879 }
@@ -103,91 +84,85 @@ func (s *Store) ListAvailableAccounts() ([]*Account, error) {
10384 return accounts, rows.Err()
10485 }
10586
106-// ClaimAccount marks an account as in use by a mysis.
107-// Returns error if already claimed or doesn't exist.
108-func (s *Store) ClaimAccount(username, mysisID string) error {
109- now := time.Now().UTC()
110-
111- // Check if account exists first
112- var exists bool
113- err := s.db.QueryRow(`SELECT EXISTS(SELECT 1 FROM accounts WHERE username = ?)`, username).Scan(&exists)
114- if err != nil {
115- return fmt.Errorf("check account exists: %w", err)
116- }
117- if !exists {
118- return fmt.Errorf("account %s does not exist", username)
119- }
87+func (s *Store) ClaimAccount() (*Account, error) {
88+ for attempts := 0; attempts < 5; attempts++ {
89+ var username, password string
90+ var createdAt time.Time
91+ err := s.db.QueryRow(`
92+ SELECT username, password, created_at
93+ FROM accounts
94+ WHERE in_use = 0
95+ ORDER BY created_at ASC
96+ LIMIT 1
97+ `).Scan(&username, &password, &createdAt)
98+ if err == sql.ErrNoRows {
99+ return nil, fmt.Errorf("no accounts available")
100+ }
101+ if err != nil {
102+ return nil, fmt.Errorf("query available account: %w", err)
103+ }
120104
121- result, err := s.db.Exec(`
122- UPDATE accounts
123- SET in_use = 1, claimed_by = ?, updated_at = ?
124- WHERE username = ? AND in_use = 0
125- `, mysisID, now, username)
126- if err != nil {
127- return fmt.Errorf("claim account: %w", err)
128- }
105+ now := time.Now().UTC()
106+ result, err := s.db.Exec(`
107+ UPDATE accounts
108+ SET in_use = 1, last_used_at = ?
109+ WHERE username = ? AND in_use = 0
110+ `, now, username)
111+ if err != nil {
112+ return nil, fmt.Errorf("claim account: %w", err)
113+ }
114+ rows, err := result.RowsAffected()
115+ if err != nil {
116+ return nil, fmt.Errorf("claim account rows: %w", err)
117+ }
118+ if rows == 0 {
119+ continue
120+ }
129121
130- n, _ := result.RowsAffected()
131- if n == 0 {
132- return fmt.Errorf("account %s is already claimed", username)
122+ return &Account{
123+ Username: username,
124+ Password: password,
125+ InUse: true,
126+ LastUsedAt: now,
127+ CreatedAt: createdAt,
128+ }, nil
133129 }
134130
135- return nil
131+ return nil, fmt.Errorf("no accounts available")
136132 }
137133
138-// ReleaseAccount marks an account as available.
139-func (s *Store) ReleaseAccount(username string) error {
134+func (s *Store) MarkAccountInUse(username string) error {
140135 now := time.Now().UTC()
141136
142- result, err := s.db.Exec(`
137+ _, err := s.db.Exec(`
143138 UPDATE accounts
144- SET in_use = 0, claimed_by = NULL, updated_at = ?
139+ SET in_use = 1, last_used_at = ?
145140 WHERE username = ?
146141 `, now, username)
147142 if err != nil {
148- return fmt.Errorf("release account: %w", err)
149- }
150-
151- n, _ := result.RowsAffected()
152- if n == 0 {
153- return sql.ErrNoRows
143+ return fmt.Errorf("mark account in use: %w", err)
154144 }
155145
156146 return nil
157147 }
158148
159-// ReleaseAccountsByMysis releases all accounts claimed by a mysis.
160-func (s *Store) ReleaseAccountsByMysis(mysisID string) error {
161- now := time.Now().UTC()
162-
149+func (s *Store) ReleaseAccount(username string) error {
163150 _, err := s.db.Exec(`
164151 UPDATE accounts
165- SET in_use = 0, claimed_by = NULL, updated_at = ?
166- WHERE claimed_by = ?
167- `, now, mysisID)
152+ SET in_use = 0
153+ WHERE username = ?
154+ `, username)
168155 if err != nil {
169- return fmt.Errorf("release accounts by mysis: %w", err)
156+ return fmt.Errorf("release account: %w", err)
170157 }
171158
172159 return nil
173160 }
174161
175-// UpdateAccountLastUsed updates the last_used_at timestamp.
176-func (s *Store) UpdateAccountLastUsed(username string) error {
177- now := time.Now().UTC()
178-
179- result, err := s.db.Exec(`
180- UPDATE accounts
181- SET last_used_at = ?, updated_at = ?
182- WHERE username = ?
183- `, now, now, username)
162+func (s *Store) ReleaseAllAccounts() error {
163+ _, err := s.db.Exec(`UPDATE accounts SET in_use = 0`)
184164 if err != nil {
185- return fmt.Errorf("update account last used: %w", err)
186- }
187-
188- n, _ := result.RowsAffected()
189- if n == 0 {
190- return sql.ErrNoRows
165+ return fmt.Errorf("release all accounts: %w", err)
191166 }
192167
193168 return nil