Skip to content

Commit 742c22d

Browse files
Francisco-GalindoFrancisco-Galindo
committed
Run gofmt on all source files
1 parent 6076fbf commit 742c22d

2 files changed

Lines changed: 71 additions & 71 deletions

File tree

‎store/sqlite.go‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
11
package store
22

33
import (
4-
"context"
5-
"database/sql"
4+
"context"
5+
"database/sql"
66
)
77

8-
type SQLiteStore struct{
9-
DB *sql.DB
8+
type SQLiteStore struct {
9+
DB *sql.DB
1010
}
1111

1212
func NewSQLiteStore(db *sql.DB) Store {
13-
return &SQLiteStore{DB: db}
13+
return &SQLiteStore{DB: db}
1414
}
1515

1616
func (s *SQLiteStore) CreateUser(ctx context.Context, u *User) error {
17-
// Verify unique username/email
18-
var username string
19-
err := s.DB.QueryRowContext(ctx, "SELECT username FROM user WHERE username=? OR email=?", u.Username, u.Email).Scan(&username)
20-
if err == nil {
21-
return ErrAlreadyExists
22-
} else if err != sql.ErrNoRows {
23-
return err
24-
}
17+
// Verify unique username/email
18+
var username string
19+
err := s.DB.QueryRowContext(ctx, "SELECT username FROM user WHERE username=? OR email=?", u.Username, u.Email).Scan(&username)
20+
if err == nil {
21+
return ErrAlreadyExists
22+
} else if err != sql.ErrNoRows {
23+
return err
24+
}
2525

26-
res, err := s.DB.ExecContext(ctx, "INSERT INTO user (username,passhash,email) VALUES (?, ?, ?)", u.Username, u.Passhash, u.Email)
27-
if err != nil {
28-
return err
29-
}
30-
if id, ierr := res.LastInsertId(); ierr == nil {
31-
u.UserID = id
32-
}
33-
return nil
26+
res, err := s.DB.ExecContext(ctx, "INSERT INTO user (username,passhash,email) VALUES (?, ?, ?)", u.Username, u.Passhash, u.Email)
27+
if err != nil {
28+
return err
29+
}
30+
if id, ierr := res.LastInsertId(); ierr == nil {
31+
u.UserID = id
32+
}
33+
return nil
3434
}
3535

3636
func (s *SQLiteStore) CreateContest(ctx context.Context, c *Contest) error {
37-
var name string
38-
err := s.DB.QueryRowContext(ctx, "SELECT contest_name FROM contest WHERE contest_name=?", c.ContestName).Scan(&name)
39-
if err == nil {
40-
return ErrAlreadyExists
41-
} else if err != sql.ErrNoRows {
42-
return err
43-
}
37+
var name string
38+
err := s.DB.QueryRowContext(ctx, "SELECT contest_name FROM contest WHERE contest_name=?", c.ContestName).Scan(&name)
39+
if err == nil {
40+
return ErrAlreadyExists
41+
} else if err != sql.ErrNoRows {
42+
return err
43+
}
4444

45-
res, err := s.DB.ExecContext(ctx, "INSERT INTO contest (contest_name) VALUES (?)", c.ContestName)
46-
if err != nil {
47-
return err
48-
}
49-
if id, ierr := res.LastInsertId(); ierr == nil {
50-
c.ContestID = id
51-
}
52-
return nil
45+
res, err := s.DB.ExecContext(ctx, "INSERT INTO contest (contest_name) VALUES (?)", c.ContestName)
46+
if err != nil {
47+
return err
48+
}
49+
if id, ierr := res.LastInsertId(); ierr == nil {
50+
c.ContestID = id
51+
}
52+
return nil
5353
}
5454

5555
func (s *SQLiteStore) CreateProblem(ctx context.Context, p *Problem) error {
56-
if p.ContestID != nil {
57-
var cid int64
58-
err := s.DB.QueryRowContext(ctx, "SELECT contest_id FROM contest WHERE contest_id=?", *p.ContestID).Scan(&cid)
59-
if err == sql.ErrNoRows {
60-
return ErrNotFound
61-
} else if err != nil {
62-
return err
63-
}
64-
}
56+
if p.ContestID != nil {
57+
var cid int64
58+
err := s.DB.QueryRowContext(ctx, "SELECT contest_id FROM contest WHERE contest_id=?", *p.ContestID).Scan(&cid)
59+
if err == sql.ErrNoRows {
60+
return ErrNotFound
61+
} else if err != nil {
62+
return err
63+
}
64+
}
6565

66-
res, err := s.DB.ExecContext(ctx, "INSERT INTO problem (contest_id, creator_id, problem_name, description) VALUES (?, ?, ?, ?)", p.ContestID, p.CreatorID, p.ProblemName, p.Description)
67-
if err != nil {
68-
return err
69-
}
70-
if id, ierr := res.LastInsertId(); ierr == nil {
71-
p.ProblemID = id
72-
}
73-
return nil
66+
res, err := s.DB.ExecContext(ctx, "INSERT INTO problem (contest_id, creator_id, problem_name, description) VALUES (?, ?, ?, ?)", p.ContestID, p.CreatorID, p.ProblemName, p.Description)
67+
if err != nil {
68+
return err
69+
}
70+
if id, ierr := res.LastInsertId(); ierr == nil {
71+
p.ProblemID = id
72+
}
73+
return nil
7474
}

‎store/store.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
package store
22

33
import (
4-
"context"
5-
"errors"
4+
"context"
5+
"errors"
66
)
77

88
var (
9-
ErrAlreadyExists = errors.New("already exists")
10-
ErrNotFound = errors.New("not found")
9+
ErrAlreadyExists = errors.New("already exists")
10+
ErrNotFound = errors.New("not found")
1111
)
1212

1313
type User struct {
14-
UserID int64 `json:"user_id"`
15-
Username string `json:"username"`
16-
Passhash string `json:"passhash"`
17-
Email string `json:"email"`
14+
UserID int64 `json:"user_id"`
15+
Username string `json:"username"`
16+
Passhash string `json:"passhash"`
17+
Email string `json:"email"`
1818
}
1919

2020
type Contest struct {
21-
ContestID int64 `json:"contest_id"`
22-
ContestName string `json:"contest_name"`
21+
ContestID int64 `json:"contest_id"`
22+
ContestName string `json:"contest_name"`
2323
}
2424

2525
type Problem struct {
26-
ProblemID int64 `json:"problem_id"`
27-
ContestID *int64 `json:"contest_id"`
28-
CreatorID int64 `json:"creator_id"`
29-
ProblemName string `json:"problem_name"`
30-
Description string `json:"description"`
26+
ProblemID int64 `json:"problem_id"`
27+
ContestID *int64 `json:"contest_id"`
28+
CreatorID int64 `json:"creator_id"`
29+
ProblemName string `json:"problem_name"`
30+
Description string `json:"description"`
3131
}
3232

3333
// Store defines persistence operations used by the HTTP layer.
3434
type Store interface {
35-
CreateUser(ctx context.Context, u *User) error
36-
CreateContest(ctx context.Context, c *Contest) error
37-
CreateProblem(ctx context.Context, p *Problem) error
35+
CreateUser(ctx context.Context, u *User) error
36+
CreateContest(ctx context.Context, c *Contest) error
37+
CreateProblem(ctx context.Context, p *Problem) error
3838
}

0 commit comments

Comments
 (0)