Skip to content

Commit aa0636f

Browse files
Fix user obtaining
1 parent 0b24662 commit aa0636f

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

blamewarrior/users.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ func SaveUser(q Queryer, u *User) (err error) {
5858
).Scan(&u.ID)
5959
}
6060

61-
func GetUserByNickname(q Queryer, nickname string) (u *User, err error) {
62-
err = q.QueryRow(GetUserByNicknameQuery, nickname).Scan(
61+
func GetUserByNickname(q Queryer, nickname string) (*User, error) {
62+
u := &User{}
63+
64+
err := q.QueryRow(GetUserByNicknameQuery, nickname).Scan(
6365
&u.Token,
6466
&u.UID,
6567
&u.Nickname,

blamewarrior/users_test.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestSaveUser(t *testing.T) {
5151
require.NoError(t, err)
5252
}
5353

54-
func GetUserByNickname_userExists(t *testing.T) {
54+
func TestGetUserByNickname_userExists(t *testing.T) {
5555
tx, teardown := setup()
5656
defer teardown()
5757

@@ -76,6 +76,20 @@ func GetUserByNickname_userExists(t *testing.T) {
7676

7777
}
7878

79+
func TestGetUserByNickname_userDoNotExist(t *testing.T) {
80+
tx, teardown := setup()
81+
defer teardown()
82+
83+
_, err := tx.Exec("TRUNCATE users;")
84+
85+
require.NoError(t, err)
86+
87+
_, err = blamewarrior.GetUserByNickname(tx, "test_user")
88+
89+
require.Error(t, blamewarrior.UserNotFound)
90+
91+
}
92+
7993
func setup() (tx *sql.Tx, teardownFn func()) {
8094
dbName := os.Getenv("DB_NAME")
8195
if dbName == "" {

0 commit comments

Comments
 (0)